Merge 72a582b into f6faf65

Fedott · Mar 11, 2017 · b6c966d · b6c966d
2 parents f6faf65 + 72a582b
commit b6c966d
Show file tree

Hide file tree

Showing 32 changed files with 1,754 additions and 152 deletions.
diff --git a/.idea/async-data-mapper.iml b/.idea/async-data-mapper.iml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: php
 
 php:
-  - 7.1
+  - 7.1.1 #todo remove after release php 7.1.3
   - nightly
 
 matrix:

diff --git a/composer.json b/composer.json
@@ -2,6 +2,7 @@
     "name": "fedot/async-data-mapper",
     "description": "Simple async datamaper",
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "license": "MIT",
     "authors": [
         {
@@ -21,13 +22,18 @@
     },
     "require": {
         "php": "^7.1",
-        "async-interop/promise": "^0.4"
+        "async-interop/promise": "^0.4",
+        "jms/metadata": "^1.6",
+        "doctrine/annotations": "^1.4",
+        "doctrine/instantiator": "^1.0"
     },
     "require-dev": {
         "amphp/loop": "dev-master",
         "amphp/redis": "dev-amp_v2",
         "symfony/serializer": "^3.2",
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^6.0",
+        "symfony/property-access": "^3.2",
+        "symfony/property-info": "^3.2"
     },
     "suggest": {
         "amphp/redis": "Needed for Redis implementation",