[TASK] Add PHP 7.3 to bamboo core v7 testing 09/58809/3
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 31 Oct 2018 11:05:12 +0000 (12:05 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Wed, 31 Oct 2018 12:53:14 +0000 (13:53 +0100)
Extension dbal needs a patch with PHP 7.3 for
"continue inside switch" blocks, similar to
what has been done with #86589.

Change-Id: I202d6292b3d110e8e87bf3c882f25af22c0c040e
Resolves: #86813
Related: #86589
Releases: 7.6
Reviewed-on: https://review.typo3.org/58809
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Build/bamboo/pom.xml
Build/bamboo/src/main/java/core/PreMergeSpec.java
typo3/sysext/dbal/Classes/Database/SqlCompilers/Adodb.php

index 757de5d..f51cdb3 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>6.3.1</version>
+    <version>6.6.2</version>
     <relativePath/>
   </parent>
 
index ea25d32..e3b777f 100644 (file)
@@ -90,18 +90,21 @@ public class PreMergeSpec extends AbstractCoreSpec {
         jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP70"));
         jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP71"));
         jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP72"));
+        jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP73"));
 
         jobsMainStage.add(this.getJobLintPhp("PHP55"));
         jobsMainStage.add(this.getJobLintPhp("PHP56"));
         jobsMainStage.add(this.getJobLintPhp("PHP70"));
         jobsMainStage.add(this.getJobLintPhp("PHP71"));
         jobsMainStage.add(this.getJobLintPhp("PHP72"));
+        jobsMainStage.add(this.getJobLintPhp("PHP73"));
 
         jobsMainStage.add(this.getJobUnitPhp("PHP55"));
         jobsMainStage.add(this.getJobUnitPhp("PHP56"));
         jobsMainStage.add(this.getJobUnitPhp("PHP70"));
         jobsMainStage.add(this.getJobUnitPhp("PHP71"));
         jobsMainStage.add(this.getJobUnitPhp("PHP72"));
+        jobsMainStage.add(this.getJobUnitPhp("PHP73"));
 
         Stage stageMainStage = new Stage("Main stage")
             .jobs(jobsMainStage.toArray(new Job[jobsMainStage.size()]));
index 27ebc9f..2015464 100644 (file)
@@ -289,7 +289,7 @@ class Adodb extends AbstractCompiler
                 switch (true) {
                     case $feature === 'UNSIGNED' && !$this->databaseConnection->runningADOdbDriver('mysql'):
                     case $feature === 'NOTNULL' && $this->databaseConnection->runningADOdbDriver('oci8'):
-                        continue;
+                        continue 2;
                     case $feature === 'AUTO_INCREMENT':
                         $cfg .= ' AUTOINCREMENT';
                         break;