Merge pull request #62 from drobinson/php-7-support

PHP 7 support

Author: drobinson

app/code/core/Mage/Core/Model/Layout.php

@@ -552,7 +552,7 @@ public function getOutput()
         $out = '';
         if (!empty($this->_output)) {
             foreach ($this->_output as $callback) {
-                $out .= $this->getBlock($callback[0])->$callback[1]();
+                $out .= $this->getBlock($callback[0])->{$callback[1]}();
             }
         }
 

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;
     }
 
     /**

app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php

@@ -247,7 +247,7 @@ public function filterAttributeCollection(Mage_Eav_Model_Resource_Entity_Attribu
                 $data = $this->_attributeOverrides[$attribute->getAttributeCode()];
 
                 if (isset($data['options_method']) && method_exists($this, $data['options_method'])) {
-                    $data['filter_options'] = $this->$data['options_method']();
+                    $data['filter_options'] = $this->{$data['options_method']}();
                 }
                 $attribute->addData($data);
             }

app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php

@@ -96,7 +96,7 @@ public function overrideAttribute(Mage_Catalog_Model_Resource_Eav_Attribute $att
             $data = $this->_attributeOverrides[$attribute->getAttributeCode()];
 
             if (isset($data['options_method']) && method_exists($this, $data['options_method'])) {
-                $data['filter_options'] = $this->$data['options_method']();
+                $data['filter_options'] = $this->{$data['options_method']}();
             }
             $attribute->addData($data);
 

app/code/core/Mage/ImportExport/Model/Import/Uploader.php

@@ -132,7 +132,7 @@ protected function _validateFile()
         //run validate callbacks
         foreach ($this->_validateCallbacks as $params) {
             if (is_object($params['object']) && method_exists($params['object'], $params['method'])) {
-                $params['object']->$params['method']($filePath);
+                $params['object']->{$params['method']}($filePath);
             }
         }
     }

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>

lib/Varien/File/Uploader.php

@@ -271,7 +271,7 @@ protected function _validateFile()
         //run validate callbacks
         foreach ($this->_validateCallbacks as $params) {
             if (is_object($params['object']) && method_exists($params['object'], $params['method'])) {
-                $params['object']->$params['method']($this->_file['tmp_name']);
+                $params['object']->{$params['method']}($this->_file['tmp_name']);
             }
         }
     }