Merge pull request #3 from erkens/grumphp-upgrade-v2

Upgrade to new ExtensionInterface for GrumPHP 2.x

composer.json

@@ -19,10 +19,8 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0"
-    },
-    "require-dev": {
-        "phpro/grumphp": "^1.0"
+        "php": "^8.1",
+        "phpro/grumphp": "^2.0"
     },
     "autoload": {
         "psr-4": {

config/doctrine-task-extension.yaml

@@ -0,0 +1,8 @@
+services:
+    JonMldr\GrumPhpDoctrineTask\DoctrineSchemaValidateTask:
+        class: \JonMldr\GrumPhpDoctrineTask\DoctrineSchemaValidateTask
+        arguments:
+            - "@process_builder"
+            - "@formatter.raw_process"
+        tags:
+            - { name: grumphp.task, task: doctrine_schema_validate }

src/DoctrineSchemaValidateTask.php

@@ -7,6 +7,7 @@
 use GrumPHP\Runner\TaskResult;
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\AbstractExternalTask;
+use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
 use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
@@ -30,7 +31,7 @@ public function canRunInContext(ContextInterface $context): bool
     /**
      * {@inheritdoc}
      */
-    public static function getConfigurableOptions(): OptionsResolver
+    public static function getConfigurableOptions(): ConfigOptionsResolver
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults([
@@ -44,7 +45,9 @@ public static function getConfigurableOptions(): OptionsResolver
             ->addAllowedTypes('skip_sync', ['bool'])
             ->addAllowedTypes('triggered_by', ['array']);
 
-        return $resolver;
+        return ConfigOptionsResolver::fromClosure(
+            static fn (array $options): array => $resolver->resolve($options)
+        );
     }
 
     /**

src/ExtensionLoader.php

@@ -10,11 +10,10 @@
 
 class ExtensionLoader implements ExtensionInterface
 {
-    public function load(ContainerBuilder $container): void
+    public function imports(): iterable
     {
-        $container->register('task.doctrine_schema_validate', DoctrineSchemaValidateTask::class)
-            ->addArgument(new Reference('process_builder'))
-            ->addArgument(new Reference('formatter.raw_process'))
-            ->addTag('grumphp.task', ['task' => 'doctrine_schema_validate']);
+        $configDir = dirname(__DIR__) . '/config';
+
+        yield $configDir . '/doctrine-task-extension.yaml';
     }
 }