Merge remote-tracking branch 'zf2/master'

zendframework · Jul 23, 2012 · 93b11b3 · 93b11b3
commit 93b11b3
Show file tree

Hide file tree

Showing 22 changed files with 292 additions and 523 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
diff --git a/.travis/skipped-components b/.travis/skipped-components
diff --git a/.travis/tested-components b/.travis/tested-components
diff --git a/composer.json b/composer.json
@@ -1,28 +1,31 @@
 {
-    "name": "zendframework/zend-input-filter",
-    "description": "Zend\\InputFilter component",
+    "name": "zendframework/zend-inputfilter",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
-        "input-filter"
+        "inputfilter"
     ],
     "autoload": {
         "psr-4": {
-            "Zend\\InputFilter\\": "src/"
+            "Zend\\InputFilter": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23"
-    },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/PHPUnit": "~4.0"
+        "php": ">=5.3.3",
+        "zendframework/zend-filter": "self.version",
+        "zendframework/zend-validator": "self.version",
+        "zendframework/zend-stdlib": "self.version"
     },
     "homepage": "https://github.com/zendframework/zend-input-filter",
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\InputFilter\\": "test/"
         }
+    },
+    "require-dev": {
+        "fabpot/php-cs-fixer": "1.7.*",
+        "satooshi/php-coveralls": "dev-master",
+        "phpunit/PHPUnit": "~4.0"
     }
 }