Merge pull request GOCDB#343 from ineilson/orm-2.4-to-2.5

ORM 2.4 to 2.5
gregcorbett · Jul 4, 2022 · 4b9fccf · 4b9fccf
2 parents 6c850cc + 4dad3cd
commit 4b9fccf
Show file tree

Hide file tree

Showing 2 changed files with 576 additions and 177 deletions.
diff --git a/composer.json b/composer.json
@@ -2,12 +2,11 @@
     "name": "stfc-egi/gocdb",
     "description": "A web portal and REST style API for e-Infrastructure topology managment",
     "require": {
-	"doctrine/orm": "2.4.8",
-	"doctrine/dbal": "2.5.4"
-    }, 
+	"doctrine/orm": "2.5.14"
+    },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",
         "phpunit/dbunit": ">=1.2",
-        "taq/pdooci": "^1.0" 
+        "taq/pdooci": "^1.0"
     }
 }