Merge branch 'master' of git://github.com/zendframework/zf2 into feat…

…ure/console
zendframework · Jul 15, 2012 · 57d6216 · 57d6216
commit 57d6216
Show file tree

Hide file tree

Showing 42 changed files with 3 additions and 3,339 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-test",
-    "description": "provides tools to facilitate unit testing of your Zend Framework applications",
+    "description": "Zend\\Test component",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-test",
     "autoload": {
         "psr-4": {
-            "Zend\\Test": "src/"
+            "Zend\\Test\\": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.23",
         "phpunit/PHPUnit": "~4.0",
         "zendframework/zend-console": "self.version",
         "zendframework/zend-dom": "self.version",

diff --git a/src/DbAdapter.php b/src/DbAdapter.php