[Upgrade] Require PHP 8.1, allow Symfony 7 and modernize the PHPUnit config

.gitignore

@@ -1,2 +1,3 @@
 vendor/
-.history
+.history
+.phpunit.result.cache

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Unreleased
+- Require PHP 8.4 and allow Symfony 7 components
+- Extend `Symfony\Component\DependencyInjection\Extension\Extension` instead of the HttpKernel one
+- Upgrade PHPUnit to 13: `phpunit.xml.dist` rewritten, tests use attributes and `expectException()`
+
 ## 1.0.0
 - upgrade twig version
 

Tests/Generator/GeneratorTest.php

@@ -2,20 +2,15 @@
 
 namespace SGK\BarcodeBundle\Tests\Generator;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Medium;
 use PHPUnit\Framework\TestCase;
 use SGK\BarcodeBundle\Generator\Generator;
 
-/**
- * Class GeneratorTest
- *
- * @package SGK\BarcodeBundle\Tests\Generator
- */
+#[Medium]
 class GeneratorTest extends TestCase
 {
-    /**
-     * @return array
-     */
-    public function getOptions()
+    public static function getOptions(): array
     {
         return array(
             array(
@@ -48,23 +43,15 @@ public function getOptions()
         );
     }
 
-    /**
-     * testGenerate
-     *
-     * @param array $options
-     *
-     * @medium
-     *
-     * @dataProvider getOptions
-     */
-    public function testGenerate($options = array())
+    #[DataProvider('getOptions')]
+    public function testGenerate(array $options): void
     {
         $generator = new Generator();
 
         $this->assertTrue(is_string($generator->generate($options)));
     }
 
-    public function testGenerateNoRandom()
+    public function testGenerateNoRandom(): void
     {
         $generator = new Generator();
 
@@ -74,16 +61,12 @@ public function testGenerateNoRandom()
             'type' => 'qrcode',
         ];
 
-        $expected['701'] = 'iVBORw0KGgoAAAANSUhEUgAAAGkAAABpAQMAAAADTJ95AAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAAPdJREFUOI2tlDsSgzAMRMVQuORI3CzQ5VrMcBF8A5cUnigrgS3SRQYVDI9Cn9UiYkQKkVd5mek+csFM1AP3PhENXhx5Tcgij4rxMQwRhVrxtysahydQxsfk60WNf1Flz0h12cId5LpBDUi3kMW/iLFYA1Ma7lMT8oE8jzJv3OUb9ejQjefyVs4HygK2YRFNyYuqVUkFl7yw1VLIi9O5hSiydzAckrZjJ83FssHcoZoK4cLDGx1au1hFMPDQgmiIk10G4EeqkRPPy8DnkRHMI7zRiOorw6BWqYVcqGZ4WyGCVUL92V2oqewyqIF5I/KhWRS2nQ1T8OIXb3CHNDT2608AAAAASUVORK5CYII=';
-        $expected['702'] = 'iVBORw0KGgoAAAANSUhEUgAAAGkAAABpAQMAAAADTJ95AAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAPdJREFUOI2tlDsSgzAMRMVQuORI3CzQ5VrMcBF8A5cUnigrgS3SRQYVDI9Cn9UiYkQKkVd5mek+csFM1AP3PhENXhx5Tcgij4rxMQwRhVrxtysahydQxsfk60WNf1Flz0h12cId5LpBDUi3kMW/iLFYA1Ma7lMT8oE8jzJv3OUb9ejQjefyVs4HygK2YRFNyYuqVUkFl7yw1VLIi9O5hSiydzAckrZjJ83FssHcoZoK4cLDGx1au1hFMPDQgmiIk10G4EeqkRPPy8DnkRHMI7zRiOorw6BWqYVcqGZ4WyGCVUL92V2oqewyqIF5I/KhWRS2nQ1T8OIXb3CHNDT2608AAAAASUVORK5CYII=';
+        $expected = 'iVBORw0KGgoAAAANSUhEUgAAAGkAAABpAQMAAAADTJ95AAAABlBMVEX///8AAABVwtN+AAAAAXRSTlMAQObYZgAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAPdJREFUOI2tlDsSgzAMRMVQuORI3CzQ5VrMcBF8A5cUnigrgS3SRQYVDI9Cn9UiYkQKkVd5mek+csFM1AP3PhENXhx5Tcgij4rxMQwRhVrxtysahydQxsfk60WNf1Flz0h12cId5LpBDUi3kMW/iLFYA1Ma7lMT8oE8jzJv3OUb9ejQjefyVs4HygK2YRFNyYuqVUkFl7yw1VLIi9O5hSiydzAckrZjJ83FssHcoZoK4cLDGx1au1hFMPDQgmiIk10G4EeqkRPPy8DnkRHMI7zRiOorw6BWqYVcqGZ4WyGCVUL92V2oqewyqIF5I/KhWRS2nQ1T8OIXb3CHNDT2608AAAAASUVORK5CYII=';
 
-        $this->assertEquals($expected[mb_substr(PHP_VERSION_ID, 0, 3)], $generator->generate($options));
+        $this->assertSame($expected, $generator->generate($options));
     }
 
-    /**
-     * @return array
-     */
-    public function getErrorOptions()
+    public static function getErrorOptions(): array
     {
         return array(
             array(
@@ -126,19 +109,11 @@ public function getErrorOptions()
         );
     }
 
-    /**
-     * testConfigureOptions
-     *
-     * @param array $options
-     *
-     * @medium
-     *
-     * @dataProvider getErrorOptions
-     *
-     * @expectedException \Exception
-     */
-    public function testConfigureOptions($options = array())
+    #[DataProvider('getErrorOptions')]
+    public function testConfigureOptions(array $options): void
     {
+        $this->expectException(\Exception::class);
+
         $generator = new Generator();
 
         $generator->generate($options);

Tests/Type/TypeTest.php

@@ -5,20 +5,12 @@
 use PHPUnit\Framework\TestCase;
 use SGK\BarcodeBundle\Type\Type;
 
-/**
- * Class TypeTest
- *
- * @package SGK\BarcodeBundle\Tests\Type
- */
 class TypeTest extends TestCase
 {
-    /**
-     * testConfigureOptions
-     *
-     * @expectedException \InvalidArgumentException
-     */
-    public function testInvalidArgumentException()
+    public function testInvalidArgumentException(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $type = new Type();
         $type->getDimension('Unknown Type');
     }

composer.json

@@ -35,18 +35,18 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
-    "symfony/config": "^4.4 || ^5.4 || ^6.4",
-    "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.4",
-    "symfony/http-kernel": "^4.4 || ^5.4 || ^6.4",
-    "symfony/options-resolver": "^4.4 || ^5.4 || ^6.4",
+    "php": "^8.4",
+    "symfony/config": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+    "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+    "symfony/http-kernel": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+    "symfony/options-resolver": "^4.4 || ^5.4 || ^6.4 || ^7.0",
     "twig/twig": "^3.0"
   },
   "suggest": {
-    "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.4"
+    "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.4 || ^7.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.0.0",
+    "phpunit/phpunit": "^13.0",
     "g-1-a/composer-test-scenarios": "^2.0"
   },
   "minimum-stability": "stable",