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

✨ make compatible with grumphp 0.19
pluswerk · Jun 15, 2020 · dc971f6 · dc971f6
2 parents 9f8d209 + 7d29e00
commit dc971f6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 30 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
@@ -24,8 +24,9 @@
         }
     },
     "require": {
+        "ext-dom": "*",
         "php": ">=7.2",
-        "phpro/grumphp": "0.16.* || 0.17.*"
+        "phpro/grumphp": "0.19.*"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": ">=3.5.0 <4.0.0"

diff --git a/grumphp.yml b/grumphp.yml
@@ -1,8 +1,4 @@
-parameters:
-    git_dir: .
-    bin_dir: vendor/bin
-    stop_on_failure: false
-    ignore_unstaged_changes: false #brocken
+grumphp:
     tasks:
         composer:
             with_dependencies: false
@@ -14,16 +10,14 @@ parameters:
                 - "exit;"
             triggered_by: [php]
         git_commit_message:
-            matchers:
-                - /(\[(!!!|WIP)]|)(\[(BUGFIX|FEATURE|TASK|CLEANUP|SECURITY)]|Merge branch '.+' into) .+/
-            case_insensitive: false
-            multiline: true
-            additional_modifiers: ''
+            max_subject_width: 120
+            max_body_width: 120
+            enforce_capitalized_subject: false
         jsonlint:
             detect_key_conflicts: true
         phpcs:
             standard: "PSR12"
-            warning_severity: 900000
+            warning_severity: 0
             tab_width: 4
         yamllint: ~
         xlifflint: ~

diff --git a/src/ExtensionLoader.php b/src/ExtensionLoader.php
@@ -12,10 +12,9 @@ public function load(ContainerBuilder $container)
     {
         $container->register('linter.xlifflint', XliffLinter::class);
         return $container->register('task.xlifflint', XliffLint::class)
-            ->addArgument(new Reference('config'))
             ->addArgument(new Reference('linter.xlifflint'))
             ->addArgument(new Reference('process_builder'))
             ->addArgument(new Reference('formatter.raw_process'))
-            ->addTag('grumphp.task', ['config' => 'xlifflint']);
+            ->addTag('grumphp.task', ['task' => 'xlifflint']);
     }
 }
diff --git a/src/XliffLint.php b/src/XliffLint.php
@@ -16,12 +16,7 @@ class XliffLint extends AbstractLinterTask
     /** @var XliffLinter */
     protected $linter;
 
-    public function getName(): string
-    {
-        return 'xlifflint';
-    }
-
-    public function getConfigurableOptions(): OptionsResolver
+    public static function getConfigurableOptions(): OptionsResolver
     {
         $resolver = parent::getConfigurableOptions();
         $resolver->setDefaults(
@@ -48,15 +43,15 @@ public function canRunInContext(ContextInterface $context): bool
 
     public function run(ContextInterface $context): TaskResultInterface
     {
-        $config = $this->getConfiguration();
-        $files = $context->getFiles()->extensions($config['triggered_by']);
+        $options = $this->getConfig()->getOptions();
+        $files = $context->getFiles()->extensions($options['triggered_by']);
         if (0 === count($files)) {
             return TaskResult::createSkipped($this, $context);
         }
-        $this->linter->setLoadFromNet($config['load_from_net']);
-        $this->linter->setXInclude($config['x_include']);
-        $this->linter->setDtdValidation($config['dtd_validation']);
-        $this->linter->setSchemeValidation($config['scheme_validation']);
+        $this->linter->setLoadFromNet($options['load_from_net']);
+        $this->linter->setXInclude($options['x_include']);
+        $this->linter->setDtdValidation($options['dtd_validation']);
+        $this->linter->setSchemeValidation($options['scheme_validation']);
         try {
             $lintErrors = $this->lint($files);
         } catch (RuntimeException $e) {

diff --git a/src/XliffLinter.php b/src/XliffLinter.php
@@ -2,6 +2,7 @@
 
 namespace PLUS\GrumPHPXliffTask;
 
+use DOMDocument;
 use GrumPHP\Collection\LintErrorsCollection;
 use GrumPHP\Linter\LintError;
 use GrumPHP\Linter\Xml\XmlLinter;
@@ -15,7 +16,7 @@ public function lint(SplFileInfo $file): LintErrorsCollection
         if ($lintErrors->count()) {
             return $lintErrors;
         }
-        $document = new \DOMDocument();
+        $document = new DOMDocument();
         if (!$document->load($file->getPathname())) {
             $lintErrors->add(
                 new LintError(
@@ -29,7 +30,7 @@ public function lint(SplFileInfo $file): LintErrorsCollection
         }
 
         $rootElement = $document->documentElement;
-        /** @var \DOMElement[] $fileTags */
+        /** @var DOMElement[] $fileTags */
         $fileTags = $rootElement->getElementsByTagName('file');
         foreach ($fileTags as $fileTag) {
             if ($fileTag->attributes->getNamedItem('target')) {
@@ -44,7 +45,7 @@ public function lint(SplFileInfo $file): LintErrorsCollection
                 continue;
             }
             if ($fileTag->attributes->getNamedItem('target-language')) {
-                /** @var \DOMElement[] $transUnitTags */
+                /** @var DOMElement[] $transUnitTags */
                 $transUnitTags = $fileTag->getElementsByTagName('trans-unit');
                 foreach ($transUnitTags as $transUnitTag) {
                     if (!$transUnitTag->attributes->getNamedItem('id')) {
@@ -69,7 +70,7 @@ public function lint(SplFileInfo $file): LintErrorsCollection
                     }
                 }
             } else {
-                /** @var \DOMElement[] $transUnitTags */
+                /** @var DOMElement[] $transUnitTags */
                 $transUnitTags = $fileTag->getElementsByTagName('trans-unit');
                 foreach ($transUnitTags as $transUnitTag) {
                     if (!$transUnitTag->attributes->getNamedItem('id')) {