Merge branch '1.14' into upmerge/1.13_1.14

Author: loic425

.dockerignore

@@ -5,6 +5,7 @@
 !/ecs.php
 !/phpspec.yml.dist
 !/phpstan.neon
+!/phpstan-baseline.neon
 !/phpunit.xml.dist
 !/psalm.xml
 !/rector.php

.gitattributes

@@ -9,6 +9,7 @@
 /Makefile export-ignore
 /phpspec.yml.dist export-ignore
 /phpstan.neon export-ignore
+/phpstan-baseline.neon export-ignore
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore
 /rector.php

.github/workflows/build.yml

@@ -75,8 +75,8 @@ jobs:
                     (cd tests/Application && bin/console doctrine:schema:create)
 
             -
-                name: Run Psalm
-                run: vendor/bin/psalm --php-version=${{ matrix.php }}
+                name: Run PHPStan
+                run: vendor/bin/phpstan analyse --ansi --memory-limit=-1 -c phpstan.neon src
 
             -
                 name: Run analysis
@@ -183,6 +183,7 @@ jobs:
             -
                 name: Create-project with skeleton
                 run: |
+                    set -x
                     composer create-project --ansi "symfony/skeleton:${{ matrix.skeleton }}" skeleton_app
                     cd skeleton_app
                     composer config extra.symfony.allow-contrib true

.github/workflows/upmerge_pr.yaml

@@ -21,8 +21,8 @@ jobs:
             matrix:
                 include:
                     -
-                        base_branch: "1.12"
-                        target_branch: "1.13"
+                        base_branch: "1.13"
+                        target_branch: "1.14"
 
         steps:
             -

composer.json

@@ -61,7 +61,7 @@
         "friendsofsymfony/rest-bundle": "^3.7",
         "jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0",
         "lchrusciel/api-test-case": "^5.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.2.1 || ^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.1.0",
         "pagerfanta/pagerfanta": "^4.4",
         "pamil/phpspec-skip-example-extension": "^4.2",
         "phpspec/phpspec": "^7.5",
@@ -138,7 +138,7 @@
         "analyse": [
             "@composer validate --strict",
             "vendor/bin/ecs check",
-            "vendor/bin/phpstan analyse --ansi --memory-limit=256M -c phpstan.neon -l max src"
+            "vendor/bin/phpstan analyse --ansi --memory-limit=256M -c phpstan.neon src"
         ],
         "fix": [
             "vendor/bin/ecs check --fix"

phpstan-baseline.neon

@@ -122,6 +122,7 @@
         <InvalidReturnType>
             <errorLevel type="suppress">
                 <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />
+                <file name="src/Component/src/Metadata/Extractor/PhpFileResourceExtractor.php" />
             </errorLevel>
         </InvalidReturnType>
 
@@ -175,6 +176,12 @@
             </errorLevel>
         </MoreSpecificImplementedParamType>
 
+        <NullableReturnStatement>
+            <errorLevel type="suppress">
+                <file name="src/Component/src/Metadata/Extractor/PhpFileResourceExtractor.php" />
+            </errorLevel>
+        </NullableReturnStatement>
+
         <NullArgument>
             <errorLevel type="suppress">
                 <directory name="src" />
@@ -190,6 +197,7 @@
         <PossiblyNullArgument>
             <errorLevel type="suppress">
                 <file name="src/Bundle/Grid/Parser/OptionsParser.php" />
+                <file name="src/Component/src/Metadata/Operation/HttpOperationInitiator.php" />
             </errorLevel>
         </PossiblyNullArgument>
 
@@ -323,6 +331,12 @@
             </errorLevel>
         </UnrecognizedStatement>
 
+        <UnresolvableInclude>
+            <errorLevel type="suppress">
+                <file name="src/Component/src/Metadata/Extractor/PhpFileResourceExtractor.php" />
+            </errorLevel>
+        </UnresolvableInclude>
+
         <UnsupportedReferenceUsage>
             <errorLevel type="suppress">
                 <file name="src/Component/src/Doctrine/Persistence/InMemoryRepository.php" />

phpstan.neon

@@ -19,6 +19,7 @@
 use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface;
 use Sylius\Resource\Context\Option\MetadataOption;
 use Sylius\Resource\Metadata\RegistryInterface;
+use Sylius\Resource\Symfony\ExpressionLanguage\VarsResolverInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 final class LegacyRequestContextInitiator implements RequestContextInitiatorInterface
@@ -27,7 +28,17 @@ public function __construct(
         private RegistryInterface $resourceRegistry,
         private RequestConfigurationFactoryInterface $requestConfigurationFactory,
         private RequestContextInitiatorInterface $decorated,
+        private ?VarsResolverInterface $varsResolver = null,
     ) {
+        if (null === $varsResolver) {
+            trigger_deprecation(
+                'sylius/resource-bundle',
+                '1.14',
+                'Not passing an instance of "%s" as the fourth constructor argument for "%s" is deprecated and will not be supported in 2.0.',
+                VarsResolverInterface::class,
+                self::class,
+            );
+        }
     }
 
     public function initializeContext(Request $request): Context
@@ -49,7 +60,19 @@ public function initializeContext(Request $request): Context
         }
 
         $configuration = $this->requestConfigurationFactory->create($metadata, $request);
+        $configurationVars = $this->resolveVars($configuration->getVars());
+
+        $configuration->getParameters()->set('vars', $configurationVars);
 
         return $context->with(new MetadataOption($metadata), new RequestConfigurationOption($configuration));
     }
+
+    private function resolveVars(array $vars): array
+    {
+        if (null === $this->varsResolver) {
+            return $vars;
+        }
+
+        return $this->varsResolver->resolve($vars);
+    }
 }

psalm.xml

@@ -83,7 +83,7 @@ public function getDefaultTemplate($name)
         $templatesNamespace = (string) $this->metadata->getTemplatesNamespace();
 
         if (false !== strpos($templatesNamespace, ':')) {
-            return sprintf('%s:%s.%s', $templatesNamespace ?: ':', $name, 'twig');
+            return sprintf('%s:%s.%s', $templatesNamespace, $name, 'twig');
         }
 
         return sprintf('%s/%s.%s', $templatesNamespace, $name, 'twig');