Merge pull request #41 from pluswerk/feature/grumphp-0.19

pluswerk · Jun 15, 2020 · f7bac31 · f7bac31
2 parents 75d1d2c + ba52106
commit f7bac31
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ git:
 php:
   - 7.2
   - 7.3
+  - 7.4
   - nightly
 
 env:

diff --git a/composer.json b/composer.json
@@ -26,9 +26,9 @@
     "require": {
         "php": ">=7.2",
         "composer-plugin-api": "1.*",
-        "phpro/grumphp": "0.16.* || 0.17.*",
-        "pluswerk/grumphp-bom-task": "5.*",
-        "pluswerk/grumphp-xliff-task": "3.*",
+        "phpro/grumphp": "0.19.*",
+        "pluswerk/grumphp-bom-task": "6.*",
+        "pluswerk/grumphp-xliff-task": "4.*",
         "squizlabs/php_codesniffer": ">=3.5.0 <4.0.0",
         "sensiolabs/security-checker": "6.*",
         "php-parallel-lint/php-parallel-lint": "1.*"

diff --git a/grumphp.yml b/grumphp.yml
@@ -1,17 +1,16 @@
 parameters:
-  git_dir: .
-  bin_dir: vendor/bin
-  stop_on_failure: false
-  hide_circumvention_tip: true
-  ignore_unstaged_changes: false #brocken
-  process_timeout: "%convention.process_timeout%"
   convention.process_timeout: 60
   convention.security_checker_blocking: true
   convention.jsonlint_ignore_pattern: []
   convention.xmllint_ignore_pattern: []
   convention.yamllint_ignore_pattern: []
   convention.phpcslint_ignore_pattern: []
   convention.xlifflint_ignore_pattern: ["#typo3conf/l10n/(.*)#"]
+grumphp:
+  stop_on_failure: false
+  hide_circumvention_tip: true
+  ignore_unstaged_changes: false #brocken
+  process_timeout: "%convention.process_timeout%"
   ascii:
     failed: ./vendor/pluswerk/grumphp-config/logo.txt
     succeeded: ./vendor/pluswerk/grumphp-config/logo.txt

diff --git a/logo.txt b/logo.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ git: @@
     php:
       - 7.2
       - 7.3
+      - 7.4
       - nightly
     env:
@@ Expand Down @@