Merge branch '3.0.x-merge-up-into-3.1.x_5fe36203f0e230.52180338' into 3.1.x

Author: goetas

.doctrine-project.json

@@ -5,7 +5,7 @@
   "versions": [
     {
       "name": "3.1",
-      "branchName": "master",
+      "branchName": "3.1.x",
       "slug": "3.1",
       "upcoming": true
     },

.github/workflows/continuous-integration.yml

@@ -30,6 +30,8 @@ jobs:
         include:
           - deps: "low"
             php-version: "7.2"
+          - deps: "dev"
+            php-version: "8.0"
 
     steps:
       - name: "Checkout"
@@ -51,14 +53,13 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
-      # to be removed when doctrine/orm adds support for PHP 8
-      - name: "Pretend this is PHP 7.4"
-        run: "composer config platform.php 7.4.99"
-        if: "${{ matrix.php-version == '8.0' }}"
+      - name: "Allow installing dev dependencies"
+        run: "composer config minimum-stability dev"
+        if: "${{ matrix.deps == 'dev' }}"
 
       - name: "Install dependencies with composer"
         run: "composer update --no-interaction --prefer-dist"
-        if: "${{ matrix.deps == 'normal' }}"
+        if: "${{ matrix.deps != 'low' }}"
 
       - name: "Install lowest possible dependencies with composer"
         run: "composer update --no-interaction --prefer-dist --prefer-lowest"

Resources/doc/index.rst

@@ -67,7 +67,6 @@ application:
                 version_column_name: 'version'
                 version_column_length: 1024
                 executed_at_column_name: 'executed_at'
-                execution_time_column_name: 'execution_time'
 
         # Possible values: "BY_YEAR", "BY_YEAR_AND_MONTH", false
         organize_migrations: false
@@ -243,12 +242,12 @@ Here is an example on how to inject the service container into your migrations:
 
     .. code-block:: yaml
 
-        # config/packages/doctrine_migrations.yml
+        # config/packages/doctrine_migrations.yaml
         doctrine_migrations:
             services:
                  'Doctrine\Migrations\Version\MigrationFactory': 'App\Migrations\Factory\MigrationFactoryDecorator'
 
-        # config/services.yml
+        # config/services.yaml
         services:
             Doctrine\Migrations\Version\DbalMigrationFactory: ~
             App\Migrations\Factory\MigrationFactoryDecorator:
@@ -331,7 +330,7 @@ for Doctrine's ORM:
 
     .. code-block:: yaml
 
-        # config/doctrine/User.orm.yml
+        # config/doctrine/User.orm.yaml
         App\Entity\User:
             type: entity
             table: user

composer.json

@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "symfony/framework-bundle": "~3.4|~4.0|~5.0",
         "doctrine/doctrine-bundle": "~1.0|~2.0",
         "doctrine/migrations": "~3.0"