Skip to content

Commit e70290e

Browse files
authored
Merge pull request #1 from Fedott/dev-annotation-mapping
Annotation mapping with relationships
2 parents f6faf65 + bca9ab9 commit e70290e

33 files changed

Lines changed: 1923 additions & 153 deletions

.idea/async-data-mapper.iml

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyleSettings.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: false
33
language: php
44

55
php:
6-
- 7.1
6+
- 7.1.1 #todo remove after release php 7.1.3
77
- nightly
88

99
matrix:

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "fedot/async-data-mapper",
33
"description": "Simple async datamaper",
44
"minimum-stability": "dev",
5+
"prefer-stable": true,
56
"license": "MIT",
67
"authors": [
78
{
@@ -21,13 +22,18 @@
2122
},
2223
"require": {
2324
"php": "^7.1",
24-
"async-interop/promise": "^0.4"
25+
"async-interop/promise": "^0.4",
26+
"jms/metadata": "^1.6",
27+
"doctrine/annotations": "^1.4",
28+
"doctrine/instantiator": "^1.0"
2529
},
2630
"require-dev": {
2731
"amphp/loop": "dev-master",
2832
"amphp/redis": "dev-amp_v2",
2933
"symfony/serializer": "^3.2",
30-
"phpunit/phpunit": "^6.0"
34+
"phpunit/phpunit": "^6.0",
35+
"symfony/property-access": "^3.2",
36+
"symfony/property-info": "^3.2"
3137
},
3238
"suggest": {
3339
"amphp/redis": "Needed for Redis implementation",

0 commit comments

Comments
 (0)