diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d96dfb23..a5cb2931 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -38,7 +38,7 @@ jobs: - test_symfony_eloquent_bridge_proxy_manager variant: - 'no-change' - - '"symfony/symfony:^6.4"' + - '"symfony/symfony:^6.4.14"' # To keep in sync with docker-compose.yml services: mysql: @@ -126,14 +126,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 }}" diff --git a/composer.json b/composer.json index 0632503e..997ef9bc 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,10 @@ "conflict": { "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", diff --git a/doctrine-phpcr-db-settings.php b/doctrine-phpcr-db-settings.php index ac5f0f62..1e32f4fd 100644 --- 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 index dd2f4544..a4b6c557 100644 --- 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 index 920101b6..70aeeba9 100644 --- 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 index 7b483c16..7ca0318c 100644 --- a/fixtures/Bridge/Symfony/SymfonyApp/config/config_symfony_3.yml +++ b/fixtures/Bridge/Symfony/SymfonyApp/config/config_symfony_3.yml @@ -8,6 +8,10 @@ # framework: + http_method_override: false + handle_all_throwables: false + php_errors: + log: true secret: test router: resource: ~ @@ -15,5 +19,6 @@ framework: 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 index f7d4b900..7fabf320 100644 --- 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 index e74bf6fd..a4e16882 100644 --- 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", + "monolog/monolog": ">=2.0", + "symfony/symfony": "^6.4.14", "theofidry/composer-inheritance-plugin": "^1.2", "wouterj/eloquent-bundle": "*" }, diff --git a/vendor-bin/symfony/composer.json b/vendor-bin/symfony/composer.json index c7543d0c..e212dcfe 100644 --- 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": "^2.0", - "symfony/symfony": "^5.4 || ^6.4", + "monolog/monolog": ">=2.0", + "symfony/symfony": "^6.4.14", "theofidry/composer-inheritance-plugin": "^1.2", "wouterj/eloquent-bundle": "*" },