Remove v1 deprecations

phpro · May 25, 2023 · fd4c117 · fd4c117
1 parent cd90aef
commit fd4c117
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 102 deletions.
diff --git a/spec/Exception/DeprecatedExceptionSpec.php b/spec/Exception/DeprecatedExceptionSpec.php
diff --git a/spec/Exception/TaskConfigResolverExceptionSpec.php b/spec/Exception/TaskConfigResolverExceptionSpec.php
@@ -29,11 +29,4 @@ public function it_handles_unknown_class(): void
         $this->beConstructedThrough('unknownClass', [$class = 'SomeClass']);
         $this->getMessage()->shouldContain($class);
     }
-
-    public function it_handles_deprecated_task(): void
-    {
-        $this->beConstructedThrough('deprectatedTask', [$task = 'taskName']);
-        $this->getMessage()->shouldContain($task);
-        $this->getMessage()->shouldContain('https://github.com/phpro/grumphp/blob/master/doc/tasks.md#creating-a-custom-task');
-    }
 }
diff --git a/src/Configuration/Compiler/TaskCompilerPass.php b/src/Configuration/Compiler/TaskCompilerPass.php
@@ -15,8 +15,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TaskCompilerPass implements CompilerPassInterface
@@ -92,29 +90,12 @@ private function getTaskTag(array $tag): array
         if (null === $taskTagResolver) {
             $taskTagResolver = new OptionsResolver();
 
-            // Instead of required task param : use this to enable the fallback for the deprecated tasks.
-            $taskTagResolver->setDefined(['task', 'aliasFor', 'priority']);
+            $taskTagResolver->setRequired(['task']);
+            $taskTagResolver->setDefined(['aliasFor', 'priority']);
             $taskTagResolver->setAllowedTypes('task', ['string']);
             $taskTagResolver->setAllowedTypes('aliasFor', ['string', 'null']);
             $taskTagResolver->setAllowedTypes('priority', ['int']);
-            $taskTagResolver->setDefault('task', '');
             $taskTagResolver->setDefault('priority', 0);
-            $taskTagResolver->setNormalizer('task', static function (Options $options, ?string $value) {
-                if (!$value && !$options->offsetExists('config')) {
-                    throw new MissingOptionsException('The required option "task" is missing.');
-                }
-
-                return $value;
-            });
-
-            // Clean fallback for installation with old tasks.
-            $taskTagResolver->setDefined('config');
-            $taskTagResolver->setNormalizer(
-                'config',
-                static function (Options $options, string $value) {
-                    throw TaskConfigResolverException::deprectatedTask($value);
-                }
-            );
         }
 
         return $taskTagResolver->resolve($tag);

diff --git a/src/Configuration/GrumPHPExtension.php b/src/Configuration/GrumPHPExtension.php
@@ -4,7 +4,6 @@
 
 namespace GrumPHP\Configuration;
 
-use GrumPHP\Exception\DeprecatedException;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
@@ -35,11 +34,6 @@ public function getAlias(): string
     private function loadInternal(array $config, ContainerBuilder $container): void
     {
         foreach ($config as $key => $value) {
-            // We require using grumphp instead of parameters at this point:
-            if ($container->hasParameter($key)) {
-                throw DeprecatedException::directParameterConfiguration($key);
-            }
-
             $container->setParameter($key, $value);
         }
     }

diff --git a/src/Exception/DeprecatedException.php b/src/Exception/DeprecatedException.php
diff --git a/src/Exception/TaskConfigResolverException.php b/src/Exception/TaskConfigResolverException.php
@@ -23,15 +23,4 @@ public static function unknownClass(string $class): self
             )
         );
     }
-
-    public static function deprectatedTask(string $taskName): self
-    {
-        return new self(
-            'Your configuration contains an old task implementation for "'.$taskName.'".' . PHP_EOL
-            . 'This task cannot be used in current setup.' . PHP_EOL
-            . 'Please upgrade your extension(s) or fall back to a previous version of GrumPHP.' . PHP_EOL
-            . 'More information about the new task system: '. PHP_EOL
-            . 'https://github.com/phpro/grumphp/blob/master/doc/tasks.md#creating-a-custom-task' . PHP_EOL . PHP_EOL
-        );
-    }
 }
diff --git a/src/Task/ESLint.php b/src/Task/ESLint.php
@@ -55,19 +55,6 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
         $resolver->addAllowedTypes('no_eslintrc', ['bool']);
         $resolver->addAllowedTypes('quiet', ['bool']);
 
-        $resolver->setDeprecated(
-            'whitelist_patterns',
-            'phpro/grumphp',
-            '1.14',
-            function (Options $options, mixed $value): string {
-                if (null === $value) {
-                    return 'Parsing "null" to option "whitelist_patterns" is deprecated, pass an array instead.';
-                }
-
-                return '';
-            }
-        );
-
         return ConfigOptionsResolver::fromOptionsResolver($resolver);
     }