fsi-open · chives · Jan 9, 2026 · Jan 9, 2026 · Jan 9, 2026 · Jan 9, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     test:
         strategy:
             matrix:
-                php-version: [7.4, 8.1, 8.2, 8.3, 8.4]
+                php-version: [7.4, 8.1, 8.2, 8.3, 8.4, 8.5]
         runs-on: ubuntu-22.04
         container:
             image: fsiopenpl/docker-php-apache:alpine-${{ matrix.php-version }}
@@ -53,7 +53,7 @@ jobs:
                 nohup php -S 0.0.0.0:8080 -t features/fixtures/project/web > features/fixtures/project/var/logs/server.log 2>&1 &
                 sleep 5
             - name: Functional tests
-              run: vendor/bin/behat --no-snippets --format=progress --profile=actions -vvv
+              run: php -d error_reporting=6143 vendor/bin/behat --no-snippets --format=progress --profile=actions -vvv
             - name: Upload logs
               uses: actions/upload-artifact@master
               with:

diff --git a/behat.yml b/behat.yml
@@ -1,5 +1,7 @@
 ---
 default: &default
+    calls:
+        error_reporting: 6143 # 'E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED'
     suites:
         default:
             contexts:

diff --git a/composer.json b/composer.json
@@ -18,6 +18,16 @@
             "email": "[email protected]"
         }
     ],
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/chives/resource-repository-bundle.git"
+        },
+        {
+            "type": "git",
+            "url": "https://github.com/fsi-open/phpspec.git"
+        }
+    ],
     "require": {
         "php": "^7.4|^8.0",
         "doctrine/doctrine-bundle": "^2.10",
@@ -28,21 +38,21 @@
         "knplabs/knp-menu": "^3.3",
         "knplabs/knp-menu-bundle": "^3.2",
         "psr/event-dispatcher": "^1.0",
-        "symfony/asset": "^4.4|^5.4|^6.0",
-        "symfony/config": "^4.4.12|^5.4|^6.0",
-        "symfony/dependency-injection": "^4.4.12|^5.4|^6.0",
-        "symfony/doctrine-bridge": "^4.4|^5.4|^6.0",
-        "symfony/form" : "^4.4|^5.4|^6.0",
-        "symfony/framework-bundle" : "^4.4|^5.4|^6.0",
-        "symfony/http-foundation": "^4.4|^5.4|^6.0",
-        "symfony/http-kernel": "^4.4|^5.4|^6.0",
-        "symfony/intl" : "^4.4|^5.4|^6.0",
-        "symfony/options-resolver": "^4.4|^5.4|^6.0",
-        "symfony/proxy-manager-bridge": "^4.4|^5.4|^6.0",
-        "symfony/security-csrf": "^4.4|^5.4|^6.0",
-        "symfony/translation": "^4.4.12|^5.4|^6.0",
-        "symfony/twig-bundle": "^4.4|^5.4|^6.0",
-        "symfony/validator": "^4.4|^5.4|^6.0",
+        "symfony/asset": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/config": "^4.4.12|^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^4.4.12|^5.4|^6.0|^7.0",
+        "symfony/doctrine-bridge": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/form" : "^4.4|^5.4|^6.0|^7.0",
+        "symfony/framework-bundle" : "^4.4|^5.4|^6.0|^7.0",
+        "symfony/http-foundation": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/intl" : "^4.4|^5.4|^6.0|^7.0",
+        "symfony/options-resolver": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/proxy-manager-bridge": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/security-csrf": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/translation": "^4.4.12|^5.4|^6.0|^7.0",
+        "symfony/twig-bundle": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/validator": "^4.4|^5.4|^6.0|^7.0",
         "twig/twig": "^3.7"
     },
     "require-dev": {
@@ -57,8 +67,8 @@
         "friends-of-behat/mink-extension": "^2.6",
         "friends-of-behat/page-object-extension": "^0.3.2",
         "friends-of-behat/symfony-extension": "^2.3",
-        "fsi/files": "^2.0.4|^3.0@dev",
-        "fsi/resource-repository-bundle": "^3.0.3@dev",
+        "fsi/files": "^2.0.4|^3.0",
+        "fsi/resource-repository-bundle": "^3.0.3|dev-dev as 4.0",
         "gedmo/doctrine-extensions": "^3.13",
         "mockery/mockery": "^1.6",
         "nyholm/psr7": "^1.8",
@@ -71,14 +81,15 @@
         "sebastian/comparator": "^4.0|^5.0",
         "sebastian/exporter": "^4.0|^5.0",
         "squizlabs/php_codesniffer": "^3.7",
-        "symfony/dom-crawler": "^4.4.12|^5.4|^6.0",
-        "symfony/error-handler": "^4.4|^5.4|^6.0",
-        "symfony/event-dispatcher": "^4.4.27|^5.4|^6.0",
-        "symfony/http-client": "^4.4|^5.4|^6.0",
-        "symfony/monolog-bridge": "^4.4|^5.4|^6.0",
+        "symfony/dom-crawler": "^4.4.12|^5.4|^6.0|^7.0",
+        "symfony/error-handler": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/event-dispatcher": "^4.4.27|^5.4|^6.0|^7.0",
+        "symfony/http-client": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/monolog-bridge": "^4.4|^5.4|^6.0|^7.0",
         "symfony/monolog-bundle": "^3.7",
-        "symfony/var-dumper": "^4.4|^5.4|^6.0",
-        "symfony/yaml": "^4.4|^5.4|^6.0"
+        "symfony/var-dumper": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/var-exporter": "^4.4|^5.4|^6.0|^7.0",
+        "symfony/yaml": "^4.4|^5.4|^6.0|^7.0"
     },
     "conflict": {
         "fsi/admin-positionable-bundle": "*",

diff --git a/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/BatchElementContextSpec.php b/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/BatchElementContextSpec.php
@@ -20,10 +20,13 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
+use function class_exists;
+
 class BatchElementContextSpec extends ObjectBehavior
 {
     public function let(
@@ -58,32 +61,39 @@ public function it_does_not_have_template_name(): void
 
     public function it_handles_request_with_request_handlers(
         HandlerInterface $handler,
-        Request $request,
-        ParameterBag $requestParameterBag
+        Request $request
     ): void {
         $handler->handleRequest(Argument::type(FormEvent::class), $request)
             ->willReturn(null);
 
+        if (class_exists(InputBag::class)) {
+            $requestParameterBag = new InputBag();
+        } else {
+            $requestParameterBag = new ParameterBag();
+        }
+        $requestParameterBag->set('indexes', []);
         $request->request = $requestParameterBag;
-        $requestParameterBag->all()->willReturn(['indexes' => []]);
 
         $this->handleRequest($request)->shouldReturn(null);
     }
 
     public function it_return_response_from_handler(
         HandlerInterface $handler,
         Request $request,
-        ParameterBag $requestParameterBag,
         Response $response
     ): void {
         $handler->handleRequest(Argument::type(FormEvent::class), $request)
             ->willReturn($response);
 
+        if (class_exists(InputBag::class)) {
+            $requestParameterBag = new InputBag();
+        } else {
+            $requestParameterBag = new ParameterBag();
+        }
+        $requestParameterBag->set('indexes', []);
         $request->request = $requestParameterBag;
-        $requestParameterBag->all()->willReturn(['indexes' => []]);
 
-        $this->handleRequest($request)
-            ->shouldReturnAnInstanceOf(Response::class);
+        $this->handleRequest($request)->shouldReturnAnInstanceOf(Response::class);
     }
 
     public function getMatchers(): array

diff --git a/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/DeleteElementContextSpec.php b/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/DeleteElementContextSpec.php
@@ -20,10 +20,13 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
+use function class_exists;
+
 class DeleteElementContextSpec extends ObjectBehavior
 {
     public function let(
@@ -58,26 +61,35 @@ public function it_does_not_have_template_name(): void
 
     public function it_handles_request_with_request_handlers(
         HandlerInterface $handler,
-        Request $request,
-        ParameterBag $requestParameterBag
+        Request $request
     ): void {
         $handler->handleRequest(Argument::type(FormEvent::class), $request)->willReturn(null);
 
+        if (class_exists(InputBag::class)) {
+            $requestParameterBag = new InputBag();
+        } else {
+            $requestParameterBag = new ParameterBag();
+        }
+        $requestParameterBag->set('indexes', []);
         $request->request = $requestParameterBag;
-        $requestParameterBag->all()->willReturn(['indexes' > []]);
 
         $this->handleRequest($request)->shouldReturn(null);
     }
 
     public function it_return_response_from_handler(
         HandlerInterface $handler,
         Request $request,
-        ParameterBag $requestParameterBag,
         Response $response
     ): void {
         $handler->handleRequest(Argument::type(FormEvent::class), $request)->willReturn($response);
+
+        if (class_exists(InputBag::class)) {
+            $requestParameterBag = new InputBag();
+        } else {
+            $requestParameterBag = new ParameterBag();
+        }
+        $requestParameterBag->set('indexes', []);
         $request->request = $requestParameterBag;
-        $requestParameterBag->all()->willReturn(['indexes' => []]);
 
         $this->handleRequest($request)->shouldReturnAnInstanceOf(Response::class);
     }

diff --git a/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/Request/BatchFormValidRequestHandlerSpec.php b/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/Request/BatchFormValidRequestHandlerSpec.php
@@ -31,26 +31,34 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use stdClass;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
 
+use function class_exists;
+
 class BatchFormValidRequestHandlerSpec extends ObjectBehavior
 {
     public function let(
         EventDispatcherInterface $eventDispatcher,
         RouterInterface $router,
         FlashMessages $flashMessage,
         Request $request,
-        ParameterBag $requestParameterBag,
-        ParameterBag $queryParameterBag,
         FormInterface $form,
         BatchElement $element,
         FormEvent $event
     ): void {
-        $requestParameterBag->all()->willReturn(['indexes' => ['index']]);
+        if (class_exists(InputBag::class)) {
+            $requestParameterBag = new InputBag();
+            $queryParameterBag = new InputBag();
+        } else {
+            $requestParameterBag = new ParameterBag();
+            $queryParameterBag = new ParameterBag();
+        }
+        $requestParameterBag->set('indexes', ['index']);
         $request->request = $requestParameterBag;
         $request->query = $queryParameterBag;
         $request->isMethod(Request::METHOD_POST)->willReturn(true);
@@ -127,7 +135,6 @@ public function it_handles_POST_request(
     public function it_returns_redirect_response_with_redirect_uri_passed_by_request(
         FormEvent $event,
         Request $request,
-        ParameterBag $queryParameterBag,
         EventDispatcherInterface $eventDispatcher,
         FormInterface $form,
         BatchElement $element,
@@ -150,8 +157,7 @@ public function it_returns_redirect_response_with_redirect_uri_passed_by_request
 
         $dataIndexer->getDataSlice(['index'])->willReturn([$object]);
 
-        $queryParameterBag->has('redirect_uri')->willReturn(true);
-        $queryParameterBag->get('redirect_uri')->willReturn('some_redirect_uri');
+        $request->query->set('redirect_uri', 'some_redirect_uri');
 
         $response = $this->handleRequest($event, $request);
         $response->shouldBeAnInstanceOf(RedirectResponse::class);
@@ -215,7 +221,7 @@ public function it_displays_warning_when_no_elements_sent(
         FlashMessages $flashMessage,
         DataIndexerInterface $dataIndexer
     ): void {
-        $requestParameterBag->all()->willReturn(['indexes' => []]);
+        $request->request->set('indexes', []);
         $event->getElement()->willReturn($deleteElement);
         $eventDispatcher->dispatch(Argument::type(BatchObjectsPreApplyEvent::class))->shouldBeCalled();
 

diff --git a/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/Request/DeleteRequestHandlerSpec.php b/spec/FSi/Bundle/AdminBundle/Admin/CRUD/Context/Request/DeleteRequestHandlerSpec.php
@@ -20,11 +20,14 @@
 use LogicException;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouterInterface;
 
+use function class_exists;
+
 class DeleteRequestHandlerSpec extends ObjectBehavior
 {
     public function let(
@@ -33,13 +36,16 @@ public function let(
         RouterInterface $router,
         DeleteElement $element,
         FormEvent $event,
-        ParameterBag $queryParameterBag,
         Request $request,
         RedirectResponse $response
     ): void {
+        if (class_exists(InputBag::class)) {
+            $queryParameterBag = new InputBag();
+        } else {
+            $queryParameterBag = new ParameterBag();
+        }
         $request->query = $queryParameterBag;
 
-        $queryParameterBag->has('redirect_uri')->willReturn(false);
         $element->getSuccessRoute()->willReturn('fsi_admin_list');
         $element->getSuccessRouteParameters()->willReturn(['element' => 'element_list_id']);
         $element->getId()->willReturn('element_form_id');
@@ -75,11 +81,8 @@ public function it_uses_redirect_uri_if_present(
         DeleteElement $element,
         FormEvent $event,
         Request $request,
-        ParameterBag $queryParameterBag,
         FlashMessages $flashMessage
     ): void {
-        $queryParameterBag->has('redirect_uri')->shouldNotBeCalled();
-        $queryParameterBag->get('redirect_uri')->shouldNotBeCalled();
         $element->getSuccessRoute()->shouldNotBeCalled();
         $element->getSuccessRouteParameters()->shouldNotBeCalled();
         $element->getId()->shouldNotBeCalled();