[bug-OpenMage#857] Fix implode() calls to work with PHP 7.4

Reversed order is deprecated with PHP 7.4
edannenberg · Aug 17, 2020 · b159f6e · b159f6e
1 parent b07b87b
commit b159f6e
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 30 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php
@@ -80,7 +80,7 @@ protected function _actionsToHtml(array $actions = array())
             $attributesObject->setData($action['@']);
             $html[] = '<a ' . $attributesObject->serialize() . '>' . $action['#'] . '</a>';
         }
-        return  implode($html, '<span class="separator">|</span>');
+        return  implode('<span class="separator">|</span>', $html);
     }
 
     /**

diff --git a/app/code/core/Mage/Centinel/Model/Service.php b/app/code/core/Mage/Centinel/Model/Service.php
@@ -101,7 +101,7 @@ protected function _getConfig()
      */
     protected function _generateChecksum($paymentMethodCode, $cardType, $cardNumber, $cardExpMonth, $cardExpYear, $amount, $currencyCode)
     {
-        return md5(implode(func_get_args(), '_'));
+        return md5(implode('_', func_get_args()));
     }
 
     /**

diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -1517,7 +1517,7 @@ protected function _generateChecksum(Varien_Object $object, $checkSumDataKeys =
             $data[] = $dataKey;
             $data[] = $object->getData($dataKey);
         }
-        return md5(implode($data, '_'));
+        return md5(implode('_', $data));
     }
 
     /**

diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php
@@ -175,7 +175,7 @@ protected function _applyRulesFilter()
         }
 
         if (!empty($rulesFilterSqlParts)) {
-            $this->getSelect()->where(implode($rulesFilterSqlParts, ' OR '));
+            $this->getSelect()->where(implode(' OR ', $rulesFilterSqlParts));
         }
     }
 

diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php
@@ -103,7 +103,7 @@ public function renderTags($pattern, $glue = ' ')
                 $tag->getTaggedProductsUrl(), $this->escapeHtml($tag->getName()), $tag->getProducts()
             );
         }
-        return implode($out, $glue);
+        return implode($glue, $out);
     }
 
     /**

diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
@@ -794,7 +794,7 @@ protected function _parseXmlResponse($response)
         if ($this->_rawRequest->getAction() == 'GenerateLabel') {
             $result = new Varien_Object();
             if (!empty($this->_errors)) {
-                $result->setErrors(implode($this->_errors, '; '));
+                $result->setErrors(implode('; ', $this->_errors));
             } else {
                 if ($xml !== false) {
                     if ($r->getDestCountryId() == self::USA_COUNTRY_ID) {

diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php
@@ -97,7 +97,7 @@
                 $mapNew[] = $shippingMethod;
             }
         }
-        $mapNew = implode($mapNew, ',');
+        $mapNew = implode(',', $mapNew);
     } else {
         continue;
     }

diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php
@@ -93,7 +93,7 @@
                 $newValue[] = $oldToNewMethodCodesMap[$shippingMethod];
             }
         }
-        $newValue = implode($newValue, ',');
+        $newValue = implode(',', $newValue);
     } else {
         continue;
     }

diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php
@@ -54,7 +54,7 @@ public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
                 'label' => $showCount ? $this->__('Credit Card %s', $key + 1) : $this->__('Credit Card')
             ));
             foreach ($card as $label => $value) {
-                $creditCard->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
+                $creditCard->addCustomChild('item', implode('\n', $this->getValueAsArray($value, true)), array(
                     'label' => $label
                 ));
             }

diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
@@ -46,7 +46,7 @@ public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
 
         if ($specificInfo = $this->getSpecificInformation()) {
             foreach ($specificInfo as $label => $value) {
-                $orderItemXmlObj->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
+                $orderItemXmlObj->addCustomChild('item', implode('\n', $this->getValueAsArray($value, true)), array(
                     'label' => $label
                 ));
             }

diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
@@ -46,7 +46,7 @@ public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
 
         if ($specificInfo = $this->getSpecificInformation()) {
             foreach ($specificInfo as $label => $value) {
-                $orderItemXmlObj->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
+                $orderItemXmlObj->addCustomChild('item', implode('\n', $this->getValueAsArray($value, true)), array(
                     'label' => $label
                 ));
             }

diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
@@ -46,7 +46,7 @@ public function addPaymentInfoToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
 
         if ($specificInfo = $this->getSpecificInformation()) {
             foreach ($specificInfo as $label => $value) {
-                $orderItemXmlObj->addCustomChild('item', implode($this->getValueAsArray($value, true), '\n'), array(
+                $orderItemXmlObj->addCustomChild('item', implode('\n', $this->getValueAsArray($value, true)), array(
                     'label' => $label
                 ));
             }

diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
@@ -142,7 +142,7 @@ protected function _addPaymentMethodInfoToXmlObj(Mage_XmlConnect_Model_Simplexml
             if (!empty($specificInfo)) {
                 foreach ($specificInfo as $label => $value) {
                     if ($value) {
-                        $paymentNode->addCustomChild('item',implode($this->getValueAsArray($value, true), '\n'), array(
+                        $paymentNode->addCustomChild('item',implode('\n', $this->getValueAsArray($value, true)), array(
                             'label' => $label
                         ));
                     }

diff --git a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml
@@ -46,7 +46,7 @@
             <?php foreach ($card as $_label => $_value):?>
             <tr>
                 <td><?php echo $this->escapeHtml($_label)?>:</td>
-                <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
+                <td><?php echo nl2br(implode("\n", $this->getValueAsArray($_value, true)))?></td>
             </tr>
             <?php endforeach; ?>
             </tbody>

diff --git a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml
@@ -38,6 +38,6 @@
     <?php endif;?>
 
     <?php foreach ($card as $_label => $_value):?>
-        <?php echo $_label ?>: <?php echo implode($this->getValueAsArray($_value), ' ')?>{{pdf_row_separator}}
+        <?php echo $_label ?>: <?php echo implode(' ', $this->getValueAsArray($_value))?>{{pdf_row_separator}}
      <?php endforeach; ?>
 <?php endforeach; ?>
diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/default/default/template/payment/info/default.phtml
@@ -36,7 +36,7 @@
 <?php foreach ($_specificInfo as $_label => $_value):?>
     <tr>
         <td><?php echo $this->escapeHtml($_label)?>:</td>
-        <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
+        <td><?php echo nl2br(implode("\n", $this->getValueAsArray($_value, true)))?></td>
     </tr>
 <?php endforeach; ?>
 </table>

diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
@@ -33,8 +33,8 @@
 
 <?php if ($_specificInfo = $this->getSpecificInformation()):?>
 <?php foreach ($_specificInfo as $_label => $_value):?>
-<?php echo $_label ?>: <?php echo implode($this->getValueAsArray($_value), ' ')?>{{pdf_row_separator}}
+<?php echo $_label ?>: <?php echo implode(' ', $this->getValueAsArray($_value))?>{{pdf_row_separator}}
 <?php endforeach; ?>
 <?php endif;?>
 
-<?php echo implode($this->getChildPdfAsArray(), '{{pdf_row_separator}}') ?>
+<?php echo implode('{{pdf_row_separator}}', $this->getChildPdfAsArray()) ?>
diff --git a/app/design/frontend/base/default/template/paygate/info/cc.phtml b/app/design/frontend/base/default/template/paygate/info/cc.phtml
@@ -46,7 +46,7 @@
         <?php foreach ($card as $_label => $_value):?>
         <tr>
             <th><?php echo $this->escapeHtml($_label)?>:</th>
-            <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
+            <td><?php echo nl2br(implode("\n", $this->getValueAsArray($_value, true)))?></td>
         </tr>
         <?php endforeach; ?>
         </tbody>

diff --git a/app/design/frontend/base/default/template/payment/info/default.phtml b/app/design/frontend/base/default/template/payment/info/default.phtml
@@ -39,7 +39,7 @@
             <th><strong><?php echo $this->escapeHtml($_label)?>:</strong></th>
         </tr>
         <tr>
-            <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
+            <td><?php echo nl2br(implode("\n", $this->getValueAsArray($_value, true)))?></td>
         </tr>
     <?php endforeach; ?>
     </tbody>

diff --git a/app/design/frontend/rwd/default/template/payment/info/default.phtml b/app/design/frontend/rwd/default/template/payment/info/default.phtml
@@ -35,7 +35,7 @@
 <dl class="payment-info">
     <?php foreach ($_specificInfo as $_label => $_value):?>
         <dt><?php echo $this->escapeHtml($_label)?></dt>
-        <dd><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></dd>
+        <dd><?php echo nl2br(implode("\n", $this->getValueAsArray($_value, true)))?></dd>
     <?php endforeach; ?>
 </dl>
 <?php endif;?>

diff --git a/lib/Credis/Client.php b/lib/Credis/Client.php
@@ -169,7 +169,7 @@ class Credis_Client {
      * @var string
      */
     protected $host;
-    
+
     /**
      * Port on which the Redis server is running
      * @var integer
@@ -269,12 +269,12 @@ class Credis_Client {
      * @var int
      */
     protected $requests = 0;
-    
+
     /**
      * @var bool
      */
     protected $subscribed = false;
-    
+
 
     /**
      * Creates a Redisent connection to the Redis server on host {@link $host} and port {@link $port}.
@@ -305,15 +305,15 @@ public function __destruct()
             $this->close();
         }
     }
-    
+
     /**
      * @return bool
      */
     public function isSubscribed()
     {
     	return $this->subscribed;
     }
-    
+
     /**
      * Return the host of the Redis instance
      * @return string
@@ -600,7 +600,7 @@ public function select($index)
         $this->selectedDb = (int) $index;
         return $response;
     }
-    
+
     /**
      * @param string|array $pattern
      * @return array
@@ -1139,7 +1139,7 @@ protected function read_reply($name = '')
      */
     private static function _prepare_command($args)
     {
-        return sprintf('*%d%s%s%s', count($args), CRLF, implode(array_map(array('self', '_map'), $args), CRLF), CRLF);
+        return sprintf('*%d%s%s%s', count($args), CRLF, implode(CRLF, array_map(array('self', '_map'), $args)), CRLF);
     }
 
     private static function _map($arg)

diff --git a/lib/phpseclib/File/ASN1.php b/lib/phpseclib/File/ASN1.php
@@ -847,7 +847,7 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
                     if ($mapping['type'] == self::TYPE_SET) {
                         sort($value);
                     }
-                    $value = implode($value, '');
+                    $value = implode('', $value);
                     break;
                 }
 

diff --git a/lib/phpseclib/Math/BigInteger.php b/lib/phpseclib/Math/BigInteger.php
@@ -841,7 +841,7 @@ function __debugInfo()
             $opts[] = 'OpenSSL';
         }
         if (!empty($opts)) {
-            $engine.= ' (' . implode($opts, ', ') . ')';
+            $engine.= ' (' . implode(', ', $opts) . ')';
         }
         return array(
             'value' => '0x' . $this->toHex(true),