fix tests.

makasim · makasim · commit 34eaf5ffa810 · 2018-08-14T12:59:30.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -53,9 +53,9 @@ install:
     - if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
 
 script:
-    - if [ "$PHPSTAN" = true ]; then composer require "phpstan/phpstan:^0.8" ; php -d memory_limit=512M bin/phpstan analyse -l 1 -c phpstan.neon pkg/gps pkg/amqp-ext pkg/async-event-dispatcher pkg/dbal pkg/enqueue pkg/enqueue-bundle pkg/fs pkg/gearman pkg/job-queue pkg/null pkg/pheanstalk pkg/redis pkg/simple-client pkg/sqs pkg/stomp pkg/test pkg/rdkafka; 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
+    - IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS
     - 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 [ "$PHPSTAN" = true ]; then docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon -- "${COMMIT_SCA_FILES[@]}" ; fi
     - if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
     - if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
diff --git a/bin/pre-commit b/bin/pre-commit
@@ -68,8 +68,6 @@ function getFilesToFix()
         return (bool) preg_match('/\.(php|twig|translations\/*.yml)$/', $file);
     });
 
-    echo sprintf('Found %s staged files', count($stagedFiles)).PHP_EOL;
-
     return $stagedFiles;
 }
 
@@ -129,6 +127,29 @@ function runPhpCsFixer()
     return $filesWithErrors;
 }
 
+function runPhpstan()
+{
+    $filesWithErrors = array();
+    foreach (getFilesToFix() as $file) {
+        $output = '';
+        $returnCode = null;
+
+        exec(sprintf(
+            'docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon %s',
+            $file
+        ), $output, $returnCode);
+
+        if ($returnCode) {
+            $filesWithErrors[] = [$file, $output];
+        }
+    }
+
+    return $filesWithErrors;
+}
+
+
+echo sprintf('Found %s staged files', count(getFilesToFix())).PHP_EOL;
+
 $phpSyntaxErrors = runPhpLint();
 if ($phpSyntaxErrors) {
     echo "Php syntax errors were found in next files:" . PHP_EOL;
@@ -153,4 +174,21 @@ if ($phpCSFixerErrors) {
     exit(1);
 }
 
+$phpStanErrors = runPhpstan();
+var_dump($phpStanErrors);
+if ($phpStanErrors) {
+    echo "Phpstan errors." . PHP_EOL;
+    echo "List of changed files:" . PHP_EOL;
+
+    foreach ($phpStanErrors as list($file, $error)) {
+        echo $file . PHP_EOL;
+        echo array_walk_recursive($error, function($item) {
+            echo $item.PHP_EOL;
+        }) . PHP_EOL;
+        echo PHP_EOL;
+    }
+
+    exit(1);
+}
+
 exit(0);
diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^5.5",
+    "phpstan/phpstan": "^0.10",
     "queue-interop/queue-spec": "^0.5.5@dev",
     "symfony/browser-kit": "4.0.*",
     "symfony/config": "4.0.*",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,10 +1,8 @@
 parameters:
 	excludes_analyse:
+		- pkg/amqp-lib/tutorial
+		- pkg/enqueue-bundle/Tests/Functional/App/AsyncListener.php
 		- pkg/enqueue/Util/UUID.php
-		- pkg/enqueue-bundle/Tests/Functional/App
 		- pkg/job-queue/Test/JobRunner.php
 		- pkg/job-queue/Tests/Functional/app/AppKernel.php
-		- pkg/redis/PhpRedis.php
-		- pkg/redis/RedisConnectionFactory.php
-		- pkg/gearman
-		- pkg/amqp-ext
+		- pkg/rdkafka/RdKafkaConsumer.php
diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest extends SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec
 {
     /**
diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
     /**
diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerStopOnFalseTest extends SubscriptionConsumerStopOnFalseSpec
 {
     /**
diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest extends SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec
 {
     /**
diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
     /**
diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerStopOnFalseTest extends SubscriptionConsumerStopOnFalseSpec
 {
     /**
diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest extends SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec
 {
     /**
diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
     /**
diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php
@@ -8,6 +8,9 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec;
 
+/**
+ * @group functional
+ */
 class AmqpSubscriptionConsumerStopOnFalseTest extends SubscriptionConsumerStopOnFalseSpec
 {
     /**
diff --git a/pkg/mongodb/Tests/MongodbDestinationTest.php b/pkg/mongodb/Tests/MongodbDestinationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests;
+namespace Enqueue\Mongodb\Tests;
 
 use Enqueue\Mongodb\MongodbDestination;
 use Enqueue\Test\ClassExtensionTrait;
diff --git a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php
@@ -8,6 +8,10 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec;
 
+/**
+ * @group functional
+ * @group Redis
+ */
 class RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest extends SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec
 {
     use RedisExtension;
diff --git a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeUntilUnsubscribedTest.php
@@ -8,6 +8,10 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec;
 
+/**
+ * @group functional
+ * @group Redis
+ */
 class RedisSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
     use RedisExtension;
diff --git a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerStopOnFalseTest.php b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerStopOnFalseTest.php
@@ -8,6 +8,10 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec;
 
+/**
+ * @group functional
+ * @group Redis
+ */
 class RedisSubscriptionConsumerStopOnFalseTest extends SubscriptionConsumerStopOnFalseSpec
 {
     use RedisExtension;

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`	`use Interop\Queue\PsrContext;`
`9`	`9`	`use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec;`
`10`	`10`
	`11`	`+/**`
	`12`	`+ * @group functional`
	`13`	`+ */`
`11`	`14`	`class AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest extends SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec`
`12`	`15`	`{`
`13`	`16`	`/**`