Merge branch 'feature/di' into zf2/master

Conflicts: tests/TestConfiguration.php.dist
zendframework · Jun 13, 2011 · df39826 · df39826
2 parents 52cf404 + 52ccee8
commit df39826
Show file tree

Hide file tree

Showing 122 changed files with 9,724 additions and 8 deletions.
diff --git a/documentation/manual/en/tutorials/quickstart-di.xml b/documentation/manual/en/tutorials/quickstart-di.xml
diff --git a/library/Zend/Code/Exception.php b/library/Zend/Code/Exception.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Code;
+
+interface Exception
+{
+}
diff --git a/library/Zend/Code/Exception/InvalidArgumentException.php b/library/Zend/Code/Exception/InvalidArgumentException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Zend\Code\Exception;
+
+use Zend\Code\Exception;
+
+class InvalidArgumentException 
+    extends \InvalidArgumentException 
+    implements Exception
+{
+}
diff --git a/library/Zend/Code/Exception/RuntimeException.php b/library/Zend/Code/Exception/RuntimeException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\Code\Exception;
+
+use Zend\Code\Exception;
+
+class RuntimeException extends \RuntimeException implements Exception
+{
+}
diff --git a/library/Zend/Code/Scanner.php b/library/Zend/Code/Scanner.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\Code;
+
+interface Scanner
+{
+    public static function export();
+    public function __toString();
+}