Upgrade PHP to >=8.2, Symfony to ^6.4 || ^7.4, dev tooling to code-quality-pack ^3.2

.github/workflows/backwards-compatibility-check.yaml

@@ -20,7 +20,7 @@ jobs:
             -   name: "Setup PHP, with composer and extensions"
                 uses: "shivammathur/setup-php@v2"
                 with:
-                    php-version: "8.3"
+                    php-version: "8.4"
                     coverage: "none"
 
             -   name: "Install tool"

.github/workflows/build.yaml

@@ -15,7 +15,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
+                    - "8.2"
 
                 dependencies:
                     - "highest"
@@ -56,21 +56,17 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
 
                 dependencies:
                     - "lowest"
                     - "highest"
 
                 symfony:
                     - "~6.4.0"
-                    - "~7.0.0"
-
-                exclude:
-                    - php-version: "8.1"
-                      symfony: "~7.0.0"
+                    - "~7.4.0"
 
         steps:
             -   name: "Checkout"
@@ -82,7 +78,10 @@ jobs:
                     coverage: "none"
                     extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
-                    tools: "composer-require-checker, composer-unused, flex"
+                    tools: "flex, composer-dependency-analyser"
+
+            -   name: "Remove require-dev section"
+                run: "composer config --unset require-dev"
 
             -   name: "Install composer dependencies"
                 uses: "ramsey/composer-install@v3"
@@ -91,11 +90,8 @@ jobs:
                 env:
                     SYMFONY_REQUIRE: "${{ matrix.symfony }}"
 
-            -   name: "Run maglnet/composer-require-checker"
-                run: "composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"
-
-            -   name: "Run composer-unused/composer-unused"
-                run: "composer-unused"
+            -   name: "Run dependency analysis"
+                run: "composer-dependency-analyser"
 
     static-code-analysis:
         name: "Static Code Analysis"
@@ -105,20 +101,16 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
 
                 dependencies:
                     - "highest"
 
                 symfony:
                     - "~6.4.0"
-                    - "~7.0.0"
-
-                exclude:
-                    - php-version: "8.1"
-                      symfony: "~7.0.0"
+                    - "~7.4.0"
 
         steps:
             -   name: "Checkout"
@@ -140,7 +132,7 @@ jobs:
                     SYMFONY_REQUIRE: "${{ matrix.symfony }}"
 
             -   name: "Static analysis"
-                run: "vendor/bin/psalm --php-version=${{ matrix.php-version }}"
+                run: "vendor/bin/phpstan analyse"
 
     unit-tests:
         name: "Unit tests"
@@ -150,21 +142,17 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
 
                 dependencies:
                     - "lowest"
                     - "highest"
 
                 symfony:
                     - "~6.4.0"
-                    - "~7.0.0"
-
-                exclude:
-                    - php-version: "8.1"
-                      symfony: "~7.0.0"
+                    - "~7.4.0"
 
         steps:
             -   name: "Checkout"
@@ -196,7 +184,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.3"
+                    - "8.4"
 
                 dependencies:
                     - "highest"
@@ -211,11 +199,14 @@ jobs:
                     coverage: "pcov"
                     extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
+                    tools: "flex"
 
             -   name: "Install composer dependencies"
                 uses: "ramsey/composer-install@v3"
                 with:
                     dependency-versions: "${{ matrix.dependencies }}"
+                env:
+                    SYMFONY_REQUIRE: "~7.4.0"
 
             -   name: "Collect code coverage with pcov and phpunit/phpunit"
                 run: "vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml"

.gitignore

@@ -2,3 +2,4 @@
 /composer.lock
 /build/
 /.phpunit.cache/
+.claude/settings.local.json

CLAUDE.md

@@ -0,0 +1,51 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+Symfony bundle (`setono/tag-bag-bundle`) that integrates the [setono/tag-bag](https://github.com/Setono/tag-bag) library into Symfony. It enables injecting dynamic HTML/JS tags (e.g., tracking scripts) into pages via a session-backed tag bag. Tags added during a request cycle are persisted to the session and restored on subsequent page loads.
+
+## Tools
+
+Use `jq` (not `python3`) for JSON parsing in shell commands.
+
+## Commands
+
+```bash
+composer phpunit          # Run all tests
+composer analyse          # Static analysis (PHPStan, level max)
+composer check-style      # Check coding standards (ECS with Sylius coding standard)
+composer fix-style        # Auto-fix coding standards
+composer rector           # Run Rector (PHP 8.2 level)
+
+# Run a single test file
+vendor/bin/phpunit tests/EventListener/RestoreTagBagSubscriberTest.php
+
+# Run a single test method
+vendor/bin/phpunit --filter testMethodName
+```
+
+## Architecture
+
+### Request Lifecycle (the core mechanism)
+
+1. **Restore** (`RestoreTagBagSubscriber`, priority 7 on `kernel.request`) — restores tags from session on each main request. Priority is below Symfony's `FirewallListener` (8) but above 0.
+2. **Use** — application code adds tags to the `TagBagInterface` service during the request.
+3. **Render** — Twig functions (`setono_tag_bag_render_head()`, `_body_begin()`, `_body_end()`, `_section()`, `_all()`) output tags in templates.
+4. **Store** (`StoreTagBagSubscriber`, priority -900 on `kernel.response`) — persists unrendered tags to session. Priority is above Symfony's `SessionListener` (-1000) but below 0.
+
+### Key Components
+
+- **`SessionStorage`** — implements `StorageInterface` from tag-bag lib; stores/restores serialized tag data via Symfony sessions.
+- **`TwigRenderer`** — renders `TemplateTag` instances with `templateType === 'twig'` using the Twig environment.
+- **`RegisterRenderersPass`** — compiler pass that collects all services tagged `setono_tag_bag.renderer` into the composite renderer. Custom renderers are auto-tagged via `RendererInterface` autoconfiguration.
+- **`Configuration`** — single config option: `setono_tag_bag.renderer.twig` (bool, defaults to true if TwigBundle is available).
+
+### Service Definitions
+
+XML-based service definitions in `src/Resources/config/`. The main `services.xml` imports from `services/` subdirectory (tag_bag, storage, renderer, event_listener, twig, generator). The Twig renderer integration is conditionally loaded.
+
+## CI Matrix
+
+Tests run against PHP 8.2–8.4, Symfony 6.4 and 7.4, with both lowest and highest dependency versions. CI also runs composer-dependency-analyser, PHPStan, ECS, and Rector checks.

composer-dependency-analyser.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
+
+return (new Configuration())
+    ->addPathToExclude(__DIR__ . '/tests')
+    ->ignoreUnknownClasses(['Symfony\Bundle\TwigBundle\TwigBundle'])
+;

composer.json

@@ -10,28 +10,22 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "setono/tag-bag": "^2.3",
-        "symfony/config": "^6.4 || ^7.0",
-        "symfony/dependency-injection": "^6.4 || ^7.0",
-        "symfony/event-dispatcher": "^6.4 || ^7.0",
-        "symfony/http-foundation": "^6.4 || ^7.0",
-        "symfony/http-kernel": "^6.4 || ^7.0",
-        "twig/twig": "^2.0 || ^3.0",
+        "php": ">=8.2",
+        "setono/tag-bag": "^2.5",
+        "symfony/config": "^6.4 || ^7.4",
+        "symfony/dependency-injection": "^6.4 || ^7.4",
+        "symfony/event-dispatcher": "^6.4 || ^7.4",
+        "symfony/http-foundation": "^6.4 || ^7.4",
+        "symfony/http-kernel": "^6.4 || ^7.4",
+        "twig/twig": "^3.0",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3 || ^5.1",
-        "nyholm/symfony-bundle-test": "^2.0 || ^3.0",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^10.5.20",
-        "psalm/plugin-phpunit": "^0.19",
-        "psalm/plugin-symfony": "^5.1",
-        "setono/code-quality-pack": "^2.7",
-        "symfony/twig-bundle": "^6.4 || ^7.0"
-    },
-    "conflict": {
-        "vimeo/psalm": "5.24.0"
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1 || ^6.0",
+        "nyholm/symfony-bundle-test": "^3.0",
+        "phpstan/phpstan-symfony": "^2.0",
+        "setono/code-quality-pack": "^3.3",
+        "symfony/twig-bundle": "^6.4 || ^7.4"
     },
     "prefer-stable": true,
     "autoload": {
@@ -47,12 +41,14 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": false,
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "infection/extension-installer": true,
+            "phpstan/extension-installer": true
         },
         "sort-packages": true
     },
     "scripts": {
-        "analyse": "psalm",
+        "analyse": "phpstan analyse",
         "check-style": "ecs check",
         "fix-style": "ecs check --fix",
         "phpunit": "phpunit",

phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+    level: max
+    paths:
+        - src
+        - tests

rector.php

@@ -12,6 +12,6 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81
+        LevelSetList::UP_TO_PHP_82
     ]);
 };

src/EventListener/RestoreTagBagSubscriber.php

@@ -9,9 +9,9 @@
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
-final class RestoreTagBagSubscriber implements EventSubscriberInterface
+final readonly class RestoreTagBagSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly TagBagInterface $tagBag)
+    public function __construct(private TagBagInterface $tagBag)
     {
     }
 

src/EventListener/StoreTagBagSubscriber.php

@@ -9,9 +9,9 @@
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
-final class StoreTagBagSubscriber implements EventSubscriberInterface
+final readonly class StoreTagBagSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly TagBagInterface $tagBag)
+    public function __construct(private TagBagInterface $tagBag)
     {
     }
 

src/Renderer/TwigRenderer.php

@@ -10,9 +10,9 @@
 use Twig\Environment;
 use Webmozart\Assert\Assert;
 
-final class TwigRenderer implements RendererInterface
+final readonly class TwigRenderer implements RendererInterface
 {
-    public function __construct(private readonly Environment $environment)
+    public function __construct(private Environment $environment)
     {
     }
 

src/Storage/SessionStorage.php

@@ -11,9 +11,9 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
-final class SessionStorage implements StorageInterface
+final readonly class SessionStorage implements StorageInterface
 {
-    public function __construct(private readonly RequestStack $requestStack)
+    public function __construct(private RequestStack $requestStack)
     {
     }
 

src/Twig/Runtime.php

@@ -8,9 +8,9 @@
 use Setono\TagBag\TagBagInterface;
 use Twig\Extension\RuntimeExtensionInterface;
 
-final class Runtime implements RuntimeExtensionInterface
+final readonly class Runtime implements RuntimeExtensionInterface
 {
-    public function __construct(private readonly TagBagInterface $tagBag)
+    public function __construct(private TagBagInterface $tagBag)
     {
     }
 

tests/DependencyInjection/SetonoTagBagExtensionTest.php

@@ -26,6 +26,6 @@ public function it_can_load(): void
     {
         $this->load();
 
-        $this->assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 }