From 7deb0698fd13978d358e1e6b725ed33cf63b3bb3 Mon Sep 17 00:00:00 2001
From: Michiel Gerritsen <michiel@controlaltdelete.nl>
Date: Thu, 15 Jun 2023 10:19:49 +0200
Subject: [PATCH] Magento 2.4.7-beta2, 2.4.6-p3, 2.4.6-p1, 2.4.5-p5, 2.4.5-p4,
 2.4.5-p3, 2.4.4-p6, 2.4.4-p5, 2.4.4-p4

---
 .github/workflows/magento-2.3.yml             |  1 -
 .github/workflows/magento-2.4.yml             | 33 ++++++++++++++++++-
 .../workflows/magento-with-replacements.yml   |  1 -
 Test/CustomTestCase.php                       | 25 --------------
 Test/ExampleTest.php                          |  2 +-
 magento/Dockerfile-2.4                        |  1 +
 magento/scripts/downgrade-monolog.php         |  6 +++-
 7 files changed, 39 insertions(+), 30 deletions(-)
 delete mode 100644 Test/CustomTestCase.php

diff --git a/.github/workflows/magento-2.3.yml b/.github/workflows/magento-2.3.yml
index eaa2c76..d2ce98a 100644
--- a/.github/workflows/magento-2.3.yml
+++ b/.github/workflows/magento-2.3.yml
@@ -109,7 +109,6 @@ jobs:
         docker exec magento-project-community-edition mkdir -p /data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
         docker cp Test/composer.json magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/
         docker cp Test/ExampleTest.php magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
-        docker cp Test/CustomTestCase.php magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
 
     - name: Install the example test module
       run: docker exec magento-project-community-edition composer require michielgerritsen/exampletest:@dev
diff --git a/.github/workflows/magento-2.4.yml b/.github/workflows/magento-2.4.yml
index 6be21e1..af6f773 100644
--- a/.github/workflows/magento-2.4.yml
+++ b/.github/workflows/magento-2.4.yml
@@ -12,16 +12,48 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: false }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: true }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: false }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: true }
+          # 2.4.6-p2 is disabled due to this error that keeps haunting me:
+          # Connection "default" is not defined
+#          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p2, SAMPLE_DATA: false }
+#          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p2, SAMPLE_DATA: true }
+#          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p2, SAMPLE_DATA: false }
+#          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p2, SAMPLE_DATA: true }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p1, SAMPLE_DATA: false }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p1, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p1, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p1, SAMPLE_DATA: true }
           - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: false }
           - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p5, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p5, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p4, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p4, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p3, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p3, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p2, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p2, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p1, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p1, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: true }
+          - { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: false }
+          - { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: true }
           - { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: false }
           - { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: false }
@@ -127,7 +159,6 @@ jobs:
         docker exec magento-project-community-edition mkdir -p /data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
         docker cp Test/composer.json magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/
         docker cp Test/ExampleTest.php magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
-        docker cp Test/CustomTestCase.php magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
 
     - name: Install the example test module
       run: docker exec magento-project-community-edition composer require michielgerritsen/exampletest:@dev
diff --git a/.github/workflows/magento-with-replacements.yml b/.github/workflows/magento-with-replacements.yml
index eaa2163..0bc5105 100644
--- a/.github/workflows/magento-with-replacements.yml
+++ b/.github/workflows/magento-with-replacements.yml
@@ -46,7 +46,6 @@ jobs:
         docker exec magento-project-community-edition mkdir -p /data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
         docker cp Test/composer.json magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/
         docker cp Test/ExampleTest.php magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
-        docker cp Test/CustomTestCase.php magento-project-community-edition:/data/extensions/MichielGerritsen-ExampleTest/Test/Integration/
 
     - name: Install the example test module
       run: docker exec magento-project-community-edition composer require michielgerritsen/exampletest:@dev
diff --git a/Test/CustomTestCase.php b/Test/CustomTestCase.php
deleted file mode 100644
index b4bac38..0000000
--- a/Test/CustomTestCase.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- *    ______            __             __
- *   / ____/___  ____  / /__________  / /
- *  / /   / __ \/ __ \/ __/ ___/ __ \/ /
- * / /___/ /_/ / / / / /_/ /  / /_/ / /
- * \______________/_/\__/_/   \____/_/
- *    /   |  / / /_
- *   / /| | / / __/
- *  / ___ |/ / /_
- * /_/ _|||_/\__/ __     __
- *    / __ \___  / /__  / /____
- *   / / / / _ \/ / _ \/ __/ _ \
- *  / /_/ /  __/ /  __/ /_/  __/
- * /_____/\___/_/\___/\__/\___/
- *
- */
-
-namespace MichielGerritsen\ExampleTest\Test\Integration;
-
-if (class_exists(\PHPUnit\Framework\TestCase::class)) {
-    class CustomTestCase extends \PHPUnit\Framework\TestCase {}
-} else {
-    class CustomTestCase extends \PHPUnit_Framework_TestCase {}
-}
diff --git a/Test/ExampleTest.php b/Test/ExampleTest.php
index 122202e..679f1e4 100644
--- a/Test/ExampleTest.php
+++ b/Test/ExampleTest.php
@@ -18,7 +18,7 @@
 
 namespace MichielGerritsen\ExampleTest\Test\Integration;
 
-class ExampleTest extends CustomTestCase
+class ExampleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * The only goal of this test is to check if test can be run successful.
diff --git a/magento/Dockerfile-2.4 b/magento/Dockerfile-2.4
index 12a6613..8653aab 100644
--- a/magento/Dockerfile-2.4
+++ b/magento/Dockerfile-2.4
@@ -8,6 +8,7 @@ ARG SAMPLE_DATA=false
 ENV CI=true
 ENV URL=http://localhost/
 ENV FLAT_TABLES=false
+ENV COMPOSER_ALLOW_SUPERUSER=1
 
 COPY scripts/retry retry
 COPY patches/ patches/
diff --git a/magento/scripts/downgrade-monolog.php b/magento/scripts/downgrade-monolog.php
index 2916bfd..38d1d5f 100644
--- a/magento/scripts/downgrade-monolog.php
+++ b/magento/scripts/downgrade-monolog.php
@@ -14,11 +14,15 @@
 $is244 = substr($version, 0, 5) == '2.4.4';
 $is245 = substr($version, 0, 5) == '2.4.5';
 $is246 = substr($version, 0, 5) == '2.4.6';
+$is247 = substr($version, 0, 5) == '2.4.7';
 $isP1 = substr($version, 6, 8) == 'p1';
 $isP2 = substr($version, 6, 8) == 'p2';
 $isP3 = substr($version, 6, 8) == 'p3';
+$isP4 = substr($version, 6, 8) == 'p4';
+$isP5 = substr($version, 6, 8) == 'p5';
+$isP6 = substr($version, 6, 8) == 'p6';
 
-if (($is244 && ($isP1 || $isP2 || $isP3)) || $is245 || $is246) {
+if (($is244 && ($isP1 || $isP2 || $isP3 || $isP4 || $isP5 || $isP6)) || $is245 || $is246 || $is247) {
     echo 'No monolog changes needed, skipping' . PHP_EOL;
     return;
 }