feat: Symfony 8 support

.github/workflows/ci.yml

@@ -19,15 +19,15 @@ jobs:
   sca:
     uses: zenstruck/.github/.github/workflows/php-stan.yml@main
     with:
-      php: 8.2
+      php: 8.4
 
   fixcs:
     name: Run php-cs-fixer
     needs: sync-with-template
     if: (github.event_name == 'push' || github.event_name == 'schedule') && !startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     steps:
-      - uses: zenstruck/.github@php-cs-fixer
+      - uses: zenstruck/.github/actions/php-cs-fixer@main
         with:
           php: 8
           key: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -38,7 +38,7 @@ jobs:
     if: (github.event_name == 'push' || github.event_name == 'schedule') && !startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     steps:
-      - uses: zenstruck/.github@sync-with-template
+      - uses: zenstruck/.github/actions/sync-with-template@main
         with:
           key: ${{ secrets.GPG_PRIVATE_KEY }}
           token: ${{ secrets.COMPOSER_TOKEN }}

composer.json

@@ -16,14 +16,14 @@
         "psr/link": "^1.0|^2.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.4",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^9.6.21",
         "rize/uri-template": "^0.3.5",
-        "symfony/browser-kit": "^5.4|^6.0|^7.0",
-        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
-        "symfony/phpunit-bridge": "^6.1|^7.0",
-        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
-        "symfony/web-link": "^5.4|^6.0|^7.0",
+        "symfony/browser-kit": "^6.4|^7.0|^8.0",
+        "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+        "symfony/phpunit-bridge": "^6.4|^7.0|^8.0",
+        "symfony/twig-bundle": "^6.4|^7.0|^8.0",
+        "symfony/web-link": "^6.4|^7.0|^8.0",
         "twig/twig": ">=2.16.1"
     },
     "provide": {

src/Uri/Bridge/Symfony/DependencyInjection/ZenstruckUriExtension.php

@@ -31,11 +31,11 @@
  */
 final class ZenstruckUriExtension extends ConfigurableExtension implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder(): TreeBuilder
+    public function getConfigTreeBuilder(): TreeBuilder // @phpstan-ignore-line
     {
         $builder = new TreeBuilder('zenstruck_uri');
 
-        $builder->getRootNode() // @phpstan-ignore-line
+        $builder->getRootNode()
             ->children()
                 ->scalarNode('secret')
                     ->info('The secret key to sign/verify URIs with')

src/Uri/Bridge/Symfony/Routing/SignedRouteLoader.php

@@ -64,7 +64,7 @@ public function setResolver(LoaderResolverInterface $resolver): void
     private static function parseSignedAttribute(Route $route): void
     {
         try {
-            $method = \method_exists(\ReflectionMethod::class, 'createFromMethodName') ? \ReflectionMethod::createFromMethodName($route->getDefault('_controller')) : new \ReflectionMethod($route->getDefault('_controller'));
+            $method = \method_exists(\ReflectionMethod::class, 'createFromMethodName') ? \ReflectionMethod::createFromMethodName($route->getDefault('_controller')) : new \ReflectionMethod($route->getDefault('_controller')); // @phpstan-ignore function.alreadyNarrowedType
         } catch (\ReflectionException) {
             return;
         }

src/Uri/Link/UriLink.php

@@ -59,8 +59,6 @@ public static function decode(string $encoded): self
         $rels = [];
 
         foreach ($matches as [, $key, $value]) {
-            /** @var string $key */
-            /** @var string $value */
             if ('rel' !== $key) {
                 $attributes[$key] = $value;
 
@@ -157,8 +155,6 @@ public function withoutRel($rel): static
     /**
      * @param string                                    $attribute
      * @param float|int|\Stringable|bool|mixed[]|string $value
-     *
-     * @return $this
      */
     public function withAttribute($attribute, $value): static
     {

src/Uri/Mailto.php

@@ -79,12 +79,12 @@ public function bcc(): array
 
     public function subject(): ?string
     {
-        return $this->uri->query()->get('subject');
+        return $this->uri->query()->getString('subject') ?: null;
     }
 
     public function body(): ?string
     {
-        return $this->uri->query()->get('body');
+        return $this->uri->query()->getString('body') ?: null;
     }
 
     public function withTo(string ...$to): self

src/Uri/Parameters.php

@@ -13,8 +13,6 @@
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class Parameters
 {

src/Uri/ParsedUri.php

@@ -27,8 +27,6 @@
  * Wrapper for PHP's native "parse_url()".
  *
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class ParsedUri extends BaseUri
 {
@@ -86,7 +84,7 @@ public function normalize(): self
 
     public function toString(): string
     {
-        if (isset($this->value)) {
+        if (isset($this->value)) { // @phpstan-ignore isset.initializedProperty
             return $this->value;
         }
 

src/Uri/Part/Authority.php

@@ -15,8 +15,6 @@
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class Authority extends Part
 {

src/Uri/Part/Path.php

@@ -15,8 +15,6 @@
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class Path extends Part
 {

src/Uri/Part/Query.php

@@ -16,8 +16,6 @@
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class Query extends Part
 {

src/Uri/Signed/Builder.php

@@ -16,8 +16,6 @@
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class Builder implements \Stringable
 {

src/Uri/TemplateUri.php

@@ -16,8 +16,6 @@
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @immutable
  */
 final class TemplateUri extends WrappedUri
 {

tests/Bridge/Symfony/Fixture/TestController1.php

@@ -12,7 +12,7 @@
 namespace Zenstruck\Uri\Tests\Bridge\Symfony\Fixture;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Twig\Environment;
 use Zenstruck\Uri\Bridge\Symfony\Routing\Signed;
 use Zenstruck\Uri\Bridge\Symfony\Routing\SignedUrlVerifier;

tests/Bridge/Symfony/Fixture/TestController2.php

@@ -12,7 +12,7 @@
 namespace Zenstruck\Uri\Tests\Bridge\Symfony\Fixture;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

tests/Bridge/Symfony/Fixture/TestController3.php

@@ -12,7 +12,7 @@
 namespace Zenstruck\Uri\Tests\Bridge\Symfony\Fixture;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Zenstruck\Uri\Bridge\Symfony\Routing\Signed;
 
 /**

tests/Bridge/Symfony/Fixture/TestKernel.php

@@ -60,6 +60,6 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
     protected function configureRoutes(RoutingConfigurator $routes): void
     {
-        $routes->import(__DIR__, self::MAJOR_VERSION < 6 ? 'annotation' : 'attribute');
+        $routes->import(__DIR__, 'attribute');
     }
 }

tests/SignedUriTest.php

@@ -140,7 +140,6 @@ protected function uriFor(string $value): SignedUri
         $class = new \ReflectionClass(SignedUri::class);
         $uri = $class->newInstanceWithoutConstructor();
         $prop = $class->getProperty('uri');
-        $prop->setAccessible(true);
         $prop->setValue($uri, new ParsedUri($value));
 
         return $uri;