Merge pull request #85 from php-enqueue/phpstan

Run phpstan and php-cs-fixer on travis

.gitignore

@@ -4,6 +4,9 @@ bin/doctrine*
 bin/php-cs-fixer
 bin/phpunit
 bin/sql-formatter
+bin/phpstan
+bin/jp.php
+bin/php-parse
 vendor
 .php_cs
 .php_cs.cache

.travis.yml

@@ -7,16 +7,22 @@ matrix:
   include:
     - php: 5.6
       sudo: false
-      env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=false
+      env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
+    - php: 7.1
+      sudo: false
+      env: SYMFONY_VERSION=3.0.* PHPSTAN=true
+    - php: 7.1
+      sudo: false
+      env: SYMFONY_VERSION=3.0.* PHP_CS_FIXER=true
     - php: 7.0
       sudo: false
-      env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=false
+      env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
     - php: 5.6
       sudo: false
-      env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=false SYMFONY_DEPRECATIONS_HELPER=weak
+      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.0
       sudo: false
-      env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=false SYMFONY_DEPRECATIONS_HELPER=weak
+      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.0
       sudo: required
       services: docker
@@ -40,5 +46,11 @@ install:
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -b; fi
 
 script:
-    - if [ "$FUNCTIONAL_TESTS" = false ]; then bin/phpunit --exclude-group=functional; fi
+    # misssing pkg/amqp-ext pkg/job-queue pkg/redis
+    - if [ "$PHPSTAN" = true ]; then ./bin/phpstan analyse -l 1 -c phpstan.neon pkg/enqueue pkg/psr-queue pkg/fs pkg/simple-client; fi
+    - if [ "$PHPSTAN" = true ]; then ./bin/phpstan analyse -l 1 -c phpstan.neon pkg/stomp pkg/dbal pkg/enqueue-bundle pkg/null pkg/sqs pkg/test; fi
+    - if [ "$PHP_CS_FIXER" = true ]; then IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS; fi
+    - if [ "$PHP_CS_FIXER" = true ]; then ./bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"; fi
+    - if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -t; fi
+

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"]

phpstan.neon

@@ -0,0 +1,3 @@
+parameters:
+	excludes_analyse:
+		- pkg/enqueue/Util/UUID.php

pkg/amqp-ext/Tests/Client/AmqpDriverTest.php

@@ -367,7 +367,7 @@ public function testShouldSetupBroker()
 
         $meta = new QueueMetaRegistry($this->createDummyConfig(), [
             'default' => [],
-        ], 'default');
+        ]);
 
         $driver = new AmqpDriver(
             $context,

pkg/dbal/Tests/DbalProducerTest.php

@@ -51,7 +51,7 @@ public function testShouldThrowIfDestinationOfInvalidType()
 
         $producer = new DbalProducer($this->createContextMock());
 
-        $producer->send(new NotSupportedDestination1(''), new DbalMessage());
+        $producer->send(new NotSupportedDestination1(), new DbalMessage());
     }
 
     public function testShouldThrowIfInsertMessageFailed()

pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php

@@ -207,7 +207,7 @@ public function testTransportConsumeMessagesCommandShouldConsumeMessage(array $e
      */
     public static function getKernelClass()
     {
-        include_once __DIR__.'/app/CustomAppKernel.php';
+        include_once __DIR__.'/App/CustomAppKernel.php';
 
         return CustomAppKernel::class;
     }

pkg/enqueue-bundle/Tests/Functional/WebTestCase.php

@@ -34,7 +34,7 @@ protected function setUp()
      */
     public static function getKernelClass()
     {
-        include_once __DIR__.'/app/AppKernel.php';
+        include_once __DIR__.'/App/AppKernel.php';
 
         return AppKernel::class;
     }

pkg/enqueue-bundle/Tests/Unit/DependencyInjection/Compiler/AddTopicMetaPassTest.php

@@ -20,7 +20,7 @@ public function testShouldImplementCompilerPass()
 
     public function testCouldBeConstructedWithoutAntArguments()
     {
-        new AddTopicMetaPass([]);
+        new AddTopicMetaPass();
     }
 
     public function testCouldBeConstructedByCreateFactoryMethod()

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)
     {

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 = '')
     {

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

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;

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;

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;

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;

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());

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;

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;

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);
     }
 
     /**

pkg/fs/FsContext.php

@@ -179,7 +179,7 @@ public function purge(PsrQueue $queue)
     {
         InvalidDestinationException::assertDestinationInstanceOf($queue, FsDestination::class);
 
-        $this->workWithFile($queue, 'c', function (FsDestination $destination, $file) use ($queue) {
+        $this->workWithFile($queue, 'c', function (FsDestination $destination, $file) {
             ftruncate($file, 0);
         });
     }

pkg/fs/Tests/Client/FsDriverTest.php

@@ -342,7 +342,7 @@ public function testShouldSetupBroker()
 
         $meta = new QueueMetaRegistry($this->createDummyConfig(), [
             'default' => [],
-        ], 'default');
+        ]);
 
         $driver = new FsDriver(
             $context,

pkg/fs/Tests/Functional/FsContextTest.php

@@ -3,11 +3,17 @@
 namespace Enqueue\Fs\Tests\Functional;
 
 use Enqueue\Fs\FsConnectionFactory;
+use Enqueue\Fs\FsContext;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
 class FsContextTest extends TestCase
 {
+    /**
+     * @var FsContext|null
+     */
+    private $fsContext;
+
     public function tearDown()
     {
         $fs = new Filesystem();

pkg/redis/RedisContext.php

@@ -33,7 +33,7 @@ public function __construct($redis)
             $this->redisFactory = $redis;
         } else {
             throw new \InvalidArgumentException(sprintf(
-                'The $redis argument must be either %s or callable that returns $s once called.',
+                'The $redis argument must be either %s or callable that returns %s once called.',
                 Redis::class,
                 Redis::class
             ));

pkg/redis/Tests/Client/RedisDriverTest.php

@@ -316,7 +316,7 @@ public function testShouldDoNothingOnSetupBroker()
 
         $meta = new QueueMetaRegistry(Config::create(), [
             'default' => [],
-        ], 'default');
+        ]);
 
         $driver = new RedisDriver(
             $context,

pkg/redis/Tests/RedisConsumerTest.php

@@ -29,7 +29,7 @@ public function testShouldReturnDestinationSetInConstructorOnGetQueue()
     {
         $destination = new RedisDestination('aQueue');
 
-        $consumer = new RedisConsumer($this->createContextMock(), $destination, 1);
+        $consumer = new RedisConsumer($this->createContextMock(), $destination);
 
         $this->assertSame($destination, $consumer->getQueue());
     }

pkg/redis/Tests/RedisContextTest.php

@@ -38,7 +38,7 @@ public function testCouldBeConstructedWithRedisFactoryAsFirstArgument()
     public function testThrowIfNeitherRedisNorFactoryGiven()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The $redis argument must be either Enqueue\Redis\Redis or callable that returns $s once called.');
+        $this->expectExceptionMessage('The $redis argument must be either Enqueue\Redis\Redis or callable that returns Enqueue\Redis\Redis once called.');
         new RedisContext(new \stdClass());
     }
 

pkg/stomp/Tests/Client/RabbitMqStompDriverTest.php

@@ -51,7 +51,7 @@ public function testShouldReturnConfigObject()
 
     public function testShouldCreateAndReturnQueueInstance()
     {
-        $expectedQueue = new StompDestination('aName');
+        $expectedQueue = new StompDestination();
 
         $context = $this->createPsrContextMock();
         $context
@@ -86,7 +86,7 @@ public function testShouldCreateAndReturnQueueInstance()
 
     public function testShouldCreateAndReturnQueueInstanceWithHardcodedTransportName()
     {
-        $expectedQueue = new StompDestination('aName');
+        $expectedQueue = new StompDestination();
 
         $context = $this->createPsrContextMock();
         $context
@@ -306,7 +306,7 @@ public function testShouldThrowExceptionIfDelayIsSetButDelayPluginInstalledOptio
 
     public function testShouldSendMessageToRouter()
     {
-        $topic = new StompDestination('');
+        $topic = new StompDestination();
         $transportMessage = new StompMessage();
 
         $producer = $this->createPsrProducerMock();
@@ -362,7 +362,7 @@ public function testShouldThrowExceptionIfTopicParameterIsNotSet()
 
     public function testShouldSendMessageToProcessor()
     {
-        $queue = new StompDestination('');
+        $queue = new StompDestination();
         $transportMessage = new StompMessage();
 
         $producer = $this->createPsrProducerMock();
@@ -405,8 +405,8 @@ public function testShouldSendMessageToProcessor()
 
     public function testShouldSendMessageToDelayExchangeIfDelaySet()
     {
-        $queue = new StompDestination('');
-        $delayTopic = new StompDestination('');
+        $queue = new StompDestination();
+        $delayTopic = new StompDestination();
         $transportMessage = new StompMessage();
 
         $producer = $this->createPsrProducerMock();

pkg/stomp/Tests/Client/StompDriverTest.php

@@ -39,7 +39,7 @@ public function testShouldReturnConfigObject()
 
     public function testShouldCreateAndReturnQueueInstance()
     {
-        $expectedQueue = new StompDestination('aName');
+        $expectedQueue = new StompDestination();
 
         $context = $this->createPsrContextMock();
         $context
@@ -66,7 +66,7 @@ public function testShouldCreateAndReturnQueueInstance()
 
     public function testShouldCreateAndReturnQueueInstanceWithHardcodedTransportName()
     {
-        $expectedQueue = new StompDestination('aName');
+        $expectedQueue = new StompDestination();
 
         $context = $this->createPsrContextMock();
         $context
@@ -153,7 +153,7 @@ public function testShouldConvertClientMessageToTransportMessage()
 
     public function testShouldSendMessageToRouter()
     {
-        $topic = new StompDestination('');
+        $topic = new StompDestination();
         $transportMessage = new StompMessage();
 
         $producer = $this->createPsrProducerMock();
@@ -207,7 +207,7 @@ public function testShouldThrowExceptionIfTopicParameterIsNotSet()
 
     public function testShouldSendMessageToProcessor()
     {
-        $queue = new StompDestination('');
+        $queue = new StompDestination();
         $transportMessage = new StompMessage();
 
         $producer = $this->createPsrProducerMock();