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

…tfix/5144
HolgerW1 · May 20, 2014 · e2481f4 · e2481f4
2 parents d81384d + 42ad2cc
commit e2481f4
Show file tree

Hide file tree

Showing 64 changed files with 268 additions and 34 deletions.
diff --git a/library/Zend/Authentication/CONTRIBUTING.md b/library/Zend/Authentication/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Barcode/CONTRIBUTING.md b/library/Zend/Barcode/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Cache/CONTRIBUTING.md b/library/Zend/Cache/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Captcha/CONTRIBUTING.md b/library/Zend/Captcha/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Code/CONTRIBUTING.md b/library/Zend/Code/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Config/CONTRIBUTING.md b/library/Zend/Config/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Console/CONTRIBUTING.md b/library/Zend/Console/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Crypt/CONTRIBUTING.md b/library/Zend/Crypt/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Connection.php b/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
@@ -301,7 +301,7 @@ public function connect()
                     if (isset($port)) {
                         $dsn[] = "port={$port}";
                     }
-                    if (isset($charset)) {
+                    if (isset($charset) && $pdoDriver != 'pgsql') {
                         $dsn[] = "charset={$charset}";
                     }
                     break;
@@ -319,6 +319,9 @@ public function connect()
         try {
             $this->resource = new \PDO($dsn, $username, $password, $options);
             $this->resource->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+            if (isset($charset) && $pdoDriver == 'pgsql') {
+                $this->resource->exec('SET NAMES ' . $this->resource->quote($charset));
+            }
             $this->driverName = strtolower($this->resource->getAttribute(\PDO::ATTR_DRIVER_NAME));
         } catch (\PDOException $e) {
             $code = $e->getCode();

diff --git a/library/Zend/Db/CONTRIBUTING.md b/library/Zend/Db/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Debug/CONTRIBUTING.md b/library/Zend/Debug/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Di/CONTRIBUTING.md b/library/Zend/Di/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Dom/CONTRIBUTING.md b/library/Zend/Dom/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Escaper/CONTRIBUTING.md b/library/Zend/Escaper/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/EventManager/CONTRIBUTING.md b/library/Zend/EventManager/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Feed/CONTRIBUTING.md b/library/Zend/Feed/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/File/CONTRIBUTING.md b/library/Zend/File/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Filter/CONTRIBUTING.md b/library/Zend/Filter/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Filter/Digits.php b/library/Zend/Filter/Digits.php
@@ -18,14 +18,17 @@ class Digits extends AbstractFilter
      *
      * Returns the string $value, removing all but digit characters
      *
-     * If the value provided is non-scalar, the value will remain unfiltered
+     * If the value provided is not integer, float or string, the value will remain unfiltered
      *
      * @param  string $value
      * @return string|mixed
      */
     public function filter($value)
     {
-        if (!is_scalar($value)) {
+        if (is_int($value)) {
+            return (string) $value;
+        }
+        if (! (is_float($value) || is_string($value))) {
             return $value;
         }
         $value = (string) $value;

diff --git a/library/Zend/Filter/StringTrim.php b/library/Zend/Filter/StringTrim.php
@@ -46,10 +46,12 @@ public function __construct($charlistOrOptions = null)
      */
     public function setCharList($charList)
     {
-        if (empty($charList)) {
+        if (! strlen($charList)) {
             $charList = null;
         }
+
         $this->options['charlist'] = $charList;
+
         return $this;
     }
 

diff --git a/library/Zend/Form/CONTRIBUTING.md b/library/Zend/Form/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Form/Element/Date.php b/library/Zend/Form/Element/Date.php
@@ -10,6 +10,7 @@
 namespace Zend\Form\Element;
 
 use DateInterval;
+use DateTimezone;
 use Zend\Form\Element;
 use Zend\Form\Element\DateTime as DateTimeElement;
 use Zend\Validator\DateStep as DateStepValidator;
@@ -50,6 +51,7 @@ protected function getStepValidator()
         return new DateStepValidator(array(
             'format'    => $format,
             'baseValue' => $baseValue,
+            'timezone'  => new DateTimezone('UTC'),
             'step'      => new DateInterval("P{$stepValue}D"),
         ));
     }

diff --git a/library/Zend/Http/CONTRIBUTING.md b/library/Zend/Http/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/I18n/CONTRIBUTING.md b/library/Zend/I18n/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/InputFilter/CONTRIBUTING.md b/library/Zend/InputFilter/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Json/CONTRIBUTING.md b/library/Zend/Json/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Ldap/CONTRIBUTING.md b/library/Zend/Ldap/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Loader/CONTRIBUTING.md b/library/Zend/Loader/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Log/CONTRIBUTING.md b/library/Zend/Log/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Mail/CONTRIBUTING.md b/library/Zend/Mail/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Math/CONTRIBUTING.md b/library/Zend/Math/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Memory/CONTRIBUTING.md b/library/Zend/Memory/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Mime/CONTRIBUTING.md b/library/Zend/Mime/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/ModuleManager/CONTRIBUTING.md b/library/Zend/ModuleManager/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Mvc/CONTRIBUTING.md b/library/Zend/Mvc/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Navigation/CONTRIBUTING.md b/library/Zend/Navigation/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Paginator/CONTRIBUTING.md b/library/Zend/Paginator/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Permissions/Acl/CONTRIBUTING.md b/library/Zend/Permissions/Acl/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Permissions/Rbac/CONTRIBUTING.md b/library/Zend/Permissions/Rbac/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/ProgressBar/CONTRIBUTING.md b/library/Zend/ProgressBar/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Serializer/CONTRIBUTING.md b/library/Zend/Serializer/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Server/CONTRIBUTING.md b/library/Zend/Server/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/ServiceManager/CONTRIBUTING.md b/library/Zend/ServiceManager/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Session/CONTRIBUTING.md b/library/Zend/Session/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Session/SaveHandler/MongoDBOptions.php b/library/Zend/Session/SaveHandler/MongoDBOptions.php
@@ -38,7 +38,7 @@ class MongoDBOptions extends AbstractOptions
      * @see http://php.net/manual/en/mongocollection.save.php
      * @var string
      */
-    protected $saveOptions = array('safe' => true);
+    protected $saveOptions = array('w' => 1);
 
     /**
      * Name field

diff --git a/library/Zend/Soap/CONTRIBUTING.md b/library/Zend/Soap/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -32,19 +32,19 @@ public function addComplexType($type)
             ));
         }
 
-        if (($soapType = $this->scanRegisteredTypes($type)) !== null) {
+        $class   = new ReflectionClass($type);
+        $phpType = $class->getName();
+
+        if (($soapType = $this->scanRegisteredTypes($phpType)) !== null) {
             return $soapType;
         }
 
         $dom = $this->getContext()->toDomDocument();
-        $class = new ReflectionClass($type);
-
-        $soapTypeName = $this->getContext()->translateType($type);
+        $soapTypeName = $this->getContext()->translateType($phpType);
         $soapType     = Wsdl::TYPES_NS . ':' . $soapTypeName;
 
         // Register type here to avoid recursion
-        $this->getContext()->addType($type, $soapType);
-
+        $this->getContext()->addType($phpType, $soapType);
 
         $defaultProperties = $class->getDefaultProperties();
 

diff --git a/library/Zend/Stdlib/CONTRIBUTING.md b/library/Zend/Stdlib/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Tag/CONTRIBUTING.md b/library/Zend/Tag/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Test/CONTRIBUTING.md b/library/Zend/Test/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -232,8 +232,11 @@ public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
             $query = array_merge($query, $params);
         } elseif ($method == HttpRequest::METHOD_PUT) {
             if (count($params) != 0) {
-                array_walk($params,
-                    function (&$item, $key) { $item = $key . '=' . $item; }
+                array_walk(
+                    $params,
+                    function (&$item, $key) {
+                        $item = $key . '=' . $item;
+                    }
                 );
                 $content = implode('&', $params);
                 $request->setContent($content);

diff --git a/library/Zend/Text/CONTRIBUTING.md b/library/Zend/Text/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Uri/CONTRIBUTING.md b/library/Zend/Uri/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Validator/CONTRIBUTING.md b/library/Zend/Validator/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/Version/CONTRIBUTING.md b/library/Zend/Version/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/View/CONTRIBUTING.md b/library/Zend/View/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
diff --git a/library/Zend/View/Helper/HeadLink.php b/library/Zend/View/Helper/HeadLink.php
@@ -19,14 +19,14 @@
  * @see http://www.w3.org/TR/xhtml1/dtds.html
  *
  * Creates the following virtual methods:
- * @method HeadLink appendStylesheet($href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink prependStylesheet($href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink setStylesheet($href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink appendAlternate($href, $type, $title, $extras)
- * @method HeadLink offsetSetAlternate($index, $href, $type, $title, $extras)
- * @method HeadLink prependAlternate($href, $type, $title, $extras)
- * @method HeadLink setAlternate($href, $type, $title, $extras)
+ * @method HeadLink appendStylesheet($href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink offsetSetStylesheet($index, $href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink prependStylesheet($href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink setStylesheet($href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink appendAlternate($href, $type, $title, $extras = array())
+ * @method HeadLink offsetSetAlternate($index, $href, $type, $title, $extras = array())
+ * @method HeadLink prependAlternate($href, $type, $title, $extras = array())
+ * @method HeadLink setAlternate($href, $type, $title, $extras = array())
  */
 class HeadLink extends Placeholder\Container\AbstractStandalone
 {

diff --git a/library/Zend/XmlRpc/CONTRIBUTING.md b/library/Zend/XmlRpc/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# CONTRIBUTING

		Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.