improve build matrix

Author: dbu

.github/workflows/ci.yaml

@@ -10,11 +10,12 @@ on:
 
 jobs:
     php:
-        name: "PHP ${{ matrix.php-version }} Symfony ${{ matrix.symfony-version }}"
+        name: "PHP ${{ matrix.php-version }} Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}}"
         runs-on: ubuntu-latest
 
         env:
             KERNEL_CLASS: PHPCR\PhpcrMigrationsBundle\Tests\Resources\App\AppKernel
+            SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
 
         strategy:
             fail-fast: false
@@ -24,7 +25,11 @@ jobs:
                       symfony-version: '^5.4'
 
                     - php-version: '8.1'
-                      symfony-version: '6.0.*'
+                      symfony-version: '^6.0'
+                      dependencies: 'lowest'
+
+                    - php-version: '8.1'
+                      symfony-version: '^6.4'
 
                     - php-version: '8.2'
 
@@ -43,11 +48,11 @@ jobs:
                   ini-values: memory_limit=-1
                   coverage: none
 
-            - name: Composer update
-              env:
-                SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
-              run: |
-                composer update ${{ matrix.composer-flag }} --prefer-dist --no-interaction --no-progress
+            - name: Install dependencies with Composer
+              uses: ramsey/composer-install@v3
+              with:
+                dependency-versions: ${{ matrix.dependencies }}
+                composer-options: --prefer-dist
 
             - name: Prepare phpcr odm doctrine dbal
               run: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh

CHANGELOG.md

@@ -10,7 +10,7 @@ CHANGELOG
 * Deprecate using `Symfony\Component\DependencyInjection\ContainerAwareInterface` in favor of
   `PHPCR\PhpcrMigrationsBundle\ContainerAwareInterface` as Symfony 7 dropped its
   ContainerAwareInterface.
-  On Symfony 6, the legacy ContainerAwareInterface continues to e supported.
+  On Symfony 6, the legacy ContainerAwareInterface continues to be supported.
 
 1.5.0
 -----

composer.json

@@ -1,5 +1,4 @@
 {
-
     "name": "phpcr/phpcr-migrations-bundle",
     "description": "PHPCR migrations bundle",
     "license": "MIT",
@@ -24,9 +23,9 @@
         "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^1.8 || ^2.0",
+        "doctrine/doctrine-bundle": "^1.8 || ^2.5",
         "doctrine/phpcr-odm": "^1.4 || ^2.0",
-        "doctrine/annotations": "^2.0",
+        "doctrine/annotations": "^1.14 || ^2.0",
         "jackalope/jackalope-doctrine-dbal": "^1.4 || ^2.0",
         "symfony/monolog-bundle": "^3.0",
         "symfony/phpunit-bridge": "^7.0.6",

tests/Resources/App/AppKernel.php

@@ -38,7 +38,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
         $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
-        $loader->load(__DIR__.'/config/config.yml');
+        $loader->load(__DIR__.'/config/config.php');
     }
 
     protected function prepareContainer(ContainerBuilder $container): void

tests/Resources/App/config/config.php

@@ -0,0 +1,15 @@
+<?php
+
+$frameworkConfig = [
+    'property_access' => true,
+];
+
+if (class_exists(\Symfony\Component\Validator\Mapping\Loader\AnnotationLoader::class)) {
+    // Symfony < 7
+    $frameworkConfig['annotations'] = true;
+}
+
+$container->loadFromExtension('framework', $frameworkConfig);
+$container->loadFromExtension('phpcr_migrations', [
+    'version_node_name' => 'jcr:migrations',
+]);