DevKit updates for 2.x branch

.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/Builder/FormContractor.php

@@ -105,7 +105,8 @@ public function getFormBuilder($name, array $options = [])
             $name,
             FormType::class,
             null,
-            $options);
+            $options
+        );
     }
 
     /**

tests/Unit/Filter/DateFilterTest.php

@@ -100,19 +100,23 @@ public function testFilterEquals(): void
 
         // FROM
         $opDynamic = $this->qbTester->getNode(
-            'where.constraint.constraint.operand_dynamic');
+            'where.constraint.constraint.operand_dynamic'
+        );
         $opStatic = $this->qbTester->getNode(
-            'where.constraint.constraint.operand_static');
+            'where.constraint.constraint.operand_static'
+        );
 
         $this->assertSame('a', $opDynamic->getAlias());
         $this->assertSame('somefield', $opDynamic->getField());
         $this->assertSame($from->getTimestamp(), $opStatic->getValue()->getTimestamp());
 
         // TO
         $opDynamic = $this->qbTester->getNode(
-            'where.constraint.constraint[1].operand_dynamic');
+            'where.constraint.constraint[1].operand_dynamic'
+        );
         $opStatic = $this->qbTester->getNode(
-            'where.constraint.constraint[1].operand_static');
+            'where.constraint.constraint[1].operand_static'
+        );
 
         $this->assertSame('a', $opDynamic->getAlias());
         $this->assertSame('somefield', $opDynamic->getField());