Merge pull request #203 from Toflar/patch-2

More PHP7 compatibility

Author: davidmaack

system/modules/multicolumnwizard/MultiColumnWizard.php

@@ -265,7 +265,7 @@ protected function validator($varInput)
 
                         try
                         {
-                            $varValue = $this->{$callback[0]}->$callback[1]($varValue, $this);
+                            $varValue = $this->{$callback[0]}->{$callback[1]}($varValue, $this);
                         }
                         catch (Exception $e)
                         {
@@ -382,7 +382,7 @@ public function generate()
                     foreach ($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->strField]['save_callback'] AS $callback)
                     {
                         $this->import($callback[0]);
-                        $this->{$callback[0]}->$callback[1](serialize($this->varValue), $dc);
+                        $this->{$callback[0]}->{$callback[1]}(serialize($this->varValue), $dc);
                     }
                 }
                 else
@@ -618,7 +618,7 @@ public function generate()
                         foreach ($arrField['wizard'] as $callback)
                         {
                             $this->import($callback[0]);
-                            $wizard .= $this->{$callback[0]}->$callback[1]($dc, $objWidget);
+                            $wizard .= $this->{$callback[0]}->{$callback[1]}($dc, $objWidget);
                         }
 
                         $objWidget->wizard = $wizard;
@@ -891,7 +891,7 @@ protected function initializeWidget(&$arrField, $intRow, $strKey, $varValue)
                 $this->import($arrField['input_field_callback'][0]);
             }
 
-            return $this->{$arrField['input_field_callback'][0]}->$arrField['input_field_callback'][1]($this, $xlabel);
+            return $this->{$arrField['input_field_callback'][0]}->{$arrField['input_field_callback'][1]}($this, $xlabel);
         }
 
         $strClass = $GLOBALS[(TL_MODE == 'BE' ? 'BE_FFL' : 'TL_FFL')][$arrField['inputType']];
@@ -943,7 +943,7 @@ protected function initializeWidget(&$arrField, $intRow, $strKey, $varValue)
             foreach ($arrField['load_callback'] as $callback)
             {
                 $this->import($callback[0]);
-                $varValue = $this->{$callback[0]}->$callback[1]($varValue, $this);
+                $varValue = $this->{$callback[0]}->{$callback[1]}($varValue, $this);
             }
         }
 
@@ -995,7 +995,7 @@ public function handleDcGeneral($arrData, $strName)
             if (is_array($arrData['options_callback']))
             {
                 $arrCallback = $arrData['options_callback'];
-                $arrData['options'] = static::importStatic($arrCallback[0])->$arrCallback[1]($this);
+                $arrData['options'] = static::importStatic($arrCallback[0])->{$arrCallback[1]}($this);
                 unset($arrData['options_callback']);
             }
             elseif (is_callable($arrData['options_callback']))