Merge pull request #5 from p-chess/sf8

⬆️  allow Symfony 8

Author: garak

.github/workflows/build.yaml

@@ -1,16 +1,18 @@
 name: Build
 
 on:
+    push:
+        branches:
+            - main
     pull_request: ~
-    push: ~
 
 jobs:
     phpstan:
         runs-on: ubuntu-24.04
         name: PHPStan
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
             - name: PHPStan
               uses: docker://oskarstark/phpstan-ga:1.8.0
               env:
@@ -22,7 +24,7 @@ jobs:
         name: PHP-CS-Fixer
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
             - name: Fix CS
               uses: docker://oskarstark/php-cs-fixer-ga
               with:
@@ -36,20 +38,24 @@ jobs:
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 include:
                     - description: 'Symfony 6.4'
                       php: '8.1'
                       composer_option: '--prefer-lowest'
                     - description: 'Symfony 6.4'
                       php: '8.3'
                       symfony: 6.4.*
-                    - description: 'Symfony 7.3'
+                    - description: 'Symfony 7.4'
                       php: '8.4'
-                      symfony: 7.3.*
+                      symfony: 7.4.*
+                    - description: 'Symfony 8.0'
+                      php: '8.5'
+                      symfony: 8.0.*
         name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
             - name: Cache
               uses: actions/cache@v4
               with:

.php-cs-fixer.php

@@ -2,19 +2,19 @@
 // see https://github.com/FriendsOfPHP/PHP-CS-Fixer
 
 $finder = PhpCsFixer\Finder::create()
-    ->in([__DIR__.'/src', __DIR__.'/tests'])
+    ->in([__DIR__.'/config', __DIR__.'/src', __DIR__.'/tests'])
 ;
 
 return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP80Migration' => true,
-        '@PHP80Migration:risky' => true,
-        '@PHPUnit84Migration:risky' => true,
+        '@PHP8x0Migration' => true,
+        '@PHP8x0Migration:risky' => true,
+        '@PHPUnit8x4Migration:risky' => true,
         'declare_strict_types' => false,
-        'native_function_invocation' => ['include' => ['@all']],
+        'native_function_invocation' => ['include' => ['@internal']],
     ])
     ->setFinder($finder)
 ;

README.md

@@ -50,7 +50,7 @@ move_end:
 ## Usage
 
 You can inject a service implementing `\PChess\ChessBundle\ChessProviderInterface` in your controller, then
-implement different actions, using provided `\PChess\Chess\Chess` object.
+implement different actions, using the provided `\PChess\Chess\Chess` object.
 
 In your template, you can use the Twig function `chess_render(chess)` to render the board.
 If you need to pass an identifier, use `chess_render(chess, identifier)` instead.
@@ -80,7 +80,7 @@ The final result should be something like this:
 
 ### Persisting a Chess object
 
-You can easily save a `Chess` object into Doctrine (or other kind of mapping libraries), using two fields/properties:
+You can easily save a `Chess` object into Doctrine (or other kinds of mapping libraries), using two fields/properties:
 `fen`, and `history`.
 The first one is a simple string. The second one can be a `simple_array` (for Doctrine), where you should put
 the result of `Mover::getHistoryStrings()` method.

composer.json

@@ -20,17 +20,17 @@
     ],
     "require": {
         "php": "^8.1",
-        "p-chess/chess": "^0.7",
-        "symfony/config": "^6.4 || ^7.0",
-        "symfony/dependency-injection": "^6.4 || ^7.0",
-        "symfony/http-kernel": "^6.4 || ^7.0",
-        "symfony/routing": "^6.4 || ^7.0",
-        "twig/twig": "^3.18"
+        "p-chess/chess": "^1.0",
+        "symfony/config": "^6.4 || ^7.4 || ^8.0",
+        "symfony/dependency-injection": "^6.4 || ^7.4 || ^8.0",
+        "symfony/http-kernel": "^6.4 || ^7.4 || ^8.0",
+        "symfony/routing": "^6.4 || ^7.4 || ^8.0",
+        "twig/twig": "^3.22"
     },
     "require-dev": {
         "dg/bypass-finals": "^1.9",
-        "phpunit/phpunit": "^10.5 || ^11.5 || ^12.3",
-        "symfony/phpunit-bridge": "^7.3"
+        "phpunit/phpunit": "^10.5 || ^11.5 || ^12.5",
+        "symfony/phpunit-bridge": "^8.0"
     },
     "config": {
         "sort-packages": true

config/services.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use PChess\ChessBundle\SessionChessProvider;
+use PChess\ChessBundle\SimpleChessProvider;
+use PChess\ChessBundle\Twig\ChessExtension;
+use PChess\ChessBundle\Twig\ChessRuntime;
+
+return static function (ContainerConfigurator $configurator): void {
+    $services = $configurator->services();
+
+    $services
+        ->set(SessionChessProvider::class)
+        ->arg('$requestStack', service('request_stack'))
+        ->arg('$name', '%chess.session_name%')
+    ;
+
+    $services->set(SimpleChessProvider::class);
+
+    $services
+        ->set(ChessExtension::class)
+        ->tag('twig.extension')
+    ;
+
+    $services
+        ->set(ChessRuntime::class)
+        ->arg('$output', abstract_arg('should be defined by Pass'))
+        ->tag('twig.runtime')
+    ;
+};

config/services.xml

@@ -1,12 +1,11 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			message: "#^Call to an undefined method#"
 			count: 1
 			path: src/DependencyInjection/Configuration.php
 
 		-
 			message: "#^Cannot call method getSession\\(\\) on Symfony\\\\Component\\\\HttpFoundation\\\\Request\\|null\\.$#"
 			count: 1
 			path: tests/SessionChessProviderTest.php
-

phpstan-baseline.neon

@@ -9,16 +9,13 @@
 
 final class ChessExtension extends Extension
 {
-    /**
-     * @param array<string, mixed> $configs
-     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
         $container->setParameter('chess.output_service', $config['output_service']);
         $container->setParameter('chess.session_name', $config['session_name']);
-        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
-        $loader->load('services.xml');
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader->load('services.php');
     }
 }

src/DependencyInjection/ChessExtension.php

@@ -8,7 +8,7 @@
 
 final class ChessRuntime extends AbstractExtension
 {
-    public function __construct(private HtmlOutput $output)
+    public function __construct(private readonly HtmlOutput $output)
     {
     }
 

src/Twig/ChessRuntime.php

@@ -10,8 +10,8 @@ final class ChessExtensionTest extends TestCase
 {
     public function testLoadSetParameters(): void
     {
-        /** @var ContainerBuilder&\PHPUnit\Framework\MockObject\MockObject $container */
-        $container = $this->createMock(ContainerBuilder::class);
+        /** @var ContainerBuilder&\PHPUnit\Framework\MockObject\Stub $container */
+        $container = $this->createStub(ContainerBuilder::class);
         $extension = new ChessExtension();
         $extension->load(['chess' => ['output_service' => 'foo']], $container);
         self::assertNotNull($extension);