Merge remote-tracking branch 'upstream/master' into chore/sf-7

theofidry · Nov 13, 2024 · 9911f0a · 9911f0a
2 parents f5a28f9 + 821a4bb
commit 9911f0a
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 35 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -38,8 +38,8 @@ jobs:
                     - test_symfony_eloquent_bridge_proxy_manager
                 variant:
                     - 'no-change'
-                    - '"symfony/symfony:^6.4"'
-                    - '"symfony/symfony:^7.0"'
+                    - '"symfony/symfony:^6.4.14"'
+                    - '"symfony/symfony:^7.1"'
         # To keep in sync with docker-compose.yml
         services:
             mysql:
@@ -127,14 +127,14 @@ jobs:
 
             -   name: Install Doctrine PHPCR Composer bin dependencies
                 uses: ramsey/composer-install@v3
-                if: "matrix.make-test == 'test_doctrine_phpcr_bridge' || matrix.make-test == 'test_symfony_bridge'"
+                if: "matrix.make-test == 'test_doctrine_phpcr_bridge' || matrix.make-test == 'test_symfony_bridge' || matrix.make-test == 'test_symfony_doctrine_bridge'"
                 with:
                     dependency-versions: "${{ matrix.dependencies }}"
                     composer-options: "${{ matrix.composer-flags }}"
                     working-directory: vendor-bin/doctrine_phpcr
             -   name: Repeat "Install Doctrine PHPCR Composer bin dependencies"
                 uses: ramsey/composer-install@v3
-                if: "matrix.make-test == 'test_doctrine_phpcr_bridge' || matrix.make-test == 'test_symfony_bridge'"
+                if: "matrix.make-test == 'test_doctrine_phpcr_bridge' || matrix.make-test == 'test_symfony_bridge' || matrix.make-test == 'test_symfony_doctrine_bridge'"
                 with:
                     dependency-versions: "${{ matrix.dependencies }}"
                     composer-options: "${{ matrix.composer-flags }}"
@@ -155,15 +155,6 @@ jobs:
                     composer-options: "${{ matrix.composer-flags }}"
                     working-directory: vendor-bin/eloquent
 
-            # There is a known issue here with Composer
-            # see https://github.com/composer/composer/issues/10200
-            # Meanwhile we break down the installation as a workaround.
-            # Once this is fixed the whole bin dependencies can probably be installed
-            # in one step with a timeout adjustment
-            -   name: Remove Symfony from ProxyManager Composer bin dependencies
-                if: matrix.variant != 'no-change'
-                run: composer bin proxy-manager remove --dev --no-update symfony/symfony
-
             -   name: Install ProxyManager Composer bin dependencies
                 uses: ramsey/composer-install@v3
                 if: "matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager'"
@@ -179,10 +170,6 @@ jobs:
                     composer-options: "${{ matrix.composer-flags }}"
                     working-directory: vendor-bin/proxy-manager
 
-            -   name: Add back Symfony (variant) for ProxyManager Composer bin dependencies
-                if: matrix.variant != 'no-change'
-                run: composer bin proxy-manager require --dev --no-update ${{ matrix.variant }}
-
             -   name: Install Symfony for ProxyManager Composer bin dependencies
                 uses: ramsey/composer-install@v3
                 if: "matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager'"

diff --git a/README.md b/README.md
@@ -12,10 +12,10 @@ AliceDataFixtures
 Supports:
 
 * Symfony 6.4+
-* Doctrine ORM 2.5+
+* Doctrine ORM 2.20+
 * Doctrine ODM 2.0+
 * Doctrine PHPCR 2.0+
-* Eloquent 8.12+
+* Eloquent 11.0+
 
 
 ## Documentation

diff --git a/composer.json b/composer.json
@@ -33,11 +33,16 @@
         "symfony/phpunit-bridge": "^5.3.8 || ^6.4 || ^7.0"
     },
     "conflict": {
-        "doctrine/orm": "<2.6.3",
+        "doctrine/data-fixtures": "<1.7.0",
+        "doctrine/orm": "<2.20",
+        "doctrine/doctrine-bundle": "<2.11.0",
+        "doctrine/mongodb-odm-bundle": "<5.1.0",
+        "doctrine/mongodb-odm": "<2.6.0",
+        "doctrine/phpcr-bundle": "<3.0",
         "doctrine/phpcr-odm": "<2.0.0",
         "doctrine/dbal": "<3.0",
         "doctrine/persistence": "<2.0",
-        "illuminate/database": "<8.12",
+        "illuminate/database": "<10.0",
         "ocramius/proxy-manager": "<2.1",
         "symfony/framework-bundle": ">=6.0 <6.4",
         "zendframework/zend-code": "<3.3.1"

diff --git a/doctrine-phpcr-db-settings.php b/doctrine-phpcr-db-settings.php
@@ -10,5 +10,5 @@
     'dbname' => get_param('DOCTRINE_PHPCR_DB_NAME', 'fidry_alice_data_fixtures'),
     'host' => get_param('DOCTRINE_PHPCR_DB_HOST', '127.0.0.1'),
     'port' => get_param('DOCTRINE_PHPCR_DB_PORT', 3307),
-    'charset' => get_param('DOCTRINE_PHPCR_DB_CHARSET', 'utf8mb4'),
+    'charset' => get_param('DOCTRINE_PHPCR_DB_CHARSET', 'UTF8'),
 ];
diff --git a/fixtures/Bridge/Symfony/SymfonyApp/config/config.yml b/fixtures/Bridge/Symfony/SymfonyApp/config/config.yml
@@ -8,6 +8,10 @@
 #
 
 framework:
+    http_method_override: false
+    handle_all_throwables: false
+    php_errors:
+        log: true
     secret: test
     router:
         resource: ~
@@ -16,6 +20,7 @@ framework:
         enabled: false
     validation:
         enabled: true
+        email_validation_mode: html5
     session:
         enabled: false
     test: ~

diff --git a/fixtures/Bridge/Symfony/SymfonyApp/config/config_doctrine.yml b/fixtures/Bridge/Symfony/SymfonyApp/config/config_doctrine.yml
@@ -24,6 +24,9 @@ doctrine:
                     1002: "SET NAMES 'UTF8' COLLATE 'utf8_unicode_ci'"
     orm:
         auto_mapping: true
+        controller_resolver:
+            auto_mapping: false
+        enable_lazy_ghost_objects: true
         mappings:
             fixture_entities:
                 type: xml

diff --git a/fixtures/Bridge/Symfony/SymfonyApp/config/config_symfony_3.yml b/fixtures/Bridge/Symfony/SymfonyApp/config/config_symfony_3.yml
@@ -8,12 +8,17 @@
 #
 
 framework:
+    http_method_override: false
+    handle_all_throwables: false
+    php_errors:
+        log: true
     secret: test
     router:
         resource: ~
     form:
         enabled: false
     validation:
         enabled: true
+        email_validation_mode: html5
     session: ~
     test: ~
diff --git a/tests/Bridge/Symfony/Doctrine/PhpcrLoaderIntegrationTest.php b/tests/Bridge/Symfony/Doctrine/PhpcrLoaderIntegrationTest.php
@@ -46,14 +46,6 @@ public static function setUpBeforeClass(): void
 
     public function setUp(): void
     {
-        if (PHP_VERSION_ID < 80000) {
-            $this->markTestSkipped('The annotation reader is not available: the "enable_annotations" on the validator cannot be set as the PHP version is lower than 8');
-        }
-
-        if (PHP_VERSION_ID >= 80000) {
-            $this->markTestSkipped('Not compatible yet with PHP 8.0');
-        }
-
         $this->kernel = new DoctrinePhpcrKernel(static::$seed, true);
         $this->kernel->boot();
 

diff --git a/vendor-bin/proxy-manager/composer.json b/vendor-bin/proxy-manager/composer.json
@@ -16,8 +16,8 @@
         "doctrine/phpcr-odm": "*",
         "jackalope/jackalope-doctrine-dbal": "*",
         "friendsofphp/proxy-manager-lts": "*",
-        "monolog/monolog": "*",
-        "symfony/symfony": "^5.4 || ^6.4 || ^7.0",
+        "monolog/monolog": ">=2.0",
+        "symfony/symfony": "^6.4.14 || ^7.1",
         "theofidry/composer-inheritance-plugin": "^1.2",
         "wouterj/eloquent-bundle": "*"
     },

diff --git a/vendor-bin/symfony/composer.json b/vendor-bin/symfony/composer.json
@@ -5,21 +5,20 @@
         ]
     },
     "require": {
-        "symfony/doctrine-messenger": "^4.4 || ^5.4 || ^6.0"
+        "symfony/doctrine-messenger": "^4.4 || ^5.4 || ^6.4"
     },
     "require-dev": {
         "alcaeus/mongo-php-adapter": "*",
         "doctrine/annotations": "*",
         "doctrine/data-fixtures": "*",
         "doctrine/doctrine-bundle": "*",
-        "doctrine/mongodb-odm": "*",
         "doctrine/mongodb-odm-bundle": "*",
         "doctrine/orm": "*",
         "doctrine/phpcr-bundle": "*",
         "doctrine/phpcr-odm": "*",
         "jackalope/jackalope-doctrine-dbal": "*",
         "monolog/monolog": "*",
-        "symfony/symfony": "^5.4 || ^6.4 || ^7.0",
+        "symfony/symfony": "^5.4 || ^6.4 || ^7.1",
         "theofidry/composer-inheritance-plugin": "^1.2",
         "wouterj/eloquent-bundle": "*"
     },