Merge branch 'master' of https://github.com/zendframework/zf2 into qu…

…ickfix/sharedem-type-preference
webdevel · May 10, 2012 · 0aa2f0d · 0aa2f0d
2 parents e0589f6 + 66104b7
commit 0aa2f0d
Show file tree

Hide file tree

Showing 362 changed files with 17,828 additions and 1,929 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -8,7 +8,7 @@ for tested in "${testedcomponents[@]}"
     do
         echo "$tested:"
         phpunit -c $testdir/phpunit.xml $testdir/$tested
-        let "result = $result || $?"
+        result=$(($result || $?))
 done
 
-exit $result
+exit $result
diff --git a/.travis/tested-components b/.travis/tested-components
@@ -10,7 +10,7 @@ Zend/Crypt
 Zend/Currency
 Zend/Db
 Zend/Di
-Zend/Docbook
+Zend/DocBook
 Zend/Dojo
 Zend/Dom
 Zend/EventManager

diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ If you find code in this release behaving in an unexpected manner or
 contrary to its documented behavior, please create an issue in the Zend
 Framework issue tracker at:
 
-http://framework.zend.com/issues
+http://framework.zend.com/issues/browse/ZF2
 
 If you would like to be notified of new releases, you can subscribe to
 the fw-announce mailing list by sending a blank message to

diff --git a/bin/docbook_skeleton.php b/bin/docbook_skeleton.php
@@ -14,7 +14,7 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Docbook
+ * @package    Zend_DocBook
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
@@ -37,8 +37,8 @@
  */
 
 use Zend\Console\Getopt,
-    Zend\Docbook\ClassParser,
-    Zend\Docbook\SkeletonGenerator,
+    Zend\DocBook\ClassParser,
+    Zend\DocBook\SkeletonGenerator,
     Zend\Code\Reflection\ClassReflection as ReflectionClass;
 
 $libPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';

diff --git a/documentation/manual/de/module_specs/Zend_Service_Amazon.xml b/documentation/manual/de/module_specs/Zend_Service_Amazon.xml
@@ -139,7 +139,7 @@ $item = $amazon->itemLookup('B0000A432X');
         <para>
             Die <methodname>itemLookup()</methodname> Methode akzeptiert auch einen optionalen
             zweiten Parameter für die Handhabung der Suchoptionen. Für komplette Details, inklusive
-            einer Liste der möglichen Optionen sehen Sie bitte in die <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">relevante
+            einer Liste der möglichen Optionen sehen Sie bitte in die <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemLookupOperation">relevante
                 Amazon Dokumentation</link>.
         </para>
 
@@ -201,7 +201,7 @@ foreach ($results as $result) {
         <para>
             Die <methodname>itemSearch()</methodname> Methode akzeptiert einen einzelnen Parameter
             als Array für die Handhabung der Suchoptionen. Für komplette Details, inklusive eine
-            Liste der möglichen Optionen sehen Sie bitte in die <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevante
+            Liste der möglichen Optionen sehen Sie bitte in die <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">relevante
                 Amazon Dokumentation</link>
         </para>
 
@@ -259,7 +259,7 @@ foreach ($results as $result) {
 
                 <para>
                     Für weitere Informationen über die möglichen Optionen, sehen Sie bitte in die
-                    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevante
+                    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">relevante
                         Amazon Dokumentation</link>.
                 </para>
             </example>

diff --git a/documentation/manual/en/module_specs/Zend_Service_Amazon.xml b/documentation/manual/en/module_specs/Zend_Service_Amazon.xml
@@ -138,7 +138,7 @@ $item = $amazon->itemLookup('B0000A432X');
         <para>
             The <methodname>itemLookup()</methodname> method also accepts an optional second
             parameter for handling search options. For full details, including a list of available
-            options, please see the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">relevant
+            options, please see the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemLookupOperation">relevant
                 Amazon documentation</link>.
         </para>
 
@@ -198,7 +198,7 @@ foreach ($results as $result) {
         <para>
             The <methodname>itemSearch()</methodname> method accepts a single array parameter for
             handling search options. For full details, including a list of available options, please
-            see the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevant
+            see the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">relevant
                 Amazon documentation</link>
         </para>
 
@@ -253,7 +253,7 @@ foreach ($results as $result) {
                 </para>
 
                 <para>
-                    For more information on the available options, please refer to the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevant
+                    For more information on the available options, please refer to the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">relevant
                         Amazon documentation</link>.
                 </para>
             </example>

diff --git a/documentation/manual/fr/module_specs/Zend_Service_Amazon.xml b/documentation/manual/fr/module_specs/Zend_Service_Amazon.xml
@@ -150,7 +150,7 @@ $item = $amazon->itemLookup('B0000A432X');
         <para>
             La méthode <methodname>itemLookup()</methodname> accepte aussi un second paramètre optionnel
             pour gérer les options de recherche. Pour les détails complets et une liste des options
-            disponibles, visitez <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">
+            disponibles, visitez <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemLookupOperation">
             la documentation Amazon correspondante. </link>.
         </para>
 
@@ -213,7 +213,7 @@ foreach ($results as $result) {
         <para>
             La méthode <methodname>itemSearch()</methodname> accepte un seul tableau en paramètre pour
             gérer les options de recherche. Pour plus de détails et une liste des options
-            disponibles, visitez <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">
+            disponibles, visitez <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">
             la documentation Amazon correspondante </link>
         </para>
 
@@ -272,7 +272,7 @@ foreach ($results as $result) {
 
                 <para>
                     Pour plus d'information sur les options disponibles, vous pouvez vous
-                    référer à la <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">documentation
+                    référer à la <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">documentation
                     spécifique</link>.
                 </para>
             </example>

diff --git a/documentation/manual/ja/module_specs/Zend_Service_Amazon.xml b/documentation/manual/ja/module_specs/Zend_Service_Amazon.xml
@@ -131,7 +131,7 @@ $item = $amazon->itemLookup('B0000A432X');
         <para>
             <methodname>itemLookup()</methodname> メソッドにオプションの第 2 パラメータを渡すことで、
             検索オプションを指定できます。使用可能なオプションを含む詳細は、
-            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">関連する Amazon の文書</link>
+            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemLookupOperation">関連する Amazon の文書</link>
             を参照ください。
         </para>
         <note><info><title>画像の情報</title></info>
@@ -182,7 +182,7 @@ foreach ($results as $result) {
         <para>
             <methodname>itemSearch()</methodname> は配列のパラメータをひとつ受け取り、
             このパラメータで検索オプションを指定します。使用可能なオプションを含む詳細は、
-            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">関連する Amazon の文書</link>
+            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">関連する Amazon の文書</link>
             を参照ください。
         </para>
         <tip>
@@ -228,7 +228,7 @@ foreach ($results as $result) {
                 </para>
                 <para>
                     使用可能なオプションについての詳細な情報は、
-                    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">関連する Amazon の文書</link>
+                    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">関連する Amazon の文書</link>
                     を参照ください。
                 </para>
             </example>

diff --git a/documentation/manual/nl/module_specs/Zend_Service_Amazon.xml b/documentation/manual/nl/module_specs/Zend_Service_Amazon.xml
@@ -120,7 +120,7 @@ $item = $amazon->itemLookup('B0000A432X');
         <para>
             De <code>itemLookup()</code> methode aanvaardt ook een optionele tweede parameter om zoekopties af te handelen.
             Voor alle details, inclusief een lijst van beschikbare opties, zie de
-            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">relevante Amazon documentatie</link>.
+            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemLookupOperation">relevante Amazon documentatie</link>.
         <note>
             <para>
                 Om informatie over de beelden te verkrijgen voor je zoekresultaten, moet je de optie <code>ResponseGroup</code> tot <code>Medium</code> of <code>Large</code> zetten.
@@ -148,7 +148,7 @@ foreach($response as $r) {
         <para>
             De <code>itemSearch()</code> methode aanvaardt een enkele array array parameter om zoekopties af te handelen.
             Voor alle details, inclusief een lijst van beschikbare opties, zie de
-            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevante Amazon documentatie</link>
+            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">relevante Amazon documentatie</link>
         </para>
         <tip>
           <para>
@@ -192,7 +192,7 @@ foreach ($results as $result) {
             </para>
             <para>
                 Voor meer informatie over de beschikbare opties verwijzen we je graag door naar de
-                <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevante Amazon documentatie</link>.
+                <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">relevante Amazon documentatie</link>.
             </para>
         </example>
     </section>

diff --git a/documentation/manual/pl/module_specs/Zend_Service_Amazon.xml b/documentation/manual/pl/module_specs/Zend_Service_Amazon.xml
@@ -129,7 +129,7 @@ $item = $amazon->itemLookup('B0000A432X');
             Metoda <code>itemLookup()</code> także akceptuje opcjonalny drugi parametr
             do obsługi opcji wyszukiwania. Aby poznać pełne informacje, włączając
             w to listę dostępnych opcji odwiedź
-            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">dokumentację Amazon</link>.
+            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemLookupOperation">dokumentację Amazon</link>.
         </para>
         <note><info><title>Informacje o zdjęciach</title></info>
 
@@ -182,7 +182,7 @@ foreach ($results as $result) {
             Metoda <code>itemSearch()</code> akceptuje jeden parametr w postaci
             tablicy do obsługi opcji wyszukiwania. Aby poznać wszystkie
             szczegóły włączając w to listę dostępnych opcji, proszę zobacz
-            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">dokumentację Amazon</link>
+            <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">dokumentację Amazon</link>
         </para>
         <tip>
             <para>
@@ -231,7 +231,7 @@ foreach ($results as $result) {
                 </para>
                 <para>
                     Aby uzyskać więcej informacji o dostępnych opcjach, proszę odwiedź
-                    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">dokumentację Amazon</link>.
+                    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2011-08-01&amp;p=ApiReference/ItemSearchOperation">dokumentację Amazon</link>.
                 </para>
             </example>
         </section>

diff --git a/library/Zend/Code/Annotation/Annotation.php b/library/Zend/Code/Annotation/Annotation.php
diff --git a/library/Zend/Code/Annotation/AnnotationCollection.php b/library/Zend/Code/Annotation/AnnotationCollection.php
@@ -6,6 +6,12 @@
 
 class AnnotationCollection extends ArrayObject
 {
+    /**
+     * Checks if the collection has annotations for a class
+     *
+     * @param $class
+     * @return bool
+     */
     public function hasAnnotation($class)
     {
         foreach ($this as $annotation) {

diff --git a/library/Zend/Code/Annotation/AnnotationInterface.php b/library/Zend/Code/Annotation/AnnotationInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Zend\Code\Annotation;
+
+interface AnnotationInterface
+{
+    /**
+     * Initialize
+     *
+     * @param $content
+     */
+    public function initialize($content);
+}
diff --git a/library/Zend/Code/Annotation/AnnotationManager.php b/library/Zend/Code/Annotation/AnnotationManager.php
@@ -17,6 +17,12 @@ class AnnotationManager
      */
     protected $annotations = array();
 
+    /**
+     * Constructor
+     *
+     * @param array $annotations
+     * @return void
+     */
     public function __construct(array $annotations = array())
     {
         if ($annotations) {
@@ -26,7 +32,13 @@ public function __construct(array $annotations = array())
         }
     }
 
-    public function registerAnnotation(Annotation $annotation)
+    /**
+     * Register annotations
+     *
+     * @param AnnotationInterface $annotation
+     * @throws Exception\InvalidArgumentException
+     */
+    public function registerAnnotation(AnnotationInterface $annotation)
     {
         $class = get_class($annotation);
 
@@ -38,12 +50,26 @@ public function registerAnnotation(Annotation $annotation)
         $this->annotationNames[] = $class;
     }
 
+    /**
+     * Checks if the manager has annotations for a class
+     *
+     * @param $class
+     * @return bool
+     */
     public function hasAnnotation($class)
     {
         // otherwise, only if its name exists as a key
         return in_array($class, $this->annotationNames);
     }
 
+    /**
+     * Create Annotation
+     *
+     * @param string $class
+     * @param $content
+     * @return AnnotationInterface
+     * @throws Exception\RuntimeException
+     */
     public function createAnnotation($class, $content = null)
     {
         if (!$this->hasAnnotation($class)) {

diff --git a/library/Zend/Code/Exception.php b/library/Zend/Code/Exception.php
diff --git a/library/Zend/Code/Exception/BadMethodCallException.php b/library/Zend/Code/Exception/BadMethodCallException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\Code\Exception;
+
+class BadMethodCallException
+    extends \BadMethodCallException
+    implements ExceptionInterface
+{
+}
diff --git a/library/Zend/Code/Exception/ExceptionInterface.php b/library/Zend/Code/Exception/ExceptionInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Code\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/library/Zend/Code/Exception/InvalidArgumentException.php b/library/Zend/Code/Exception/InvalidArgumentException.php
@@ -2,10 +2,8 @@
 
 namespace Zend\Code\Exception;
 
-use Zend\Code\Exception;
-
-class InvalidArgumentException 
+class InvalidArgumentException
     extends \InvalidArgumentException 
-    implements Exception
+    implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Code/Exception/RuntimeException.php b/library/Zend/Code/Exception/RuntimeException.php
@@ -2,8 +2,8 @@
 
 namespace Zend\Code\Exception;
 
-use Zend\Code\Exception;
-
-class RuntimeException extends \RuntimeException implements Exception
+class RuntimeException
+    extends \RuntimeException
+    implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Code/Generator.php b/library/Zend/Code/Generator.php