ZF-12046: Add additional fixes missed by first patch (r24780)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24782 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/de/module_specs/Zend_Service_Amazon.xml

@@ -142,7 +142,7 @@ $item = $amazon->itemLookup('B0000A432X');
             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 <ulink
-                url="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">relevante
+                url="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</ulink>.
         </para>
 
@@ -205,7 +205,7 @@ foreach ($results as $result) {
             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 <ulink
-                url="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevante
+                url="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</ulink>
         </para>
 
@@ -265,7 +265,7 @@ foreach ($results as $result) {
                 <para>
                     Für weitere Informationen über die möglichen Optionen, sehen Sie bitte in die
                     <ulink
-                        url="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevante
+                        url="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</ulink>.
                 </para>
             </example>

documentation/manual/en/module_specs/Zend_Service_Amazon.xml

@@ -140,7 +140,7 @@ $item = $amazon->itemLookup('B0000A432X');
             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 <ulink
-                url="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">relevant
+                url="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</ulink>.
         </para>
 
@@ -201,7 +201,7 @@ foreach ($results as $result) {
             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 <ulink
-                url="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevant
+                url="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</ulink>
         </para>
 
@@ -258,7 +258,7 @@ foreach ($results as $result) {
 
                 <para>
                     For more information on the available options, please refer to the <ulink
-                        url="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">relevant
+                        url="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</ulink>.
                 </para>
             </example>

documentation/manual/fr/module_specs/Zend_Service_Amazon.xml

@@ -153,7 +153,7 @@ $item = $amazon->itemLookup('B0000A432X');
             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 <ulink
-            url="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemLookupOperation">
+            url="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. </ulink>.
         </para>
 
@@ -217,7 +217,7 @@ foreach ($results as $result) {
             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 <ulink
-            url="http://www.amazon.com/gp/aws/sdk/main.html/103-9285448-4703844?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">
+            url="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 </ulink>
         </para>
 
@@ -278,7 +278,7 @@ foreach ($results as $result) {
                 <para>
                     Pour plus d'information sur les options disponibles, vous pouvez vous
                     référer à la <ulink
-                    url="http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&amp;v=2005-10-05&amp;p=ApiReference/ItemSearchOperation">documentation
+                    url="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</ulink>.
                 </para>
             </example>

documentation/manual/ja/module_specs/Zend_Service_Amazon.xml

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

documentation/manual/nl/module_specs/Zend_Service_Amazon.xml

@@ -120,7 +120,7 @@ $item = $amazon->itemLookup('B0000A432X');
             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
             <ulink
-                url="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</ulink>.
+                url="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</ulink>.
         <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.
@@ -149,7 +149,7 @@ foreach($response as $r) {
             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
             <ulink
-                url="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</ulink>
+                url="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</ulink>
         </para>
         <tip>
           <para>
@@ -194,7 +194,7 @@ foreach ($results as $result) {
             <para>
                 Voor meer informatie over de beschikbare opties verwijzen we je graag door naar de
                 <ulink
-                    url="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</ulink>.
+                    url="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</ulink>.
             </para>
         </example>
     </sect3>

documentation/manual/pl/module_specs/Zend_Service_Amazon.xml

@@ -129,7 +129,7 @@ $item = $amazon->itemLookup('B0000A432X');
             do obsługi opcji wyszukiwania. Aby poznać pełne informacje, włączając
             w to listę dostępnych opcji odwiedź
             <ulink
-                url="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</ulink>.
+                url="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</ulink>.
         </para>
         <note>
             <title>Informacje o zdjęciach</title>
@@ -183,7 +183,7 @@ foreach ($results as $result) {
             tablicy do obsługi opcji wyszukiwania. Aby poznać wszystkie
             szczegóły włączając w to listę dostępnych opcji, proszę zobacz
             <ulink
-                url="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</ulink>
+                url="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</ulink>
         </para>
         <tip>
             <para>
@@ -233,7 +233,7 @@ foreach ($results as $result) {
                 <para>
                     Aby uzyskać więcej informacji o dostępnych opcjach, proszę odwiedź
                     <ulink
-                        url="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</ulink>.
+                        url="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</ulink>.
                 </para>
             </example>
         </sect3>

library/Zend/Service/Amazon.php

@@ -104,7 +104,7 @@ class Zend_Service_Amazon
      * @param  array $options Options to use for the Search Query
      * @throws Zend_Service_Exception
      * @return Zend_Service_Amazon_ResultSet
-     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemSearchOperation
+     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2011-08-01&p=ApiReference/ItemSearchOperation
      */
     public function itemSearch(array $options)
     {
@@ -142,7 +142,7 @@ class Zend_Service_Amazon
      *
      * @param  string $asin    Amazon ASIN ID
      * @param  array  $options Query Options
-     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemLookupOperation
+     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2011-08-01&p=ApiReference/ItemLookupOperation
      * @throws Zend_Service_Exception
      * @return Zend_Service_Amazon_Item|Zend_Service_Amazon_ResultSet
      */
@@ -171,7 +171,7 @@ class Zend_Service_Amazon
         $dom->loadXML($response->getBody());
         self::_checkErrors($dom);
         $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
         $items = $xpath->query('//az:Items/az:Item');
 
         if ($items->length == 1) {
@@ -229,7 +229,7 @@ class Zend_Service_Amazon
         $options['AWSAccessKeyId'] = $this->appId;
         $options['Service']        = 'AWSECommerceService';
         $options['Operation']      = (string) $query;
-        $options['Version']        = '2005-10-05';
+        $options['Version']        = '2011-08-01';
 
         // de-canonicalize out sort key
         if (isset($options['ResponseGroup'])) {
@@ -302,7 +302,7 @@ class Zend_Service_Amazon
     protected static function _checkErrors(DOMDocument $dom)
     {
         $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
+        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2011-08-01');
 
         if ($xpath->query('//az:Error')->length >= 1) {
             $code = $xpath->query('//az:Error/az:Code/text()')->item(0)->data;

tests/Zend/Service/Amazon/_files/amazon-response-invalid.xml

@@ -1 +1 @@
-<?xml version="1.0" ?><ItemSearchResponse xmlns="http://webservices.amazon.com/AWSECommerceService/2011-08-01"><OperationRequest><HTTPHeaders><Header Name="UserAgent" Value="Zend_Http_Client"></Header></HTTPHeaders><RequestId>ae1b57b9-ac1c-4408-87f2-942e72630361</RequestId><Arguments><Argument Name="Operation" Value="ItemSearch"></Argument><Argument Name="Service" Value="AWSECommerceService"></Argument><Argument Name="Power" Value="isbn:0750640162"></Argument><Argument Name="AWSAccessKeyId" Value="API_KEY"></Argument><Argument Name="Timestamp" Value="2010-03-26T19:26:31Z"></Argument><Argument Name="Signature" Value="A0ThHMQTqYixyc6aDFO6bdbRUEXc77E/k8nEKgfqY70="></Argument><Argument Name="ResponseGroup" Value="Large,ItemAttributes,Images,EditorialReview,Request"></Argument><Argument Name="SearchIndex" Value="Books"></Argument><Argument Name="Version" Value="2005-10-05"></Argument></Arguments><RequestProcessingTime>0.0410670000000000</RequestProcessingTime></OperationRequest><Items><Request><IsValid>True</IsValid><ItemSearchRequest><Condition>New</Condition><DeliveryMethod>Ship</DeliveryMethod><MerchantId>Amazon</MerchantId><Power>isbn:0750640162</Power><ResponseGroup>Large</ResponseGroup><ResponseGroup>ItemAttributes</ResponseGroup><ResponseGroup>Images</ResponseGroup><ResponseGroup>EditorialReview</ResponseGroup><ResponseGroup>Request</ResponseGroup><SearchIndex>Books</SearchIndex></ItemSearchRequest></Request><TotalResults>1</TotalResults><TotalPages>1</TotalPages></Items></ItemSearchResponse>
+<?xml version="1.0" ?><ItemSearchResponse xmlns="http://webservices.amazon.com/AWSECommerceService/2011-08-01"><OperationRequest><HTTPHeaders><Header Name="UserAgent" Value="Zend_Http_Client"></Header></HTTPHeaders><RequestId>ae1b57b9-ac1c-4408-87f2-942e72630361</RequestId><Arguments><Argument Name="Operation" Value="ItemSearch"></Argument><Argument Name="Service" Value="AWSECommerceService"></Argument><Argument Name="Power" Value="isbn:0750640162"></Argument><Argument Name="AWSAccessKeyId" Value="API_KEY"></Argument><Argument Name="Timestamp" Value="2010-03-26T19:26:31Z"></Argument><Argument Name="Signature" Value="A0ThHMQTqYixyc6aDFO6bdbRUEXc77E/k8nEKgfqY70="></Argument><Argument Name="ResponseGroup" Value="Large,ItemAttributes,Images,EditorialReview,Request"></Argument><Argument Name="SearchIndex" Value="Books"></Argument><Argument Name="Version" Value="2011-08-01"></Argument></Arguments><RequestProcessingTime>0.0410670000000000</RequestProcessingTime></OperationRequest><Items><Request><IsValid>True</IsValid><ItemSearchRequest><Condition>New</Condition><DeliveryMethod>Ship</DeliveryMethod><MerchantId>Amazon</MerchantId><Power>isbn:0750640162</Power><ResponseGroup>Large</ResponseGroup><ResponseGroup>ItemAttributes</ResponseGroup><ResponseGroup>Images</ResponseGroup><ResponseGroup>EditorialReview</ResponseGroup><ResponseGroup>Request</ResponseGroup><SearchIndex>Books</SearchIndex></ItemSearchRequest></Request><TotalResults>1</TotalResults><TotalPages>1</TotalPages></Items></ItemSearchResponse>

tests/Zend/Service/Amazon/_files/offers_with_names.xml

@@ -11,7 +11,7 @@
       <Argument Name="Service" Value="AWSECommerceService"/>
       <Argument Name="Signature" Value="xxxxxxxxxxxxxxxxx"/>
       <Argument Name="MerchantId" Value="All"/>
-      <Argument Name="Version" Value="2005-10-05"/>
+      <Argument Name="Version" Value="2011-08-01"/>
       <Argument Name="ItemId" Value="0439774098,B00000194U"/>
       <Argument Name="IdType" Value="ASIN"/>
       <Argument Name="AWSAccessKeyId" Value="xxxxxxxxxxxx"/>