diff --git a/app/code/Magento/Fedex/Setup/InstallData.php b/app/code/Magento/Fedex/Setup/InstallData.php index ce35f99800209d55db02447bcdec8f61c0a19bbe..55363c9acc31db62d062092e70aff7541e946ef1 100755 --- a/app/code/Magento/Fedex/Setup/InstallData.php +++ b/app/code/Magento/Fedex/Setup/InstallData.php @@ -96,7 +96,7 @@ class InstallData implements InstallDataInterface $mapNew[] = $shippingMethod; } } - $mapNew = implode($mapNew, ','); + $mapNew = implode(',', $mapNew); } else { continue; } diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml index 48a8c0a91dbf4a4af37cb8d5f3586969e0782aa4..f2db06784d9fae66316ec9ca74e3619286202f03 100644 --- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml +++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml @@ -19,7 +19,7 @@ <?php foreach ($_specificInfo as $_label => $_value):?> <tr> <th><?php echo $block->escapeHtml($_label)?>:</th> - <td><?php echo nl2br(implode($block->getValueAsArray($_value, true), "\n"))?></td> + <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td> </tr> <?php endforeach; ?> </table> diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml index 89d131de11cf184b4bde0e52d914791872e289db..db51c499e2835fde214a1b75db2fbda6f9219104 100644 --- a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml +++ b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml @@ -16,8 +16,8 @@ <?php if ($_specificInfo = $block->getSpecificInformation()):?> <?php foreach ($_specificInfo as $_label => $_value):?> -<?php echo $_label ?>: <?php echo implode($block->getValueAsArray($_value), ' ')?>{{pdf_row_separator}} +<?php echo $_label ?>: <?php echo implode(' ', $block->getValueAsArray($_value))?>{{pdf_row_separator}} <?php endforeach; ?> <?php endif;?> -<?php echo implode($block->getChildPdfAsArray(), '{{pdf_row_separator}}') ?> +<?php echo implode('{{pdf_row_separator}}', $block->getChildPdfAsArray()) ?> diff --git a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml index cbd9eb6f607536e895b08c75ffc7a31e6773d0f5..ae2a9e0b712d7e1354961986d9bfa76efcb870e7 100644 --- a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml +++ b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml @@ -21,7 +21,7 @@ <?php foreach ($_specificInfo as $_label => $_value):?> <tr> <th scope="row"><?php echo $block->escapeHtml($_label)?></th> - <td><?php echo nl2br(implode($block->getValueAsArray($_value, true), "\n"))?></td> + <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td> </tr> <?php endforeach; ?> </table> diff --git a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php index 2690ecac41192aaf8c3e9e7b5c218458cf22d5e2..0e664f928847f931615f4b0361d97755c77878c1 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php @@ -93,7 +93,7 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract $attributesObject->setData($action['@']); $html[] = '<a ' . $attributesObject->serialize() . '>' . $action['#'] . '</a>'; } - return implode($html, ''); + return implode('', $html); } /** diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php index 4c8dc6f056004a7f75267bb76d73bbbbb9fafe71..e1d3e1af29c0d95d286bc6413e4a76549930c51e 100644 --- a/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php +++ b/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php @@ -170,7 +170,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac } if (!empty($rulesFilterSqlParts)) { - $this->getSelect()->where(implode($rulesFilterSqlParts, ' OR ')); + $this->getSelect()->where(implode(' OR ', $rulesFilterSqlParts)); } return $this; } diff --git a/app/code/Magento/Tax/Setup/InstallData.php b/app/code/Magento/Tax/Setup/InstallData.php index 03931a63e3b850c4bb7710fb428b8fb5283099ba..4e99ca1631f824f1d0306cec9c0ae200d95fc894 100644 --- a/app/code/Magento/Tax/Setup/InstallData.php +++ b/app/code/Magento/Tax/Setup/InstallData.php @@ -69,7 +69,7 @@ class InstallData implements InstallDataInterface 'visible_in_advanced_search' => true, 'used_in_product_listing' => true, 'unique' => false, - 'apply_to' => implode($taxSetup->getTaxableItems(), ',') + 'apply_to' => implode(',', $taxSetup->getTaxableItems()) ] ); diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php index a467c0ad9af43e6223eb416643bdebafe9b00031..557e1c09882feee7e9194e88305861f2676b9e29 100755 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php @@ -52,7 +52,7 @@ class AssertChildProductsInGrid extends AbstractConstraint } } - \PHPUnit_Framework_Assert::assertEmpty($errors, implode($errors, ' ')); + \PHPUnit_Framework_Assert::assertEmpty($errors, implode(' ', $errors)); } /**