From 8518fc142556c3992d0a485c4b3e90e2095f4c0c Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Fri, 28 Aug 2015 09:09:11 +1200 Subject: [PATCH] FIX: Clarify PHP7-incompatible call styles. These call signatures have changed their meaning in PHP7. The new disambiguated form should work in all versions. --- model/connect/DBSchemaManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/connect/DBSchemaManager.php b/model/connect/DBSchemaManager.php index 372b3edf8..c1c381414 100644 --- a/model/connect/DBSchemaManager.php +++ b/model/connect/DBSchemaManager.php @@ -586,7 +586,7 @@ abstract class DBSchemaManager { $spec['parts']['name'] = $field; $spec_orig['parts']['name'] = $field; //Convert the $spec array into a database-specific string - $spec = $this->$spec['type']($spec['parts'], true); + $spec = $this->{$spec['type']}($spec['parts'], true); } // Collations didn't come in until MySQL 4.1. Anything earlier will throw a syntax error if you try and use @@ -623,7 +623,7 @@ abstract class DBSchemaManager { // Get the version of the field as we would create it. This is used for comparison purposes to see if the // existing field is different to what we now want if (is_array($spec_orig)) { - $spec_orig = $this->$spec_orig['type']($spec_orig['parts']); + $spec_orig = $this->{$spec_orig['type']}($spec_orig['parts']); } if ($newTable || $fieldValue == '') {