From ac1c1dabc8e2dd47bac5bc6b372cefec5466f14f Mon Sep 17 00:00:00 2001 From: sinan-evanshunt Date: Thu, 6 Sep 2018 09:43:05 -0600 Subject: [PATCH 1/3] Update WidgetAreaEditor.php --- code/form/WidgetAreaEditor.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/form/WidgetAreaEditor.php b/code/form/WidgetAreaEditor.php index 8c7363b..1bb9cdf 100644 --- a/code/form/WidgetAreaEditor.php +++ b/code/form/WidgetAreaEditor.php @@ -50,15 +50,17 @@ class WidgetAreaEditor extends FormField unset($classes[0]); } - foreach ($classes as $class) { - $available = Config::inst()->get($class, 'only_available_in'); - - if (!empty($available) && is_array($available)) { - if (in_array($this->Name, $available)) { + if( isset($classes) ){ + foreach ($classes as $class) { + $available = Config::inst()->get($class, 'only_available_in'); + + if (!empty($available) && is_array($available)) { + if (in_array($this->Name, $available)) { + $widgets->push(singleton($class)); + } + } else { $widgets->push(singleton($class)); } - } else { - $widgets->push(singleton($class)); } } } From 4c79f68b023c34a969e965e831606ea17743730f Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 10 Sep 2018 17:00:15 +0200 Subject: [PATCH 2/3] FIX Cast subclassesFor as array and remove isset nesting --- code/form/WidgetAreaEditor.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/code/form/WidgetAreaEditor.php b/code/form/WidgetAreaEditor.php index 1bb9cdf..d5139f7 100644 --- a/code/form/WidgetAreaEditor.php +++ b/code/form/WidgetAreaEditor.php @@ -42,29 +42,27 @@ class WidgetAreaEditor extends FormField $widgets= new ArrayList(); foreach ($this->widgetClasses as $widgetClass) { - $classes = ClassInfo::subclassesFor($widgetClass); + $classes = ClassInfo::subclassesFor($widgetClass) ?: array(); if (isset($classes['Widget'])) { unset($classes['Widget']); } elseif (isset($classes[0]) && $classes[0] == 'Widget') { unset($classes[0]); } - - if( isset($classes) ){ - foreach ($classes as $class) { - $available = Config::inst()->get($class, 'only_available_in'); - if (!empty($available) && is_array($available)) { - if (in_array($this->Name, $available)) { - $widgets->push(singleton($class)); - } - } else { + foreach ($classes as $class) { + $available = Config::inst()->get($class, 'only_available_in'); + + if (!empty($available) && is_array($available)) { + if (in_array($this->Name, $available)) { $widgets->push(singleton($class)); } + } else { + $widgets->push(singleton($class)); } } } - + return $widgets; } From b1c73661967175940e2fadf78577aff7c6f8c24f Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 23 Jul 2019 15:57:11 +0200 Subject: [PATCH 3/3] Add PHP 7.3 to Travis builds --- .travis.yml | 23 ++++++++++------------- composer.json | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a61c2a..9c4af29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,21 @@ # See https://github.com/silverstripe/silverstripe-travis-support for setup details -sudo: false +dist: trusty language: php -php: - - 5.4 - - 5.5 - -env: - - DB=MYSQL CORE_RELEASE=3.5 - matrix: include: - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3 - - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.4 - - php: 7.1 + - php: '5.6' env: DB=MYSQL CORE_RELEASE=3.6 + - php: '7.0' + env: DB=PGSQL CORE_RELEASE=3.7 + - php: '7.1' + env: DB=MYSQL CORE_RELEASE=3.7 + - php: '7.2' + env: DB=MYSQL CORE_RELEASE=3.7 + - php: '7.3' + env: DB=MYSQL CORE_RELEASE=3.7 before_script: - composer self-update || true diff --git a/composer.json b/composer.json index 0cc07a6..9dfc920 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "silverstripe/cms": "^3.2" }, "require-dev": { - "phpunit/PHPUnit": "~3.7@stable" + "phpunit/phpunit": "^5.7" }, "extra": { "branch-alias": {