Replaced join() calls with implode() (#2389)

Author: Sdfendor

lib/Net/IDNA2.php

@@ -2439,7 +2439,7 @@ public function decode($input, $one_time_encoding = false)
                 $conv = $this->_decode($v);
                 if ($conv) $arr[$k] = $conv;
             }
-            $return = $email_pref . '@' . join('.', $arr);
+            $return = $email_pref . '@' . implode('.', $arr);
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
@@ -2453,7 +2453,7 @@ public function decode($input, $one_time_encoding = false)
                     $conv = $this->_decode($v);
                     if ($conv) $arr[$k] = $conv;
                 }
-                $parsed['host'] = join('.', $arr);
+                $parsed['host'] = implode('.', $arr);
                 if (isset($parsed['scheme'])) {
                     $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
                 }
@@ -2464,7 +2464,7 @@ public function decode($input, $one_time_encoding = false)
                     $conv = $this->_decode($v);
                     if ($conv) $arr[$k] = $conv;
                 }
-                $return = join('.', $arr);
+                $return = implode('.', $arr);
             }
         } else { // Otherwise we consider it being a pure domain name string
             $return = $this->_decode($input);

lib/Varien/Convert/Parser/Csv.php

@@ -139,7 +139,7 @@ public function unparse()
             foreach ($fields as $f) {
                 $line[] = $fEnc.str_replace(array('"', '\\'), array($fEsc.'"', $fEsc.'\\'), $f).$fEnc;
             }
-            $lines[] = join($fDel, $line);
+            $lines[] = implode($fDel, $line);
         }
         foreach ($data as $i=>$row) {
             $line = array();
@@ -154,9 +154,9 @@ public function unparse()
 
                 $line[] = $fEnc.$v.$fEnc;
             }
-            $lines[] = join($fDel, $line);
+            $lines[] = implode($fDel, $line);
         }
-        $result = join($lDel, $lines);
+        $result = implode($lDel, $lines);
         $this->setData($result);
 
         return $this;

lib/Varien/Convert/Parser/Xml/Excel.php

@@ -220,6 +220,6 @@ public function getRowXml(array $row)
         }
         $xmlData[] = '</Row>';
 
-        return join('', $xmlData);
+        return implode('', $xmlData);
     }
 }

lib/Varien/Data/Collection/Db.php

@@ -394,7 +394,7 @@ public function addFieldToFilter($field, $condition = null)
                 );
             }
 
-            $resultCondition = '(' . join(') ' . Zend_Db_Select::SQL_OR . ' (', $conditions) . ')';
+            $resultCondition = '(' . implode(') ' . Zend_Db_Select::SQL_OR . ' (', $conditions) . ')';
         }
 
         $this->_select->where($resultCondition);

lib/Varien/Db/Adapter/Mysqli.php

@@ -262,7 +262,7 @@ public function dropColumn($tableName, $columnName)
             }
         }
 
-        return $this->raw_query('ALTER TABLE `'.$tableName.'` ' . join(', ', $alterDrop));
+        return $this->raw_query('ALTER TABLE `'.$tableName.'` ' . implode(', ', $alterDrop));
     }
 
     /**

lib/Varien/Db/Adapter/Pdo/Mysql.php

@@ -3535,7 +3535,7 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields
         $query = sprintf('%s INTO %s', $query, $this->quoteIdentifier($table));
         if ($fields) {
             $columns = array_map(array($this, 'quoteIdentifier'), $fields);
-            $query = sprintf('%s (%s)', $query, join(', ', $columns));
+            $query = sprintf('%s (%s)', $query, implode(', ', $columns));
         }
 
         $query = sprintf('%s %s', $query, $select->assemble());
@@ -3572,7 +3572,7 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields
                 }
             }
             if ($update) {
-                $query = sprintf('%s ON DUPLICATE KEY UPDATE %s', $query, join(', ', $update));
+                $query = sprintf('%s ON DUPLICATE KEY UPDATE %s', $query, implode(', ', $update));
             }
         }
 

lib/Varien/Debug.php

@@ -111,10 +111,10 @@ public static function trace(array $trace, $return = false, $html = true, $withA
                     $className,
                     isset($data['type']) ? $data['type'] : '->',
                     $data['function'],
-                    join(', ', $args)
+                    implode(', ', $args)
                 );
             } else if (isset($data['function'])) {
-                $methodName = sprintf('%s(%s)', $data['function'], join(', ', $args));
+                $methodName = sprintf('%s(%s)', $data['function'], implode(', ', $args));
             }
 
             if (isset($data['file'])) {
@@ -175,9 +175,9 @@ protected static function _formatCalledArgument($arg)
                 foreach ($args as $k => $v) {
                     $arr[] = self::_formatCalledArgument($k) . ' => ' . $v;
                 }
-                $out .= 'array(' . join(', ', $arr) . ')';
+                $out .= 'array(' . implode(', ', $arr) . ')';
             } else {
-                $out .= 'array(' . join(', ', $args) . ')';
+                $out .= 'array(' . implode(', ', $args) . ')';
             }
         } else if (is_null($arg)) {
             $out .= 'NULL';