Merge branch 'hotfix/2712'

Close #2712
zendframework · Oct 10, 2012 · a0f28fd · a0f28fd
2 parents b0d0cb6 + 448ee8f
commit a0f28fd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/library/Zend/Authentication/Adapter/DbTable.php b/library/Zend/Authentication/Adapter/DbTable.php
@@ -278,7 +278,7 @@ public function getResultRowObject($returnColumns = null, $omitColumns = null)
         if (null !== $returnColumns) {
 
             $availableColumns = array_keys($this->resultRow);
-            foreach ((array)$returnColumns as $returnColumn) {
+            foreach ((array) $returnColumns as $returnColumn) {
                 if (in_array($returnColumn, $availableColumns)) {
                     $returnObject->{$returnColumn} = $this->resultRow[$returnColumn];
                 }
@@ -287,7 +287,7 @@ public function getResultRowObject($returnColumns = null, $omitColumns = null)
 
         } elseif (null !== $omitColumns) {
 
-            $omitColumns = (array)$omitColumns;
+            $omitColumns = (array) $omitColumns;
             foreach ($this->resultRow as $resultColumn => $resultValue) {
                 if (!in_array($resultColumn, $omitColumns)) {
                     $returnObject->{$resultColumn} = $resultValue;

diff --git a/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php
@@ -230,7 +230,7 @@ public function __construct($rules, $argv = null, $getoptConfig = array())
             $argv = array_slice($_SERVER['argv'], 1);
         }
         if (isset($argv)) {
-            $this->addArguments((array)$argv);
+            $this->addArguments((array) $argv);
         }
     }
 

diff --git a/library/Zend/Http/Client/Adapter/Curl.php b/library/Zend/Http/Client/Adapter/Curl.php
@@ -399,7 +399,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
 
         // set additional curl options
         if (isset($this->config['curloptions'])) {
-            foreach ((array)$this->config['curloptions'] as $k => $v) {
+            foreach ((array) $this->config['curloptions'] as $k => $v) {
                 if (!in_array($k, $this->invalidOverwritableCurlOptions)) {
                     if (curl_setopt($this->curl, $k, $v) == false) {
                         throw new AdapterException\RuntimeException(sprintf("Unknown or erroreous cURL option '%s' set", $k));

diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php
@@ -536,7 +536,7 @@ public function fetch($items, $from, $to = null)
             $set = (int) $from . ':' . (int)$to;
         }
 
-        $items = (array)$items;
+        $items = (array) $items;
         $itemList = $this->escapeList($items);
 
         $tag = null;  // define $tag variable before first use

diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php
@@ -76,7 +76,7 @@ public function countMessages($flags = null)
         }
 
         $params = array();
-        foreach ((array)$flags as $flag) {
+        foreach ((array) $flags as $flag) {
             if (isset(self::$searchFlags[$flag])) {
                 $params[] = self::$searchFlags[$flag];
             } else {