Fix CI

webgriffe · Oct 15, 2024 · aa3ee10 · aa3ee10
1 parent d5f754d
commit aa3ee10
Show file tree

Hide file tree

Showing 6 changed files with 468 additions and 23 deletions.
diff --git a/ecs.php b/ecs.php
@@ -9,17 +9,15 @@
 return static function (ECSConfig $ecsConfig): void {
     $ecsConfig->import('vendor/sylius-labs/coding-standard/ecs.php');
 
-    $params = $ecsConfig->parameters();
-
-    $params->set(Option::PATHS, [
+    $ecsConfig->paths([
         'src',
         'tests/Behat',
         'tests/Integration',
         'tests/Stub',
     ]);
     $ecsConfig->skip(['src/Kernel.php']);
 
-    $ecsConfig->parameters()->set(Option::SKIP, [
+    $ecsConfig->skip([
         VisibilityRequiredFixer::class => ['*Spec.php'],
     ]);
 };
diff --git a/src/Command/ServiceChangesCommand.php b/src/Command/ServiceChangesCommand.php
@@ -7,7 +7,6 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Command\BuildDebugContainerTrait;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -100,6 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->initializeBundles();
             /**
              * @var ContainerBuilder $containerBuilder
+             *
              * @psalm-suppress UndefinedMethod
              */
             $containerBuilder = $this->buildContainer();
@@ -175,8 +175,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     'Found %s services that must be checked manually because the related alias referes to a Sylius' .
                     ' service. Actually it\'s impossible to detect if the original class changed between versions.' .
                     ' Here is the list ([decorated service] -> [decorating service]):',
-                    count($syliusServicesWithAppClass)
-                )
+                    count($syliusServicesWithAppClass),
+                ),
             );
             foreach ($syliusServicesWithAppClass as $alias => $class) {
                 $this->writeLine(sprintf('"%s" -> "%s"', $alias, $class));
@@ -192,7 +192,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     private function computeServicesThatChanged(array $decoratedServicesAssociation): bool
     {
         $this->writeLine(
-            sprintf('Computing modified services between %s and %s', $this->getFromVersion(), $this->getToVersion())
+            sprintf('Computing modified services between %s and %s', $this->getFromVersion(), $this->getToVersion()),
         );
         $this->writeLine('');
 
@@ -215,7 +215,7 @@ private function computeServicesThatChanged(array $decoratedServicesAssociation)
 
         $this->writeLine(sprintf(
             'Found %s services that changed and were decorated ([decorated service] -> [decorating service]):',
-            count($decoratedServices)
+            count($decoratedServices),
         ));
         foreach ($decoratedServices as $newService => $oldService) {
             $this->writeLine(sprintf('"%s" -> "%s"', $oldService, $newService));
@@ -250,7 +250,7 @@ private function getFilesChangedBetweenTwoVersions(): array
 
     private function compile(
         ContainerBuilder $rawContainerBuilder,
-        DecoratorServicePass $decoratorServiceDefinitionsPass
+        DecoratorServicePass $decoratorServiceDefinitionsPass,
     ): void {
         $compiler = $rawContainerBuilder->getCompiler();
 
@@ -326,7 +326,7 @@ private function isSyliusService(string $decoratedServiceId): bool
     private function applyDecoratedDefinitionsStrategy(
         array &$decoratedServicesAssociation,
         string $alias,
-        ?array $decoratedDef = null
+        ?array $decoratedDef = null,
     ): bool {
         if ($decoratedDef !== null &&
             (str_starts_with($alias, sprintf('%s\\', $this->getNamespacePrefix())) ||
@@ -390,7 +390,7 @@ private function applyDecoratedDefinitionsNonAppClassStrategy(
     /**
      * @param array<string, string> $decoratedServicesAssociation
      */
-    private function applyAliasStrategy(array &$decoratedServicesAssociation, string $alias, string $definitionClass,): bool
+    private function applyAliasStrategy(array &$decoratedServicesAssociation, string $alias, string $definitionClass): bool
     {
         if (!class_exists($alias)) {
             return false;
@@ -411,7 +411,7 @@ private function applyInnerStrategy(
         array &$decoratedServicesAssociation,
         Definition $definition,
         array $decoratedDefintions,
-        string $definitionClass
+        string $definitionClass,
     ): bool {
         /**
          * @psalm-suppress InternalProperty

diff --git a/src/DependencyInjection/Compiler/DecoratorServicePass.php b/src/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -8,7 +8,6 @@
 use Symfony\Component\DependencyInjection\Compiler\AbstractRecursivePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\Reference;