[impr-OpenMage#62] Add PHP 7 support

Credit to Inchoo (https://github.com/Inchoo/Inchoo_PHP7) for the work. This is just a core implementation of the PHP 7 support module.
edannenberg · Jul 17, 2018 · 9cc6dc6 · 9cc6dc6
1 parent 602a7bc
commit 9cc6dc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php
@@ -215,7 +215,7 @@ public function read($sessId)
 
         $data = $this->_read->fetchOne($select, $bind);
 
-        return $data;
+        return (string)$data;
     }
 
     /**

diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
@@ -1218,7 +1218,7 @@
                     </subtotal>
                     <shipping>
                         <class>sales/quote_address_total_shipping</class>
-                        <after>subtotal,freeshipping,tax_subtotal</after>
+                        <after>subtotal,freeshipping,tax_subtotal,msrp</after>
                         <before>grand_total</before>
                     </shipping>
                     <grand_total>
@@ -1227,6 +1227,7 @@
                     </grand_total>
                     <msrp>
                         <class>sales/quote_address_total_msrp</class>
+                        <before>grand_total</before>
                     </msrp>
                 </totals>
                 <nominal_totals>
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,7 +215,7 @@ public function read($sessId) @@
             $data = $this->_read->fetchOne($select, $bind);
-            return $data;
+            return (string)$data;
         }
         /**
@@ Expand Down @@