Merge branch 'release/2.x' of https://github.com/phpDocumentor/ReflectionDocBlock

2026-08-17 17:47:13 +00:00 · 2016-06-13 21:28:05 +02:00
parent fd9e6bd26d e6a969a640
commit d411a2bc7e
29 changed files with 802 additions and 239 deletions
@@ -8,13 +8,19 @@
    "require": {
        "php": ">=5.3.3"
    },
-    "suggest": {
-        "dflydev/markdown": "1.0.*"
-    },
    "autoload": {
        "psr-0": {"Barryvdh": ["src/"]}
    },
    "require-dev": {
-        "phpunit/phpunit": "3.7.*@stable"
+        "phpunit/phpunit": "~4.0,<4.5"
+    },
+    "suggest": {
+        "dflydev/markdown": "~1.0",
+        "erusev/parsedown": "~1.0"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
    }
 }