Merge a81bdc0 into 915b322

sonata-project · Feb 12, 2020 · c81795f · c81795f
2 parents 915b322 + a81bdc0
commit c81795f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -43,7 +43,7 @@ jobs:
             - name: "Install Ruby 2.6"
               uses: actions/setup-ruby@v1
               with:
-                  ruby-version: '2.6' # Version range or exact version of a Ruby version to use, using semvers version range syntax.
+                  ruby-version: '2.6'
             - run: gem install yaml-lint
             - name: "Linting..."
               run: make lint-yaml

diff --git a/.php_cs.dist b/.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],

diff --git a/Makefile b/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: