Merge pull request nelmio#282 from enumag/patch-2

Improve Property populator
vinzlj · Oct 11, 2015 · fc1de0b · fc1de0b
2 parents e4b48d0 + 9d400fb
commit fc1de0b
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 961 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+composer.lock
 vendor/
 .php_cs.cache
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "doctrine/common": "~2.3",
         "symfony/property-access": "~2.2",
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "~4.0.0"
     },
     "autoload": {
         "psr-4": { "Nelmio\\Alice\\": "src/Nelmio/Alice" }