From 24b108f65c9392a1f3476f5859a7d094355ee501 Mon Sep 17 00:00:00 2001
From: David Maicher <mail@dmaicher.de>
Date: Thu, 20 Apr 2023 13:54:20 +0200
Subject: [PATCH] drop support for unmaintained dependencies

---
 .github/workflows/ci.yml              | 4 +---
 .gitignore                            | 1 +
 composer.json                         | 7 ++++---
 src/Logger.php                        | 3 +++
 tests/NelmioSolariumExtensionTest.php | 4 +---
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba06a55..eb1c3fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,13 +11,11 @@ jobs:
             matrix:
                 include:
                 -   php: 7.3
-                    SYMFONY_REQUIRE: 4.4.*
                 -   php: 7.4
                     SYMFONY_REQUIRE: 5.4.*
                 -   php: 8.0
-                    SYMFONY_REQUIRE: 6.0.*
                 -   php: 8.1
-                    SYMFONY_REQUIRE: 6.1.*
+                -   php: 8.2
 
         steps:
         -   uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
index d1502b0..3d7e132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
index 68b120d..5b128b9 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,12 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0",
-        "solarium/solarium": "^6.1"
+        "symfony/framework-bundle": "^5.4 || ^6.2",
+        "solarium/solarium": "^6.2"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^6.1"
+        "symfony/phpunit-bridge": "^6.2",
+        "symfony/stopwatch": "^5.4 || ^6.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Logger.php b/src/Logger.php
index 7a9e8c4..03b9283 100644
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -165,6 +165,9 @@ public function unserialize($data)
         $this->data = unserialize($data);
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->data = array();
diff --git a/tests/NelmioSolariumExtensionTest.php b/tests/NelmioSolariumExtensionTest.php
index 229f2e7..1bc230c 100644
--- a/tests/NelmioSolariumExtensionTest.php
+++ b/tests/NelmioSolariumExtensionTest.php
@@ -467,7 +467,7 @@ private function createCompiledContainerForConfig($config, $debug = false, $extr
 
     private function createContainer($debug = false)
     {
-        $container = new ContainerBuilder(new ParameterBag(array(
+        return new ContainerBuilder(new ParameterBag(array(
             'kernel.cache_dir'       => __DIR__,
             'kernel.charset'         => 'UTF-8',
             'kernel.debug'           => $debug,
@@ -476,8 +476,6 @@ private function createContainer($debug = false)
             'kernel.build_dir'       => __DIR__,
             'debug.file_link_format' => 'foo',
         )));
-
-        return $container;
     }
 
     private function compileContainer(ContainerBuilder $container)