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

MINOR: Remove support for PHP <5.3.2

Browse Source
This commit is contained in:
Andrew O'Neil 2012-04-18 11:01:03 +12:00
parent 14c0796617
commit fb3b03f38b
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/DataFormatter.php
View File

@ -264,7 +264,6 @@ abstract class DataFormatter extends Object {
// add default required fields // add default required fields
$dbFields = array_merge($dbFields, array('ID'=>'Int')); $dbFields = array_merge($dbFields, array('ID'=>'Int'));
// @todo Requires PHP 5.1+
if(is_array($this->removeFields)) { if(is_array($this->removeFields)) {
$dbFields = array_diff_key($dbFields, array_combine($this->removeFields,$this->removeFields)); $dbFields = array_diff_key($dbFields, array_combine($this->removeFields,$this->removeFields));
} }

2
i18n/i18nTextCollector.php
View File

@ -18,8 +18,6 @@
* Usage on CLI: sake dev/tasks/i18nTextCollectorTask * Usage on CLI: sake dev/tasks/i18nTextCollectorTask
* Usage on CLI (module-specific): sake dev/tasks/i18nTextCollectorTask module=mymodule * Usage on CLI (module-specific): sake dev/tasks/i18nTextCollectorTask module=mymodule
* *
* Requires PHP 5.1+ due to class_implements() limitations
*
* @author Bernat Foj Capell <bernat@silverstripe.com> * @author Bernat Foj Capell <bernat@silverstripe.com>
* @author Ingo Schommer <FIRSTNAME@silverstripe.com> * @author Ingo Schommer <FIRSTNAME@silverstripe.com>
* @package framework * @package framework

5
model/DataObject.php
View File

@ -2158,10 +2158,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return bool * @return bool
*/ */
public static function has_own_table($dataClass) { public static function has_own_table($dataClass) {
if(!is_subclass_of($dataClass,'DataObject')) return false;
// The condition below has the same effect as !is_subclass_of($dataClass,'DataObject'),
// which causes PHP < 5.3 to segfault in rare circumstances, see PHP bug #46753
if($dataClass == 'DataObject' || !in_array('DataObject', ClassInfo::ancestry($dataClass))) return false;
if(!isset(DataObject::$cache_has_own_table[$dataClass])) { if(!isset(DataObject::$cache_has_own_table[$dataClass])) {
if(get_parent_class($dataClass) == 'DataObject') { if(get_parent_class($dataClass) == 'DataObject') {