Merge pull request #39 from creative-commoners/pulls/1/php82

NEW PHP 8.2 for CMS5
silverstripe · Jan 26, 2023 · 44aa087 · 44aa087
2 parents 096a755 + 488a078
commit 44aa087
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 9 deletions.
diff --git a/consts.php b/consts.php
@@ -25,9 +25,11 @@
     ],
     '5.0' => [
         '8.1',
+        '8.2',
     ],
     '5' => [
         '8.1',
+        '8.2',
     ],
 ];
 

diff --git a/job_creator.php b/job_creator.php
@@ -345,11 +345,24 @@ private function createPhpunitJobs(
                     'phpunit_suite' => $suite,
                 ]);
             }
-            $matrix['include'][] = $this->createJob(3, [
-                'db' => DB_MYSQL_80,
-                'phpunit' => true,
-                'phpunit_suite' => $suite,
-            ]);
+            if ($this->getCmsMajor() === '4') {
+                $matrix['include'][] = $this->createJob(3, [
+                    'db' => DB_MYSQL_80,
+                    'phpunit' => true,
+                    'phpunit_suite' => $suite,
+                ]);
+            } elseif ($this->getCmsMajor() === '5') {
+                $matrix['include'][] = $this->createJob(0, [
+                    'db' => DB_MYSQL_57,
+                    'phpunit' => true,
+                    'phpunit_suite' => $suite,
+                ]);
+                $matrix['include'][] = $this->createJob(1, [
+                    'db' => DB_MYSQL_80,
+                    'phpunit' => true,
+                    'phpunit_suite' => $suite,
+                ]);
+            }
         }
         return $matrix;
     }

diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php
@@ -264,6 +264,23 @@ public function provideCreateJson(): array
                     [
                         'installer_version' => '5.x-dev',
                         'php' => '8.1',
+                        'db' => DB_MYSQL_57,
+                        'composer_require_extra' => '',
+                        'composer_args' => '',
+                        'name_suffix' => '',
+                        'phpunit' => 'true',
+                        'phpunit_suite' => 'all',
+                        'phplinting' => 'false',
+                        'phpcoverage' => 'false',
+                        'endtoend' => 'false',
+                        'endtoend_suite' => 'root',
+                        'endtoend_config' => '',
+                        'js' => 'false',
+                        'name' => '8.1 mysql57 phpunit all',
+                    ],
+                    [
+                        'installer_version' => '5.x-dev',
+                        'php' => '8.2',
                         'db' => DB_MYSQL_80,
                         'composer_require_extra' => '',
                         'composer_args' => '',
@@ -276,7 +293,7 @@ public function provideCreateJson(): array
                         'endtoend_suite' => 'root',
                         'endtoend_config' => '',
                         'js' => 'false',
-                        'name' => '8.1 mysql80 phpunit all',
+                        'name' => '8.2 mysql80 phpunit all',
                     ],
                 ]
             ],
@@ -753,7 +770,8 @@ public function provideComposerInstall(): array
                 '5.x-dev',
                 [
                     // '8.1 prf-low mysql57 phpunit all',
-                    '8.1 mysql80 phpunit all'
+                    '8.1 mysql57 phpunit all',
+                    '8.2 mysql80 phpunit all'
                 ]
             ],
             'composerupgrade_definedphpversion_framework5' => [
@@ -762,7 +780,8 @@ public function provideComposerInstall(): array
                 '5.x-dev',
                 [
                     // '8.1 prf-low mysql57 phpunit all',
-                    '8.1 mysql80 phpunit all'
+                    '8.1 mysql57 phpunit all',
+                    '8.2 mysql80 phpunit all'
                 ]
             ],
             'composerupgrade_invalidphpversion_framework5' => [
@@ -771,7 +790,8 @@ public function provideComposerInstall(): array
                 '5.x-dev',
                 [
                     // '8.1 prf-low mysql57 phpunit all',
-                    '8.1 mysql80 phpunit all'
+                    '8.1 mysql57 phpunit all',
+                    '8.2 mysql80 phpunit all'
                 ]
             ],
         ];