Drop support for PHP < 8.3 and Symfony < 6.4

.github/workflows/build.yaml

@@ -57,30 +57,16 @@ jobs:
         strategy:
             matrix:
                 php:
-                    - '8.1'
-                    - '8.2'
+                    - '8.3'
                 dependencies: [highest]
                 symfony: ['*']
                 with_imagine: [false]
                 with_oneupbundle: [true]
                 max_deprecations: [0]
                 include:
-                    - extra:
-                      php: '8.1'
-                      symfony: '5.4.*'
-                      dependencies: lowest
-                      with_imagine: false
-                      with_oneupbundle: false
-                      max_deprecations: 5
-                    - php: '8.1'
-                      symfony: '6.4.*'
-                      dependencies: highest
-                      with_imagine: false
-                      with_oneupbundle: true
-                      max_deprecations: 0
-                    - php: '8.2'
+                    - php: '8.3'
                       symfony: '6.4.*'
-                      dependencies: highest
+                      dependencies: lowest
                       with_imagine: false
                       with_oneupbundle: false
                       max_deprecations: 0

CONTRIBUTING.md

@@ -49,14 +49,14 @@ make test TEST="Tests/Util/FilenameUtilsTest.php"
 
 will allow testing single Test classes.
 
-Five environments are available: PHP 8.1, PHP 8.2, PHP 8.3, PHP 8.4, and PHP 8.5.
-The default environment is *PHP 8.1*. If you want to execute tests against
+Three environments are available: PHP 8.3, PHP 8.4, and PHP 8.5.
+The default environment is *PHP 8.3*. If you want to execute tests against
 other PHP versions, please use the environment variables as this:
 
 ```bash
-make tests #PHP 8.1 env
-TARGET=82 make tests #PHP 8.2 env
+make tests #PHP 8.3 env
+TARGET=84 make tests #PHP 8.4 env
 
-make test TEST="tests/Util/FilenameUtilsTest.php" #PHP 8.1 env
-TARGET=82 make test TEST="tests/Util/FilenameUtilsTest.php" #PHP 8.2 env
+make test TEST="tests/Util/FilenameUtilsTest.php" #PHP 8.3 env
+TARGET=84 make test TEST="tests/Util/FilenameUtilsTest.php" #PHP 8.4 env
 ```

Makefile

@@ -1,6 +1,6 @@
 #/bin/bash
 
-TARGET?=81
+TARGET?=83
 
 .PHONY: tests
 tests:

composer.json

@@ -15,48 +15,48 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "ext-simplexml": "*",
         "doctrine/persistence": "^3.0 || ^4.0",
-        "jms/metadata": "^2.4",
-        "symfony/config": "^5.4 || ^6.0 || ^7.0",
-        "symfony/console": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
-        "symfony/event-dispatcher-contracts": "^3.1",
-        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
-        "symfony/mime": "^5.4 || ^6.0 || ^7.0",
-        "symfony/property-access": "^5.4 || ^6.0 || ^7.0",
-        "symfony/string": "^5.4 || ^6.0 || ^7.0"
+        "jms/metadata": "^2.8",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/event-dispatcher-contracts": "^3.5",
+        "symfony/http-foundation": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0",
+        "symfony/mime": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0",
+        "symfony/string": "^6.4 || ^7.0"
     },
     "require-dev": {
         "ext-sqlite3": "*",
         "dg/bypass-finals": "^1.9",
         "doctrine/common": "^3.0",
-        "doctrine/doctrine-bundle": "^2.7",
-        "doctrine/mongodb-odm": "^2.4",
-        "doctrine/orm": "^2.13 || ^3.0",
+        "doctrine/doctrine-bundle": "^2.13",
+        "doctrine/mongodb-odm": "^2.8",
+        "doctrine/orm": "^2.19 || ^3.0",
         "knplabs/knp-gaufrette-bundle": "dev-master",
         "league/flysystem-bundle": "^2.4 || ^3.0",
         "league/flysystem-memory": "^2.0 || ^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.0",
         "mikey179/vfsstream": "^1.6.11",
         "phpunit/phpunit": "^10.5 || ^11.5 || ^12.0",
-        "symfony/asset": "^5.4 || ^6.0 || ^7.0",
-        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
-        "symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0",
-        "symfony/form": "^5.4 || ^6.0 || ^7.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
+        "symfony/asset": "^6.4 || ^7.0",
+        "symfony/browser-kit": "^6.4 || ^7.0",
+        "symfony/css-selector": "^6.4 || ^7.0",
+        "symfony/doctrine-bridge": "^6.4 || ^7.0",
+        "symfony/dom-crawler": "^6.4 || ^7.0",
+        "symfony/form": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
         "symfony/phpunit-bridge": "^7.2",
-        "symfony/security-csrf": "^5.4 || ^6.0 || ^7.0",
-        "symfony/translation": "^5.4 || ^6.0 || ^7.0",
-        "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/validator": "^5.4.22 || ^6.0 || ^7.0",
-        "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+        "symfony/security-csrf": "^6.4 || ^7.0",
+        "symfony/translation": "^6.4 || ^7.0",
+        "symfony/twig-bridge": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0",
+        "symfony/var-dumper": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "For integration with Doctrine",

docs/symfony_support_policy.md

@@ -1,15 +1,15 @@
 # Symfony support policy
 
 As indicated by the constraints defined in the `composer.json` file, this bundle
-supports Symfony `^5.4 || ^6.0 || ^7.0` in its latest versions (>=`2.2.*`).
+supports Symfony `^6.4 || ^7.0` in its latest versions (>=`2.3.*`).
 
 Only versions still actively maintained by the Symfony core team will be supported by
 the maintainers of this bundle. Older versions of Symfony can be still used with previous
 versions of this bundle, but there's no active support here.
 If you want to get updates on old versions, you can do a Pull Request on older branches
 of this bundle, maybe it will be merged.
 The same policy applies to old versions of PHP, out of active support: this bundle is actively
-supporting PHP 8.1 and subsequent versions.
+supporting PHP 8.3 and subsequent versions.
 
 You can check if a given Symfony version is still supported by visiting [its
 releases page](//symfony.com/releases).

tests/Naming/SlugNamerTest.php

@@ -2,7 +2,6 @@
 
 namespace Vich\UploaderBundle\Tests\Naming;
 
-use Doctrine\ORM\EntityRepository;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Vich\UploaderBundle\Naming\SlugNamer;
 use Vich\UploaderBundle\Tests\TestCase;
@@ -44,15 +43,12 @@ public function testNameReturnsAnUniqueName(string $originalName, ?string $guess
             ->willReturn($file)
         ;
 
-        $repo = $this->getMockBuilder(EntityRepository::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['findOneBySlug'])
-            ->getMock()
-        ;
-        $repo
-            ->method('findOneBySlug')
-            ->willReturnMap([['lala.jpeg', null], ['lala.mp3', new \stdClass()]])
-        ;
+        $repo = new class() {
+            public function findOneBySlug(string $slug): ?object
+            {
+                return 'lala.mp3' === $slug ? new \stdClass() : null;
+            }
+        };
 
         $namer = new SlugNamer($this->getTransliterator(), $repo, 'findOneBySlug');
 

tests/VichUploaderBundleTest.php

@@ -20,8 +20,8 @@
 {
     protected function setUp(): void
     {
-        if (\PHP_VERSION_ID <= 80200) {
-            self::markTestSkipped('PHP 8.1 is not supported in these tests');
+        if (\PHP_VERSION_ID < 80300) {
+            self::markTestSkipped('PHP < 8.3 is not supported in these tests');
         }
         if (SimpleAppKernel::VERSION_ID >= 60400) { // @phpstan-ignore-line
             self::markTestSkipped('Kernels above 6.4.0 are not supported in these tests');