From dae3d59dcf4dff2f799507d261d1512d338afca6 Mon Sep 17 00:00:00 2001
From: Alan Poulain <contact@alanpoulain.eu>
Date: Mon, 18 May 2020 17:47:41 +0200
Subject: [PATCH 1/2] Remove PHP 7.1 from CI

---
 .github/workflows/ci.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65914f01434..687c347a6b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -146,7 +146,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.1'
           - '7.2'
           - '7.3'
           - '7.4'
@@ -164,7 +163,6 @@ jobs:
             bash \
             unzip \
       - name: Cache mongodb PHP extension build
-        if: (!startsWith(matrix.php, '7.1'))
         uses: actions/cache@v1
         with:
           path: /var/tmp/build/ext-mongodb-${{ env.EXT_MONGODB_VERSION }}
@@ -173,7 +171,6 @@ jobs:
             ext-mongodb-${{ env.EXT_MONGODB_VERSION }}-php${{ matrix.php }}-
         continue-on-error: true
       - name: Install mongodb PHP extension
-        if: (!startsWith(matrix.php, '7.1'))
         env:
           BUILD_DIR: /var/tmp/build/ext-mongodb-${{ env.EXT_MONGODB_VERSION }}
           SRC_DIR: /usr/src/php/ext/mongodb
@@ -223,12 +220,6 @@ jobs:
         run: |
           composer global require --prefer-dist --no-progress --no-suggest --ansi \
             symfony/flex
-      - name: Remove Doctrine MongoDB ODM
-        if: startsWith(matrix.php, '7.1')
-        run: |
-          composer remove --dev --no-progress --no-update --ansi \
-            doctrine/mongodb-odm \
-            doctrine/mongodb-odm-bundle \
       - name: Update project dependencies
         run: |
           mkdir -p /tmp/api-platform/core/vendor
@@ -286,7 +277,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.1'
           - '7.2'
           - '7.3'
           - '7.4'
@@ -304,7 +294,6 @@ jobs:
             bash \
             unzip \
       - name: Cache mongodb PHP extension build
-        if: (!startsWith(matrix.php, '7.1'))
         uses: actions/cache@v1
         with:
           path: /var/tmp/build/ext-mongodb-${{ env.EXT_MONGODB_VERSION }}
@@ -313,7 +302,6 @@ jobs:
             ext-mongodb-${{ env.EXT_MONGODB_VERSION }}-php${{ matrix.php }}-
         continue-on-error: true
       - name: Install mongodb PHP extension
-        if: (!startsWith(matrix.php, '7.1'))
         env:
           BUILD_DIR: /var/tmp/build/ext-mongodb-${{ env.EXT_MONGODB_VERSION }}
           SRC_DIR: /usr/src/php/ext/mongodb
@@ -363,12 +351,6 @@ jobs:
         run: |
           composer global require --prefer-dist --no-progress --no-suggest --ansi \
             symfony/flex
-      - name: Remove Doctrine MongoDB ODM
-        if: startsWith(matrix.php, '7.1')
-        run: |
-          composer remove --dev --no-progress --no-update --ansi \
-            doctrine/mongodb-odm \
-            doctrine/mongodb-odm-bundle \
       - name: Update project dependencies
         run: |
           mkdir -p /tmp/api-platform/core/vendor
@@ -651,7 +633,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.1'
           - '7.2'
           - '7.3'
         include:
@@ -671,7 +652,6 @@ jobs:
             bash \
             unzip \
       - name: Cache mongodb PHP extension build
-        if: (!startsWith(matrix.php, '7.1'))
         uses: actions/cache@v1
         with:
           path: /var/tmp/build/ext-mongodb-${{ env.EXT_MONGODB_VERSION }}
@@ -680,7 +660,6 @@ jobs:
             ext-mongodb-${{ env.EXT_MONGODB_VERSION }}-php${{ matrix.php }}-
         continue-on-error: true
       - name: Install mongodb PHP extension
-        if: (!startsWith(matrix.php, '7.1'))
         env:
           BUILD_DIR: /var/tmp/build/ext-mongodb-${{ env.EXT_MONGODB_VERSION }}
           SRC_DIR: /usr/src/php/ext/mongodb
@@ -731,12 +710,6 @@ jobs:
         run: |
           composer global require --prefer-dist --no-progress --no-suggest --ansi \
             symfony/flex
-      - name: Remove Doctrine MongoDB ODM
-        if: startsWith(matrix.php, '7.1')
-        run: |
-          composer remove --dev --no-progress --no-update --ansi \
-            doctrine/mongodb-odm \
-            doctrine/mongodb-odm-bundle \
       - name: Update project dependencies
         run: |
           mkdir -p /tmp/api-platform/core/vendor

From 10c6430b423d64a523584be5afeab0efa36dede1 Mon Sep 17 00:00:00 2001
From: Alan Poulain <contact@alanpoulain.eu>
Date: Mon, 18 May 2020 17:57:32 +0200
Subject: [PATCH 2/2] Bump Doctrine Inflector to 1.4.0 in dev only

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 3fe004f96ae..786f51df91b 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,7 @@
         "doctrine/data-fixtures": "^1.2.2",
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
         "doctrine/doctrine-cache-bundle": "^1.3.5",
+        "doctrine/inflector": "^1.4",
         "doctrine/mongodb-odm": "^2.0",
         "doctrine/mongodb-odm-bundle": "^4.0",
         "doctrine/orm": "^2.6.4",