Merge 86f7862 into 118e9d8

Bacon · Oct 11, 2014 · db5a78f · db5a78f
2 parents 118e9d8 + 86f7862
commit db5a78f
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,14 +1,8 @@
 {
     "name": "bacon/bacon-string-utils",
     "description": "BaconStringUtils contain utitilies to work with strings.",
-    "license" : "BSD-2-Clause",
     "homepage": "https://github.com/Bacon/BaconStringUtils",
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "suggest": {
-        "zendframework/zend-filter": "To use the Slugifier as a Zend\\Filter instance"
-    },
+    "license" : "BSD-2-Clause",
     "authors": [
         {
             "name": "Ben Scholzen 'DASPRiD'",
@@ -17,15 +11,26 @@
             "role": "Developer"
         }
     ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "zendframework/zendframework": "~2.0",
+        "phpunit/phpunit": "~3.7",
+        "squizlabs/php_codesniffer": "~1.5",
+        "satooshi/php-coveralls": "~0.6"
+    },
+    "suggest": {
+        "zendframework/zend-filter": "To use the Slugifier as a Zend\\Filter instance."
+    },
     "autoload": {
         "psr-0": {
             "BaconStringUtils": "src/"
         }
     },
-    "require-dev": {
-        "zendframework/zendframework": "2.*",
-        "phpunit/PHPUnit": "3.7.*",
-        "squizlabs/php_codesniffer": "1.*",
-        "satooshi/php-coveralls": "dev-master"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
     }
 }