Merge pull request #9 from ministryofjustice/SDV2-1310-strikes-back

Revert "Merge pull request #8 from ministryofjustice/revert-SDV2-1310"
ministryofjustice · Jun 4, 2018 · 7144c34 · 7144c34
2 parents 7026051 + 21c5ac8
commit 7144c34
Show file tree

Hide file tree

Showing 9 changed files with 1,734 additions and 187 deletions.
diff --git a/composer.json b/composer.json
@@ -2,16 +2,16 @@
   "name": "ministryofjustice/zend-rest-module",
   "description": "A Zend module for creating RESTful web services.",
   "license": "MIT",
-  "minimum-stability": "dev",
   "require": {
-    "php": ">=5.3.3",
-    "zendframework/zendframework": "2.3.*",
-    "doctrine/common": "~2.5@dev",
-    "jms/serializer": "~0.16.0"
+    "php": ">=7.1",
+    "zendframework/zendframework": "^2.3",
+    "doctrine/common": "~2.5",
+    "jms/serializer": "^1.10"
   },
   "require-dev": {
-    "mockery/mockery": "0.9.*@dev",
-    "aeris/guzzle-http-mock": "~1.0.0"
+    "mockery/mockery": "^0.9",
+    "aeris/guzzle-http-mock": "^1.0.0",
+    "phpunit/phpunit": "^7.2"
   },
   "autoload": {
     "psr-4": {
@@ -23,5 +23,10 @@
     "classmap": [
       "test/ZendRestModuleTest/Integration/Fixture/RestTestModule/Module.php"
     ]
+  },
+  "autoload-dev": {
+    "files": [
+      "test/autoload/phpunit-class-aliases.php"
+    ]
   }
 }