tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Clarify PHP7-incompatible call styles.

Browse Source 
These call signatures have changed their meaning in PHP7. The new
disambiguated form should work in all versions.
This commit is contained in:
Sam Minnee 2015-08-28 09:09:11 +12:00
parent 083799ec03
commit 8518fc1425
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/connect/DBSchemaManager.php
View File

@ -586,7 +586,7 @@ abstract class DBSchemaManager {
$spec['parts']['name'] = $field; $spec['parts']['name'] = $field;
$spec_orig['parts']['name'] = $field; $spec_orig['parts']['name'] = $field;
//Convert the $spec array into a database-specific string //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 // 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 // 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 // existing field is different to what we now want
if (is_array($spec_orig)) { 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 == '') { if ($newTable || $fieldValue == '') {