Fix CS

rybakit · rybakit · commit 2ce81b7c223b · 2019-05-18T13:03:42.000+02:00
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ use Tarantool\Queue\Queue;
 $queue = new Queue($client, 'foobar');
 ```
 
-where `$client` is either an instance of the Tarantool class from the [pecl extension](https://github.com/tarantool/tarantool-php) 
+where `$client` is either an instance of the `Tarantool` class from the [pecl extension](https://github.com/tarantool/tarantool-php) 
 or an instance of `Tarantool\Client\Client` from the [pure PHP package](https://github.com/tarantool-php/client).
 
 
diff --git a/src/Options.php b/src/Options.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue;
 
 final class Options
diff --git a/src/Queue.php b/src/Queue.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue;
 
 use Tarantool\Client\Client;
diff --git a/src/States.php b/src/States.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue;
 
 final class States
diff --git a/src/TarantoolAdapter.php b/src/TarantoolAdapter.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue;
 
 final class TarantoolAdapter
diff --git a/src/Task.php b/src/Task.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue;
 
 final class Task
diff --git a/tests/Integration/FifoQueueTest.php b/tests/Integration/FifoQueueTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Integration;
 
 final class FifoQueueTest extends QueueTest
diff --git a/tests/Integration/FifottlQueueTest.php b/tests/Integration/FifottlQueueTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Integration;
 
 final class FifottlQueueTest extends QueueTest
diff --git a/tests/Integration/QueueTest.php b/tests/Integration/QueueTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Integration;
 
 use PHPUnit\Framework\TestCase;
@@ -412,32 +412,32 @@ public function provideFailureCallbackData() : iterable
         ];
     }
 
-    protected static function assertTaskInstance($task) : void
+    final protected static function assertTaskInstance($task) : void
     {
         self::assertInstanceOf(Task::class, $task);
     }
 
-    protected static function assertTask(Task $task, int $expectedId, string $expectedState, $expectedData) : void
+    final protected static function assertTask(Task $task, int $expectedId, string $expectedState, $expectedData) : void
     {
         self::assertSame($expectedId, $task->getId());
         self::assertSame($expectedState, $task->getState());
         self::assertSame($expectedData, $task->getData());
     }
 
-    protected static function assertSameArray(array $expected, array $actual) : void
+    final protected static function assertSameArray(array $expected, array $actual) : void
     {
         ksort($expected);
         ksort($actual);
 
         self::assertSame($expected, $actual);
     }
 
-    protected function getQueue() : Queue
+    final protected function getQueue() : Queue
     {
         return $this->queue;
     }
 
-    protected function getTubeType() : string
+    final protected function getTubeType() : string
     {
         $class = new \ReflectionClass($this);
         $type = str_replace('QueueTest', '', $class->getShortName());
diff --git a/tests/Integration/Ttl.php b/tests/Integration/Ttl.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Integration;
 
 use Tarantool\Queue\Queue;
diff --git a/tests/Integration/UtubeQueueTest.php b/tests/Integration/UtubeQueueTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Integration;
 
 final class UtubeQueueTest extends QueueTest
diff --git a/tests/Integration/UtubettlQueueTest.php b/tests/Integration/UtubettlQueueTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Integration;
 
 final class UtubettlQueueTest extends QueueTest
diff --git a/tests/Unit/QueueTest.php b/tests/Unit/QueueTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/TaskTest.php b/tests/Unit/TaskTest.php
@@ -1,8 +1,6 @@
 <?php
 
-declare(strict_types=1);
-
-/*
+/**
  * This file is part of the Tarantool Queue package.
  *
  * (c) Eugene Leonovich <gen.work@gmail.com>
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Tarantool\Queue\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-declare(strict_types=1);`
`4`		`-`
`5`		`-/*`
	`3`	`+/**`
`6`	`4`	`* This file is part of the Tarantool Queue package.`
`7`	`5`	`*`
`8`	`6`	`* (c) Eugene Leonovich <gen.work@gmail.com>`
`@@ -11,6 +9,8 @@`
`11`	`9`	`* file that was distributed with this source code.`
`12`	`10`	`*/`
`13`	`11`
	`12`	`+declare(strict_types=1);`
	`13`	`+`
`14`	`14`	`namespace Tarantool\Queue\Tests\Integration;`
`15`	`15`
`16`	`16`	`use PHPUnit\Framework\TestCase;`
`@@ -412,32 +412,32 @@ public function provideFailureCallbackData() : iterable`
`412`	`412`	`];`
`413`	`413`	`}`
`414`	`414`
`415`		`- protected static function assertTaskInstance($task) : void`
	`415`	`+ final protected static function assertTaskInstance($task) : void`
`416`	`416`	`{`
`417`	`417`	`self::assertInstanceOf(Task::class, $task);`
`418`	`418`	`}`
`419`	`419`
`420`		`- protected static function assertTask(Task $task, int $expectedId, string $expectedState, $expectedData) : void`
	`420`	`+ final protected static function assertTask(Task $task, int $expectedId, string $expectedState, $expectedData) : void`
`421`	`421`	`{`
`422`	`422`	`self::assertSame($expectedId, $task->getId());`
`423`	`423`	`self::assertSame($expectedState, $task->getState());`
`424`	`424`	`self::assertSame($expectedData, $task->getData());`
`425`	`425`	`}`
`426`	`426`
`427`		`- protected static function assertSameArray(array $expected, array $actual) : void`
	`427`	`+ final protected static function assertSameArray(array $expected, array $actual) : void`
`428`	`428`	`{`
`429`	`429`	`ksort($expected);`
`430`	`430`	`ksort($actual);`
`431`	`431`
`432`	`432`	`self::assertSame($expected, $actual);`
`433`	`433`	`}`
`434`	`434`
`435`		`- protected function getQueue() : Queue`
	`435`	`+ final protected function getQueue() : Queue`
`436`	`436`	`{`
`437`	`437`	`return $this->queue;`
`438`	`438`	`}`
`439`	`439`
`440`		`- protected function getTubeType() : string`
	`440`	`+ final protected function getTubeType() : string`
`441`	`441`	`{`
`442`	`442`	`$class = new \ReflectionClass($this);`
`443`	`443`	`$type = str_replace('QueueTest', '', $class->getShortName());`