Upd php cs fixer

.gitignore

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

.php_cs.dist

@@ -0,0 +1,28 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => array('syntax' => 'short'),
+        'combine_consecutive_unsets' => true,
+        // one should use PHPUnit methods to set up expected exception instead of annotations
+        'general_phpdoc_annotation_remove' => array('expectedException', 'expectedExceptionMessage', 'expectedExceptionMessageRegExp'),
+        'heredoc_to_nowdoc' => true,
+        'no_extra_consecutive_blank_lines' => array('break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'),
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_order' => true,
+        'psr4' => true,
+        'strict_param' => true,
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+    )
+;

bin/dev

@@ -3,7 +3,7 @@
 set -x
 set -e
 
-while getopts "buste" OPTION; do
+while getopts "bustef" OPTION; do
   case $OPTION in
     b)
       COMPOSE_PROJECT_NAME=mqdev docker-compose build
@@ -17,6 +17,9 @@ while getopts "buste" OPTION; do
     e)
       docker exec -it mqdev_dev_1 /bin/bash
       ;;
+    f)
+      ./bin/php-cs-fixer fix
+      ;;
     t)
       COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev ./bin/test
       ;;

bin/pre-commit

@@ -105,11 +105,10 @@ function runPhpCsFixer()
         $output = '';
         $returnCode = null;
         exec(sprintf(
-            '%s %s fix %s --config-file=%s',
+            '%s %s fix %s',
             $phpBin,
             $phpCsFixerBin,
-            $projectRootDir.'/'.$file,
-            $projectRootDir.'/.php_cs'
+            $projectRootDir.'/'.$file
         ), $output, $returnCode);
 
         if ($returnCode) {

composer.json

@@ -18,7 +18,7 @@
     "symfony/monolog-bundle": "^2.8|^3",
     "symfony/browser-kit": "^2.8|^3",
     "symfony/expression-language": "^2.8|^3",
-    "friendsofphp/php-cs-fixer": "^1"
+    "friendsofphp/php-cs-fixer": "^2"
   },
   "config": {
     "bin-dir": "bin"

pkg/amqp-ext/AmqpConnectionFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\ConnectionFactory;

pkg/amqp-ext/AmqpConsumer.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\Consumer;

pkg/amqp-ext/AmqpContext.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\Context;
@@ -156,9 +157,9 @@ public function createConsumer(Destination $destination)
             $this->bind($destination, $queue);
 
             return new AmqpConsumer($this, $queue);
-        } else {
-            return new AmqpConsumer($this, $destination);
         }
+
+        return new AmqpConsumer($this, $destination);
     }
 
     public function close()

pkg/amqp-ext/AmqpMessage.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\Message;

pkg/amqp-ext/AmqpProducer.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\Destination;

pkg/amqp-ext/AmqpQueue.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\Queue;

pkg/amqp-ext/AmqpTopic.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt;
 
 use Enqueue\Psr\Topic;

pkg/amqp-ext/Client/AmqpDriver.php

@@ -1,17 +1,18 @@
 <?php
+
 namespace  Enqueue\AmqpExt\Client;
 
 use Enqueue\AmqpExt\AmqpContext;
 use Enqueue\AmqpExt\AmqpMessage;
 use Enqueue\AmqpExt\AmqpQueue;
 use Enqueue\AmqpExt\AmqpTopic;
-use Enqueue\Psr\DeliveryMode;
-use Enqueue\Psr\Message as TransportMessage;
 use Enqueue\Client\Config;
 use Enqueue\Client\DriverInterface;
 use Enqueue\Client\Message;
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\Meta\QueueMetaRegistry;
+use Enqueue\Psr\DeliveryMode;
+use Enqueue\Psr\Message as TransportMessage;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 

pkg/amqp-ext/Client/RabbitMqDriver.php

@@ -1,15 +1,16 @@
 <?php
+
 namespace  Enqueue\AmqpExt\Client;
 
 use Enqueue\AmqpExt\AmqpContext;
 use Enqueue\AmqpExt\AmqpMessage;
 use Enqueue\AmqpExt\AmqpQueue;
 use Enqueue\AmqpExt\AmqpTopic;
-use Enqueue\Psr\Message as TransportMessage;
 use Enqueue\Client\Config;
 use Enqueue\Client\Message;
 use Enqueue\Client\Meta\QueueMetaRegistry;
 use Enqueue\Consumption\Exception\LogicException;
+use Enqueue\Psr\Message as TransportMessage;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -31,8 +32,8 @@ class RabbitMqDriver extends AmqpDriver
     private $queueMetaRegistry;
 
     /**
-     * @param AmqpContext $context
-     * @param Config $config
+     * @param AmqpContext       $context
+     * @param Config            $config
      * @param QueueMetaRegistry $queueMetaRegistry
      */
     public function __construct(AmqpContext $context, Config $config, QueueMetaRegistry $queueMetaRegistry)

pkg/amqp-ext/Symfony/AmqpTransportFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Symfony;
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;

pkg/amqp-ext/Symfony/RabbitMqTransportFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Symfony;
 
 use Enqueue\AmqpExt\Client\RabbitMqDriver;

pkg/amqp-ext/Tests/AmqpContextTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpConsumer;

pkg/amqp-ext/Tests/AmqpMessageTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpMessage;
@@ -18,7 +19,7 @@ public function testCouldBeConstructedWithoutArguments()
     {
         $message = new AmqpMessage();
 
-        $this->assertSame(null, $message->getBody());
+        $this->assertNull($message->getBody());
         $this->assertSame([], $message->getProperties());
         $this->assertSame([], $message->getHeaders());
     }

pkg/amqp-ext/Tests/AmqpQueueTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpQueue;

pkg/amqp-ext/Tests/AmqpTopicTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpTopic;

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

@@ -1,17 +1,18 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Client;
 
 use Enqueue\AmqpExt\AmqpContext;
 use Enqueue\AmqpExt\AmqpMessage;
 use Enqueue\AmqpExt\AmqpQueue;
 use Enqueue\AmqpExt\AmqpTopic;
 use Enqueue\AmqpExt\Client\AmqpDriver;
-use Enqueue\Psr\Producer;
 use Enqueue\Client\Config;
 use Enqueue\Client\DriverInterface;
 use Enqueue\Client\Message;
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\Meta\QueueMetaRegistry;
+use Enqueue\Psr\Producer;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpDriverTest extends \PHPUnit_Framework_TestCase

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

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Client;
 
 use Enqueue\AmqpExt\AmqpContext;
@@ -7,12 +8,12 @@
 use Enqueue\AmqpExt\AmqpTopic;
 use Enqueue\AmqpExt\Client\AmqpDriver;
 use Enqueue\AmqpExt\Client\RabbitMqDriver;
-use Enqueue\Psr\Producer;
 use Enqueue\Client\Config;
 use Enqueue\Client\DriverInterface;
 use Enqueue\Client\Message;
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\Meta\QueueMetaRegistry;
+use Enqueue\Psr\Producer;
 use Enqueue\Test\ClassExtensionTrait;
 
 class RabbitMqDriverTest extends \PHPUnit_Framework_TestCase
@@ -547,7 +548,6 @@ public function testShouldSetupBroker()
 
         $config = new Config('', '', '', '', '', '', ['delay_plugin_installed' => true]);
 
-
         $meta = new QueueMetaRegistry($config, ['default' => []]);
 
         $driver = new RabbitMqDriver($context, $config, $meta);

pkg/amqp-ext/Tests/Functional/AmqpCommonUseCasesTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Functional;
 
 use Enqueue\AmqpExt\AmqpContext;
@@ -156,7 +157,7 @@ public function testConsumerReceiveMessageFromTopicDirectly()
 
         $consumer = $this->amqpContext->createConsumer($topic);
         //guard
-        $this->assertSame(null, $consumer->receive(1));
+        $this->assertNull($consumer->receive(1));
 
         $message = $this->amqpContext->createMessage(__METHOD__);
 

pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Functional;
 
 use Enqueue\AmqpExt\AmqpContext;

pkg/amqp-ext/Tests/Functional/AmqpRpcUseCasesTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Functional;
 
 use Enqueue\AmqpExt\AmqpContext;

pkg/amqp-ext/Tests/Symfony/AmqpTransportFactoryTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Symfony;
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;

pkg/amqp-ext/Tests/Symfony/RabbitMqTransportFactoryTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\AmqpExt\Tests\Symfony;
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;

pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\Consumption\Extension;
 
 use Enqueue\Consumption\Context;

pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\Consumption\Extension;
 
 use Doctrine\DBAL\Connection;

pkg/enqueue-bundle/DependencyInjection/Compiler/AddTopicMetaPass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildClientRoutingPass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildExtensionsPass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildProcessorRegistryPass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildQueueMetaRegistryPass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildTopicMetaSubscribersPass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/ExtractProcessorTagSubscriptionsTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection\Compiler;
 
 use Enqueue\Client\TopicSubscriberInterface;

pkg/enqueue-bundle/DependencyInjection/Configuration.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Enqueue\Bundle\DependencyInjection;
 
 use Enqueue\Client\Config;