Allow Symfony 8 (#210)

* Allow Symfony 8

* Convert XML config into PHP

* Enable package sorting

* Remove ignored PHPstan error

* Suppress PHPstan error about TreeBuilder does not specify its types

Author: bocharsky-bw

composer.json

@@ -6,17 +6,17 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=8.1",
-        "symfony/config": "^5.4 | ^6.0 | ^7.0",
-        "symfony/dependency-injection": "^5.4 | ^6.0 | ^7.0",
-        "symfony/http-kernel": "^5.4 | ^6.0 | ^7.0",
-        "symfony/routing": "^5.4 | ^6.0 | ^7.0",
-        "symfony/deprecation-contracts": "^2.2 | ^3.0"
+        "symfony/config": "^5.4 | ^6.0 | ^7.0 | ^8.0",
+        "symfony/dependency-injection": "^5.4 | ^6.0 | ^7.0 | ^8.0",
+        "symfony/deprecation-contracts": "^2.2 | ^3.0",
+        "symfony/http-kernel": "^5.4 | ^6.0 | ^7.0 | ^8.0",
+        "symfony/routing": "^5.4 | ^6.0 | ^7.0 | ^8.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
         "doctrine/persistence": "^2.0",
-        "symfony/framework-bundle": "^5.4 | ^6.0 | ^7.0",
-        "symfony/phpunit-bridge": "^5.4 | ^6.0 | ^7.0"
+        "symfony/framework-bundle": "^5.4 | ^6.0 | ^7.0 | ^8.0",
+        "symfony/phpunit-bridge": "^5.4 | ^6.0 | ^7.0 | ^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -41,5 +41,8 @@
         ],
         "tools:run:php-cs-fixer": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix",
         "tools:run:phpstan": "tools/phpstan/vendor/bin/phpstan --memory-limit=1G"
+    },
+    "config": {
+        "sort-packages": true
     }
 }

phpstan-baseline.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/DependencyInjection/Configuration.php
-
 		-
 			message: "#^Instantiated class Symfony\\\\Component\\\\HttpKernel\\\\UriSigner not found\\.$#"
 			count: 1

phpstan.dist.neon

@@ -7,3 +7,5 @@ parameters:
     paths:
         - src
         - tests
+    ignoreErrors:
+        - '#Method .+::getConfigTreeBuilder\(\) return type with generic class Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder does not specify its types: T#'

src/DependencyInjection/SymfonyCastsVerifyEmailExtension.php

@@ -12,7 +12,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 /**
  * @author Jesse Rushlow <jr@rushlow.dev>
@@ -22,8 +22,8 @@ final class SymfonyCastsVerifyEmailExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-        $loader->load('verify_email_services.xml');
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
+        $loader->load('verify_email_services.php');
 
         $configuration = $this->getConfiguration($configs, $container);
         if (!$configuration) {

src/Resources/config/verify_email_services.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the SymfonyCasts VerifyEmailBundle package.
+ * Copyright (c) SymfonyCasts <https://symfonycasts.com/>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\HttpFoundation\UriSigner;
+use SymfonyCasts\Bundle\VerifyEmail\Factory\UriSignerFactory;
+use SymfonyCasts\Bundle\VerifyEmail\Generator\VerifyEmailTokenGenerator;
+use SymfonyCasts\Bundle\VerifyEmail\Util\VerifyEmailQueryUtility;
+use SymfonyCasts\Bundle\VerifyEmail\VerifyEmailHelper;
+use SymfonyCasts\Bundle\VerifyEmail\VerifyEmailHelperInterface;
+
+return static function (ContainerConfigurator $container): void {
+    $services = $container->services();
+    $services->set('symfonycasts.verify_email.token_generator', VerifyEmailTokenGenerator::class)
+        ->args(['%kernel.secret%'])
+        ->private();
+
+    $services->set('symfonycasts.verify_email.query_utility', VerifyEmailQueryUtility::class)
+        ->private();
+
+    $services->set('symfonycasts.verify_email.uri_signer_factory', UriSignerFactory::class)
+        ->args([
+            '%kernel.secret%',
+            'signature',
+        ])
+        ->private();
+
+    $services->set('symfonycasts.verify_email.uri_signer', UriSigner::class)
+        ->factory([
+            service('symfonycasts.verify_email.uri_signer_factory'),
+            'createUriSigner',
+        ]);
+
+    $services->alias(VerifyEmailHelperInterface::class, 'symfonycasts.verify_email.helper');
+
+    $services->set('symfonycasts.verify_email.helper', VerifyEmailHelper::class)
+        ->args([
+            service('router'),
+            service('symfonycasts.verify_email.uri_signer'),
+            service('symfonycasts.verify_email.query_utility'),
+            service('symfonycasts.verify_email.token_generator'),
+            null, // verify user signature lifetime
+        ]);
+};