fixes #2581 - minor update to ZF 1.11.11 "ALL ONES"

git-svn-id: http://dev.piwik.org/svn/trunk@5260 59fd770c-687e-43c8-a1e3-f5a4ff64c105

27 files changed, 100 insertions, 33 deletions

diff --git a/libs/Zend/Cache/Backend/Sqlite.php b/libs/Zend/Cache/Backend/Sqlite.php
index 17dc6b0cb6..061fcd56d4 100644
--- a/libs/Zend/Cache/Backend/Sqlite.php
+++ b/libs/Zend/Cache/Backend/Sqlite.php
@@ -17,7 +17,7 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sqlite.php 23775 2011-03-01 17:25:24Z ralph $
+ * @version    $Id: Sqlite.php 24348 2011-08-04 17:51:24Z mabe $
  */
 
 
@@ -530,7 +530,6 @@ class Zend_Cache_Backend_Sqlite extends Zend_Cache_Backend implements Zend_Cache
             $rand = rand(1, $this->_options['automatic_vacuum_factor']);
             if ($rand == 1) {
                 $this->_query('VACUUM');
-                @sqlite_close($this->_getConnection());
             }
         }
     }
diff --git a/libs/Zend/Config.php b/libs/Zend/Config.php
index dcf3cf13ef..175b2ae036 100644
--- a/libs/Zend/Config.php
+++ b/libs/Zend/Config.php
@@ -481,4 +481,4 @@ class Zend_Config implements Countable, Iterator
 
         return $firstArray;
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Config/Writer/FileAbstract.php b/libs/Zend/Config/Writer/FileAbstract.php
index d4d986a248..0c5b72ae9b 100644
--- a/libs/Zend/Config/Writer/FileAbstract.php
+++ b/libs/Zend/Config/Writer/FileAbstract.php
@@ -131,4 +131,4 @@ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer
     {
         return "";
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Db.php b/libs/Zend/Db.php
index dea5a6501f..f9d9d3362d 100644
--- a/libs/Zend/Db.php
+++ b/libs/Zend/Db.php
@@ -17,7 +17,7 @@
  * @package    Zend_Db
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 23775 2011-03-01 17:25:24Z ralph $
+ * @version    $Id: Db.php 24417 2011-08-28 10:15:47Z padraic $
  */
 
 
@@ -90,6 +90,9 @@ class Zend_Db
      *    'NULL_TO_STRING', 'ERR_NONE', 'FETCH_ORI_NEXT',
      *    'FETCH_ORI_PRIOR', 'FETCH_ORI_FIRST', 'FETCH_ORI_LAST',
      *    'FETCH_ORI_ABS', 'FETCH_ORI_REL', 'CURSOR_FWDONLY', 'CURSOR_SCROLL',
+     *    'ERR_CANT_MAP', 'ERR_SYNTAX', 'ERR_CONSTRAINT', 'ERR_NOT_FOUND',
+     *    'ERR_ALREADY_EXISTS', 'ERR_NOT_IMPLEMENTED', 'ERR_MISMATCH',
+     *    'ERR_TRUNCATED', 'ERR_DISCONNECTED', 'ERR_NO_PERM',
      * );
      *
      * $const = array();
@@ -122,7 +125,17 @@ class Zend_Db
     const CASE_UPPER = 1;
     const CURSOR_FWDONLY = 0;
     const CURSOR_SCROLL = 1;
+    const ERR_ALREADY_EXISTS = NULL;
+    const ERR_CANT_MAP = NULL;
+    const ERR_CONSTRAINT = NULL;
+    const ERR_DISCONNECTED = NULL;
+    const ERR_MISMATCH = NULL;
+    const ERR_NO_PERM = NULL;
     const ERR_NONE = '00000';
+    const ERR_NOT_FOUND = NULL;
+    const ERR_NOT_IMPLEMENTED = NULL;
+    const ERR_SYNTAX = NULL;
+    const ERR_TRUNCATED = NULL;
     const ERRMODE_EXCEPTION = 2;
     const ERRMODE_SILENT = 0;
     const ERRMODE_WARNING = 1;
diff --git a/libs/Zend/Db/Adapter/Pdo/Mssql.php b/libs/Zend/Db/Adapter/Pdo/Mssql.php
index 21902cac30..22069c51ea 100644
--- a/libs/Zend/Db/Adapter/Pdo/Mssql.php
+++ b/libs/Zend/Db/Adapter/Pdo/Mssql.php
@@ -420,4 +420,4 @@ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Db/Statement/Mysqli.php b/libs/Zend/Db/Statement/Mysqli.php
index a4e7a482c9..0e101798e1 100644
--- a/libs/Zend/Db/Statement/Mysqli.php
+++ b/libs/Zend/Db/Statement/Mysqli.php
@@ -359,4 +359,4 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement
         return $mysqli->affected_rows;
     }
 
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Db/Statement/Pdo/Ibm.php b/libs/Zend/Db/Statement/Pdo/Ibm.php
index 2f7b59e70a..fcc63dd6ec 100644
--- a/libs/Zend/Db/Statement/Pdo/Ibm.php
+++ b/libs/Zend/Db/Statement/Pdo/Ibm.php
@@ -91,4 +91,4 @@ class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Db/Statement/Pdo/Oci.php b/libs/Zend/Db/Statement/Pdo/Oci.php
index baa3f34af2..0ddf79cd3c 100644
--- a/libs/Zend/Db/Statement/Pdo/Oci.php
+++ b/libs/Zend/Db/Statement/Pdo/Oci.php
@@ -88,4 +88,4 @@ class Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo
 
         return $row;
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Db/Table/Select.php b/libs/Zend/Db/Table/Select.php
index 431a2c14d0..f47e310735 100644
--- a/libs/Zend/Db/Table/Select.php
+++ b/libs/Zend/Db/Table/Select.php
@@ -221,4 +221,4 @@ class Zend_Db_Table_Select extends Zend_Db_Select
 
         return parent::assemble();
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Feed/Builder/Header/Itunes.php b/libs/Zend/Feed/Builder/Header/Itunes.php
index 0b498ae9ac..b86e01bb67 100644
--- a/libs/Zend/Feed/Builder/Header/Itunes.php
+++ b/libs/Zend/Feed/Builder/Header/Itunes.php
@@ -285,4 +285,4 @@ class Zend_Feed_Builder_Header_Itunes extends ArrayObject
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php b/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php
index 0632f58190..8667490458 100644
--- a/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php
+++ b/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php
@@ -199,4 +199,4 @@ class Zend_Feed_Reader_Extension_Podcast_Entry extends Zend_Feed_Reader_Extensio
     {
         $this->_xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php b/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php
index 1e897641ed..412a73cb9f 100644
--- a/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php
+++ b/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php
@@ -290,4 +290,4 @@ class Zend_Feed_Reader_Extension_Podcast_Feed extends Zend_Feed_Reader_Extension
     {
         $this->_xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Feed/Writer/Extension/RendererAbstract.php b/libs/Zend/Feed/Writer/Extension/RendererAbstract.php
index 4782eb8eab..f5593ecd98 100644
--- a/libs/Zend/Feed/Writer/Extension/RendererAbstract.php
+++ b/libs/Zend/Feed/Writer/Extension/RendererAbstract.php
@@ -13,10 +13,10 @@
  * to padraic dot brady at yahoo dot com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Feed_Writer_Entry_Rss
+ * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererAbstract.php 23775 2011-03-01 17:25:24Z ralph $
+ * @version    $Id: RendererAbstract.php 24437 2011-09-03 19:31:11Z ramon $
  */
 
 /**
@@ -26,7 +26,7 @@
 
  /**
  * @category   Zend
- * @package    Zend_Feed_Writer_Entry_Rss
+ * @package    Zend_Feed_Writer
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/libs/Zend/Http/Client.php b/libs/Zend/Http/Client.php
index b1b0d25d90..8db4c66dd5 100644
--- a/libs/Zend/Http/Client.php
+++ b/libs/Zend/Http/Client.php
@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client
- * @version    $Id: Client.php 24337 2011-08-01 13:04:41Z ezimuel $
+ * @version    $Id: Client.php 24461 2011-09-11 19:25:08Z padraic $
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -247,6 +247,20 @@ class Zend_Http_Client
     protected $redirectCounter = 0;
 
     /**
+     * Status for unmasking GET array params
+     *
+     * @var boolean
+     */
+    protected $_unmaskStatus = false;
+
+    /**
+     * Status if the http_build_query function escapes brackets
+     *
+     * @var boolean
+     */
+    protected $_queryBracketsEscaped = true;
+
+    /**
      * Fileinfo magic database resource
      *
      * This variable is populated the first time _detectFileMimeType is called
@@ -271,6 +285,8 @@ class Zend_Http_Client
         if ($config !== null) {
             $this->setConfig($config);
         }
+
+        $this->_queryBracketsEscaped = version_compare(phpversion(), '5.1.3', '>=');
     }
 
     /**
@@ -797,6 +813,35 @@ class Zend_Http_Client
     }
 
     /**
+     * Set the unmask feature for GET parameters as array
+     *
+     * Example:
+     * foo%5B0%5D=a&foo%5B1%5D=b
+     * becomes
+     * foo=a&foo=b
+     *
+     * This is usefull for some services
+     *
+     * @param boolean $status
+     * @return Zend_Http_Client
+     */
+    public function setUnmaskStatus($status = true)
+    {
+        $this->_unmaskStatus = (BOOL)$status;
+        return $this;
+    }
+
+    /**
+     * Returns the currently configured unmask status
+     *
+     * @return boolean
+     */
+    public function getUnmaskStatus()
+    {
+        return $this->_unmaskStatus;
+    }
+
+    /**
      * Clear all GET and POST parameters
      *
      * Should be used to reset the request parameters if the client is
@@ -996,6 +1041,15 @@ class Zend_Http_Client
                     $query = str_replace('+', '%20', $query);
                 }
 
+                // @see ZF-11671 to unmask for some services to foo=val1&foo=val2
+                if ($this->getUnmaskStatus()) {
+                    if ($this->_queryBracketsEscaped) {
+                        $query = preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $query);
+                    } else {
+                        $query = preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $query);
+                    }
+                }
+
                 $uri->setQuery($query);
             }
 
diff --git a/libs/Zend/Log/FactoryInterface.php b/libs/Zend/Log/FactoryInterface.php
index 0cb5d6b31b..7b3d77e926 100644
--- a/libs/Zend/Log/FactoryInterface.php
+++ b/libs/Zend/Log/FactoryInterface.php
@@ -35,4 +35,4 @@ interface Zend_Log_FactoryInterface
      * @return Zend_Log_FactoryInterface
      */
     static public function factory($config);
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Log/Formatter/Abstract.php b/libs/Zend/Log/Formatter/Abstract.php
index 0bd1a97cda..310253977c 100644
--- a/libs/Zend/Log/Formatter/Abstract.php
+++ b/libs/Zend/Log/Formatter/Abstract.php
@@ -37,4 +37,4 @@
 abstract class Zend_Log_Formatter_Abstract
     implements Zend_Log_Formatter_Interface, Zend_Log_FactoryInterface
 {
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Log/Formatter/Firebug.php b/libs/Zend/Log/Formatter/Firebug.php
index 946fc944e4..e34533cc76 100644
--- a/libs/Zend/Log/Formatter/Firebug.php
+++ b/libs/Zend/Log/Formatter/Firebug.php
@@ -58,4 +58,4 @@ class Zend_Log_Formatter_Firebug extends Zend_Log_Formatter_Abstract
     {
         return $event['message'];
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Log/Formatter/Simple.php b/libs/Zend/Log/Formatter/Simple.php
index fc6b51bc37..1680057c3d 100644
--- a/libs/Zend/Log/Formatter/Simple.php
+++ b/libs/Zend/Log/Formatter/Simple.php
@@ -105,4 +105,4 @@ class Zend_Log_Formatter_Simple extends Zend_Log_Formatter_Abstract
 
         return $output;
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Log/Writer/Syslog.php b/libs/Zend/Log/Writer/Syslog.php
index 1a935c6207..3c85e709ea 100644
--- a/libs/Zend/Log/Writer/Syslog.php
+++ b/libs/Zend/Log/Writer/Syslog.php
@@ -264,4 +264,4 @@ class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract
 
         syslog($priority, $message);
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Mail/Message/Interface.php b/libs/Zend/Mail/Message/Interface.php
index 42a2531ff2..8d3a80d9d6 100644
--- a/libs/Zend/Mail/Message/Interface.php
+++ b/libs/Zend/Mail/Message/Interface.php
@@ -52,4 +52,4 @@ interface Zend_Mail_Message_Interface
      * @return array array with flags, key and value are the same for easy lookup
      */
     public function getFlags();
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Mail/Part/Interface.php b/libs/Zend/Mail/Part/Interface.php
index 3b63d5ccc1..da60c382cb 100644
--- a/libs/Zend/Mail/Part/Interface.php
+++ b/libs/Zend/Mail/Part/Interface.php
@@ -133,4 +133,4 @@ interface Zend_Mail_Part_Interface extends RecursiveIterator
      * @return string content
      */
     public function __toString();
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Mail/Storage/Writable/Interface.php b/libs/Zend/Mail/Storage/Writable/Interface.php
index c7e5a1a9b9..214d42108d 100644
--- a/libs/Zend/Mail/Storage/Writable/Interface.php
+++ b/libs/Zend/Mail/Storage/Writable/Interface.php
@@ -105,4 +105,4 @@ interface Zend_Mail_Storage_Writable_Interface
      * @throws Zend_Mail_Storage_Exception
      */
     public function setFlags($id, $flags);
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/OpenId.php b/libs/Zend/OpenId.php
index b6f9141d33..c7d165a7e4 100644
--- a/libs/Zend/OpenId.php
+++ b/libs/Zend/OpenId.php
@@ -17,7 +17,7 @@
  * @package    Zend_OpenId
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenId.php 23775 2011-03-01 17:25:24Z ralph $
+ * @version    $Id: OpenId.php 24379 2011-08-14 12:01:10Z padraic $
  */
 
 /**
@@ -285,7 +285,7 @@ class Zend_OpenId
         $port = $reg[4];
         $path = $reg[5];
         $query = $reg[6];
-        $fragment = $reg[7]; /* strip it */
+        $fragment = $reg[7]; /* strip it */ /* ZF-4358 Fragment retained under OpenID 2.0 */
 
         if (empty($scheme) || empty($host)) {
             return false;
@@ -350,7 +350,8 @@ class Zend_OpenId
             . $host
             . (empty($port) ? '' : (':' . $port))
             . $path
-            . $query;
+            . $query
+            . $fragment;
         return true;
     }
 
diff --git a/libs/Zend/Validate/Barcode.php b/libs/Zend/Validate/Barcode.php
index 2f77c7b10a..9afeaacc48 100644
--- a/libs/Zend/Validate/Barcode.php
+++ b/libs/Zend/Validate/Barcode.php
@@ -225,4 +225,4 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Validate/File/Crc32.php b/libs/Zend/Validate/File/Crc32.php
index 335ab26510..951e9be1af 100644
--- a/libs/Zend/Validate/File/Crc32.php
+++ b/libs/Zend/Validate/File/Crc32.php
@@ -176,4 +176,4 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
 
         return $this->_throw($file, self::DOES_NOT_MATCH);
     }
-}
\ No newline at end of file
+}
diff --git a/libs/Zend/Validate/Hostname/Com.php b/libs/Zend/Validate/Hostname/Com.php
index e97945edbb..9ee039be00 100644
--- a/libs/Zend/Validate/Hostname/Com.php
+++ b/libs/Zend/Validate/Hostname/Com.php
@@ -195,4 +195,4 @@ return array(
     79 => '/^[\x{20000}-\x{2A6DF}]{1,63}$/iu',
     80 => '/^[\x{2F800}-\x{2FA1F}]{1,63}$/iu'
 
-);
\ No newline at end of file
+);
diff --git a/libs/Zend/Version.php b/libs/Zend/Version.php
index e9622d7e3c..40a5b28427 100644
--- a/libs/Zend/Version.php
+++ b/libs/Zend/Version.php
@@ -16,7 +16,7 @@
  * @package    Zend_Version
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Version.php 24344 2011-08-02 19:49:32Z matthew $
+ * @version    $Id: Version.php 24483 2011-09-29 15:31:19Z matthew $
  */
 
 /**
@@ -32,7 +32,7 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.11.10';
+    const VERSION = '1.11.11';
 
     /**
      * The latest stable version Zend Framework available