resolve conflicts

Author: vyuldashev

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -7,7 +7,7 @@
     ->setUsingCache(false)
     ->setFinder($finder)
     ->setRules([
-        'psr0' => false,
+        'psr_autoloading' => false,
         '@PSR2' => true,
         'blank_line_after_namespace' => true,
         'braces' => true,
@@ -17,10 +17,10 @@
         'function_declaration' => true,
         'indentation_type' => true,
         'line_ending' => true,
-        'lowercase_constants' => true,
+        'constant_case' => true,
         'lowercase_keywords' => true,
         'method_argument_space' => [
-            'ensure_fully_multiline' => true,
+            'on_multiline' => 'ensure_fully_multiline',
         ],
         'no_break_comment' => true,
         'no_closing_tag' => true,
@@ -39,9 +39,9 @@
         'visibility_required' => true,
         'encoding' => true,
         'full_opening_tag' => true,
-        'blank_line_before_return' => true,
+        'blank_line_before_statement' => true,
         'no_trailing_comma_in_singleline_array' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'array_indentation' => true,
         'binary_operator_spaces' => [
             'operators' => [

composer.json

@@ -49,9 +49,9 @@
       "@test:style",
       "@test:unit"
     ],
-    "test:style": "@php vendor/bin/php-cs-fixer fix --config=.php_cs.dist --allow-risky=yes --dry-run --diff --verbose",
+    "test:style": "@php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --allow-risky=yes --dry-run --diff --verbose",
     "test:unit": "@php vendor/bin/phpunit",
-    "fix:style": "@php vendor/bin/php-cs-fixer fix --config=.php_cs.dist --allow-risky=yes --diff --verbose"
+    "fix:style": "@php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --allow-risky=yes --diff --verbose"
   },
   "minimum-stability": "dev",
   "prefer-stable": true

src/Console/QueueDeclareCommand.php

@@ -41,7 +41,7 @@ public function handle(RabbitMQConnector $connector): void
             $arguments['x-max-priority'] = $maxPriority;
         }
 
-        if($this->option('quorum')) {
+        if ($this->option('quorum')) {
             $arguments['x-queue-type'] = 'quorum';
         }
 

src/Consumer.php

@@ -136,6 +136,7 @@ function (AMQPMessage $message) use ($connection, $options, $connectionName, $qu
             // make sure we do not need to kill this worker process off completely.
             if (! $this->daemonShouldRun($options, $connectionName, $queue)) {
                 $this->pauseWorker($options, $lastRestart);
+
                 continue;
             }
 

src/Queue/Connectors/RabbitMQConnector.php

@@ -113,12 +113,14 @@ private function filter(array $array): array
         foreach ($array as $index => &$value) {
             if (is_array($value)) {
                 $value = $this->filter($value);
+
                 continue;
             }
 
             // If the value is null then remove it.
             if ($value === null) {
                 unset($array[$index]);
+
                 continue;
             }
         }

tests/Functional/TestCase.php

@@ -2,7 +2,10 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Functional;
 
+use Exception;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
+use ReflectionClass;
+use ReflectionException;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Tests\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
@@ -162,15 +165,15 @@ protected function getEnvironmentSetUp($app): void
      * @param string $method
      * @param array $parameters
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     protected function callMethod($object, string $method, array $parameters = [])
     {
         try {
             $className = get_class($object);
-            $reflection = new \ReflectionClass($className);
-        } catch (\ReflectionException $e) {
-            throw new \Exception($e->getMessage());
+            $reflection = new ReflectionClass($className);
+        } catch (ReflectionException $e) {
+            throw new Exception($e->getMessage());
         }
 
         $method = $reflection->getMethod($method);