Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Remaining join Alias Calls #2389

Merged
merged 1 commit into from
Aug 9, 2022
Merged

Replace Remaining join Alias Calls #2389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/Net/IDNA2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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') ? ':' : '://';
}
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions lib/Varien/Convert/Parser/Csv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/Varien/Convert/Parser/Xml/Excel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,6 @@ public function getRowXml(array $row)
}
$xmlData[] = '</Row>';

return join('', $xmlData);
return implode('', $xmlData);
}
}
2 changes: 1 addition & 1 deletion lib/Varien/Data/Collection/Db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/Varien/Db/Adapter/Mysqli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/Varien/Db/Adapter/Pdo/Mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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));
}
}

Expand Down
8 changes: 4 additions & 4 deletions lib/Varien/Debug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down Expand Up @@ -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';
Expand Down