Merge 508a6ed into b9de523

.github/workflows/lint.yml

@@ -0,0 +1,63 @@
+on: [push, pull_request]
+
+name: Lint
+
+jobs:
+    php-cs-fixer:
+        name: PHP-CS-Fixer
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Run PHP-CS-Fixer"
+              uses: docker://oskarstark/php-cs-fixer-ga:2.16.1
+              with:
+                  args: --ansi --verbose --diff --dry-run
+
+    composer-normalize:
+        name: composer-normalize
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Run composer-normalize"
+              uses: docker://localheinz/composer-normalize-action:0.5.2
+              with:
+                  args: --dry-run
+
+    yaml-files:
+        name: YAML files
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - name: "Install Ruby 2.6"
+              uses: actions/setup-ruby@v1
+              with:
+                  ruby-version: '2.6'
+            - run: gem install yaml-lint
+            - name: "Linting..."
+              run: make lint-yaml
+
+    xml-files:
+        name: XML files
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2
+
+            - run: sudo apt-get install libxml2-utils
+
+            - name: "Linting..."
+              run: make lint-xml

.php_cs.dist

@@ -26,6 +26,7 @@ $rules = [
     'header_comment' => [
         'header' => $header,
     ],
+    'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
     'no_extra_blank_lines' => true,
     'no_php4_constructor' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],

.travis.yml

@@ -17,11 +17,6 @@ php:
 
 dist: xenial
 
-addons:
-  apt:
-    packages:
-      - libxml2-utils
-
 cache:
   pip: true
   directories:
@@ -38,8 +33,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: '7.3'
-      env: TARGET=lint
     - php: '7.2'
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.3'

Makefile

@@ -6,7 +6,7 @@ all:
 	@echo "Please choose a task."
 .PHONY: all
 
-lint: lint-composer lint-yaml lint-composer lint-xml lint-php
+lint: lint-composer lint-yaml lint-xml lint-php
 .PHONY: lint
 
 lint-composer:

src/Command/ConsumerHandlerCommand.php

@@ -115,7 +115,8 @@ public function execute(InputInterface $input, OutputInterface $output)
 
                 $currentMemory = memory_get_usage(true);
 
-                $output->writeln(sprintf('<comment>OK! </comment> - %0.04fs, %ss, %s, %s - %s = %s, %0.02f%%',
+                $output->writeln(sprintf(
+                    '<comment>OK! </comment> - %0.04fs, %ss, %s, %s - %s = %s, %0.02f%%',
                     microtime(true) - $start,
                     $date->format('U') - $message->getCreatedAt()->format('U'),
                     $this->formatMemory($currentMemory - $memoryUsage),

src/Command/RestartCommand.php

@@ -61,7 +61,8 @@ public function execute(InputInterface $input, OutputInterface $output)
                 $input->getOption('pause'),
                 $input->getOption('batch-size'),
                 $input->getOption('max-attempts'),
-                $input->getOption('attempt-delay'));
+                $input->getOption('attempt-delay')
+            );
         } else {
             $messages = $this->getErroneousMessageSelector()->getMessages(
                 $input->getOption('type'),

src/DependencyInjection/SonataNotificationExtension.php

@@ -324,7 +324,8 @@ protected function configureRabbitmq(ContainerBuilder $container, array $config)
         foreach ($deadLetterRoutingKeys as $key) {
             if (!\in_array($key, $routingKeys, true)) {
                 throw new \RuntimeException(sprintf(
-                    'You must configure the queue having the routing_key "%s" same as dead_letter_routing_key', $key
+                    'You must configure the queue having the routing_key "%s" same as dead_letter_routing_key',
+                    $key
                 ));
             }
         }

tests/DependencyInjection/SonataNotificationExtensionTest.php

@@ -173,7 +173,8 @@ private function getContainerBuilder(array $bundles = [])
         $container = new ContainerBuilder();
 
         $containerBundles = array_merge(
-            ['SonataNotificationBundle' => SonataNotificationBundle::class], $bundles
+            ['SonataNotificationBundle' => SonataNotificationBundle::class],
+            $bundles
         );
         $container->setParameter('kernel.bundles', $containerBundles);
 
@@ -201,14 +202,18 @@ private function getContainerBuilder(array $bundles = [])
     private function assertAlias($alias, $service)
     {
         $this->assertSame(
-            $alias, (string) $this->container->getAlias($service), sprintf('%s alias is correct', $service)
+            $alias,
+            (string) $this->container->getAlias($service),
+            sprintf('%s alias is correct', $service)
         );
     }
 
     private function assertParameter($expectedValue, $name)
     {
         $this->assertSame(
-            $expectedValue, $this->container->getParameter($name), sprintf('%s parameter is correct', $name)
+            $expectedValue,
+            $this->container->getParameter($name),
+            sprintf('%s parameter is correct', $name)
         );
     }
 

tests/Iterator/MessageManagerMessageIterator.php

@@ -29,7 +29,8 @@ public function __construct(ManagerRegistry $registry, $pause = 0, $batchSize =
             new MessageManagerMock(Message::class, $registry),
             [],
             $pause,
-            $batchSize);
+            $batchSize
+        );
     }
 
     /**