Merge pull request #22 from luishscosta/master

Corrige conflitos com pacotes
discovery-tecnologia · Nov 28, 2018 · abf1dec · abf1dec
2 parents 84208a5 + 8096e10
commit abf1dec
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -22,13 +22,13 @@
     "php"                      : ">=5.6",
     "guzzlehttp/guzzle"        : "6.3.3",
     "jms/serializer"           : "1.3.1",
-    "doctrine/collections"     : "v1.3.0",
-    "doctrine/cache"           : "v1.6.0",
-    "doctrine/instantiator"    : "1.0.4",
-    "doctrine/annotations"     : "v1.4.0"
+    "doctrine/collections"     : "^v1.3.0",
+    "doctrine/cache"           : "^v1.6.0",
+    "doctrine/instantiator"    : "^1.0.4",
+    "doctrine/annotations"     : "^v1.4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.5.*"
+    "phpunit/phpunit": "^5.5.0"
   },
   "autoload": {
     "psr-4": {
@@ -38,4 +38,4 @@
   "scripts": {
     "test": "./vendor/bin/phpunit"
   }
-}
+}