Add phpstan analyzer and run it on CI.

makasim · makasim · commit 47bddf13a7fd · 2017-05-15T17:03:04.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ install:
     - echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
     - composer install --ignore-platform-reqs # ext-amqp is not installed
+    - ./bin/phpstan analyse -l 1 -c phpstan.neon pkg/enqueue
     - if [ "$FUNCTIONAL_TESTS" = true ]; then docker --version; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then docker-compose --version; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -b; fi
diff --git a/composer.json b/composer.json
@@ -25,7 +25,8 @@
     "symfony/browser-kit": "^2.8|^3",
     "symfony/expression-language": "^2.8|^3",
     "friendsofphp/php-cs-fixer": "^2",
-    "empi89/php-amqp-stubs": "*@dev"
+    "empi89/php-amqp-stubs": "*@dev",
+    "phpstan/phpstan": "^0.7.0"
   },
   "autoload": {
     "files": ["pkg/enqueue/functions_include.php"]
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,3 @@
+parameters:
+	excludes_analyse:
+		- pkg/enqueue/Util/UUID.php
diff --git a/pkg/enqueue/Client/Message.php b/pkg/enqueue/Client/Message.php
@@ -63,6 +63,11 @@ class Message
      */
     private $correlationId;
 
+    /**
+     * @var string
+     */
+    private $scope;
+
     /**
      * @var array
      */
@@ -89,7 +94,7 @@ public function getBody()
     }
 
     /**
-     * @param null|string|number|array|\JsonSerializable $body
+     * @param null|string|int|float|array|\JsonSerializable $body
      */
     public function setBody($body)
     {
diff --git a/pkg/enqueue/Consumption/Result.php b/pkg/enqueue/Consumption/Result.php
@@ -38,8 +38,8 @@ class Result
     private $reply;
 
     /**
-     * @param string $status
-     * @param string $reason
+     * @param mixed $status
+     * @param mixed $reason
      */
     public function __construct($status, $reason = '')
     {
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php
@@ -27,7 +27,7 @@ public function testCouldBeConstructedWithRequiredArguments()
 
     public function testShouldSetupBroker()
     {
-        $logger = new NullLogger('');
+        $logger = new NullLogger();
 
         $driver = $this->createDriverMock();
         $driver
@@ -45,7 +45,7 @@ public function testShouldSetupBroker()
 
     public function testShouldSetupBrokerOnlyOnce()
     {
-        $logger = new NullLogger('');
+        $logger = new NullLogger();
 
         $driver = $this->createDriverMock();
         $driver
diff --git a/pkg/enqueue/Tests/Consumption/Exception/ConsumptionInterruptedExceptionTest.php b/pkg/enqueue/Tests/Consumption/Exception/ConsumptionInterruptedExceptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Tests\Consumption;
+namespace Enqueue\Tests\Consumption\Exception;
 
 use Enqueue\Consumption\Exception\ConsumptionInterruptedException;
 use Enqueue\Consumption\Exception\ExceptionInterface;
diff --git a/pkg/enqueue/Tests/Consumption/Exception/IllegalContextModificationExceptionTest.php b/pkg/enqueue/Tests/Consumption/Exception/IllegalContextModificationExceptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Tests\Consumption;
+namespace Enqueue\Tests\Consumption\Exception;
 
 use Enqueue\Consumption\Exception\ExceptionInterface;
 use Enqueue\Consumption\Exception\IllegalContextModificationException;
diff --git a/pkg/enqueue/Tests/Consumption/Exception/InvalidArgumentExceptionTest.php b/pkg/enqueue/Tests/Consumption/Exception/InvalidArgumentExceptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Tests\Consumption;
+namespace Enqueue\Tests\Consumption\Exception;
 
 use Enqueue\Consumption\Exception\ExceptionInterface;
 use Enqueue\Consumption\Exception\InvalidArgumentException;
diff --git a/pkg/enqueue/Tests/Consumption/Exception/LogicExceptionTest.php b/pkg/enqueue/Tests/Consumption/Exception/LogicExceptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Tests\Consumption;
+namespace Enqueue\Tests\Consumption\Exception;
 
 use Enqueue\Consumption\Exception\ExceptionInterface;
 use Enqueue\Consumption\Exception\LogicException;
diff --git a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php
@@ -366,11 +366,7 @@ public function testShouldCallOnStartExtensionMethod()
             ->expects($this->once())
             ->method('onStart')
             ->with($this->isInstanceOf(Context::class))
-            ->willReturnCallback(function (Context $context) use (
-                $contextStub,
-                $messageConsumerStub,
-                $processorMock
-            ) {
+            ->willReturnCallback(function (Context $context) use ($contextStub) {
                 $this->assertSame($contextStub, $context->getPsrContext());
                 $this->assertNull($context->getPsrConsumer());
                 $this->assertNull($context->getPsrProcessor());
@@ -446,7 +442,6 @@ public function testShouldCallOnBeforeReceiveExtensionMethod()
                 $contextStub,
                 $messageConsumerStub,
                 $processorMock,
-                $expectedMessage,
                 $queue
             ) {
                 $this->assertSame($contextStub, $context->getPsrContext());
diff --git a/pkg/enqueue/Tests/Functions/DsnToConnectionFactoryFunctionTest.php b/pkg/enqueue/Tests/Functions/DsnToConnectionFactoryFunctionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Tests\Router;
+namespace Enqueue\Tests\Functions;
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Enqueue\Fs\FsConnectionFactory;
diff --git a/pkg/enqueue/Tests/Functions/DsnToContextFunctionTest.php b/pkg/enqueue/Tests/Functions/DsnToContextFunctionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Tests\Router;
+namespace Enqueue\Tests\Functions;
 
 use Enqueue\AmqpExt\AmqpContext;
 use Enqueue\Fs\FsContext;
diff --git a/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php
@@ -195,7 +195,7 @@ private function createQueueMetaRegistry(array $destinationNames)
             'aRouterProcessorName'
         );
 
-        return new QueueMetaRegistry($config, $destinationNames, 'default');
+        return new QueueMetaRegistry($config, $destinationNames);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+parameters:`
	`2`	`+ excludes_analyse:`
	`3`	`+ - pkg/enqueue/Util/UUID.php`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function testCouldBeConstructedWithRequiredArguments()`
`27`	`27`
`28`	`28`	`public function testShouldSetupBroker()`
`29`	`29`	`{`
`30`		`- $logger = new NullLogger('');`
	`30`	`+ $logger = new NullLogger();`
`31`	`31`
`32`	`32`	`$driver = $this->createDriverMock();`
`33`	`33`	`$driver`
`@@ -45,7 +45,7 @@ public function testShouldSetupBroker()`
`45`	`45`
`46`	`46`	`public function testShouldSetupBrokerOnlyOnce()`
`47`	`47`	`{`
`48`		`- $logger = new NullLogger('');`
	`48`	`+ $logger = new NullLogger();`
`49`	`49`
`50`	`50`	`$driver = $this->createDriverMock();`
`51`	`51`	`$driver`