Merge pull request #515 from GOCDB/release-5.12.0

Release 5.12.0 to master

Author: gregcorbett

.github/workflows/continuous-integration.yml

@@ -18,17 +18,17 @@ jobs:
         extension: ["pdo_mysql"]
         include:
           - php-version: "5.4"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "5.5"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "5.6"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "7.0"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "7.1"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "7.4"
-            composer-json: "composer-7.4.json"
+            composer-json: "composer.json"
 
     services:
       mariadb:

composer-7.4.json composer-5.4.jsoncomposer-7.4.json renamed to composer-5.4.json

@@ -2,7 +2,7 @@
     "name": "stfc-egi/gocdb",
     "description": "A web portal and REST style API for e-Infrastructure topology managment",
     "require": {
-	"doctrine/orm": "2.6.*"
+	"doctrine/orm": "2.5.14"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",