tonyair
/
silverstripe-environmentcheck
mirror of https://github.com/silverstripe/silverstripe-environmentcheck
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45 from andrewandante/FIX/remove_object 

update to not include Object
This commit is contained in:
Daniel Hensby 2017-05-26 17:19:54 +01:00 committed by GitHub
parent 5897559cd2 1e727bf8c6
commit 04b7cb2ff1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/EnvironmentCheckSuite.php
View File

@ -4,9 +4,10 @@ namespace SilverStripe\EnvironmentCheck;
use Exception; use Exception;
use InvalidArgumentException; use InvalidArgumentException;
use SilverStripe\Core\Object; use SilverStripe\Core\Injector\Injector;
use SilverStripe\EnvironmentCheck\EnvironmentCheck; use SilverStripe\EnvironmentCheck\EnvironmentCheck;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;
use SilverStripe\View\ViewableData; use SilverStripe\View\ViewableData;
@ -31,7 +32,7 @@ use SilverStripe\View\ViewableData;
* *
* @package environmentcheck * @package environmentcheck
*/ */
class EnvironmentCheckSuite extends Object class EnvironmentCheckSuite extends DataObject
{ {
/** /**
* Name of this suite. * Name of this suite.
@ -134,7 +135,7 @@ class EnvironmentCheckSuite extends Object
foreach ($this->checks as $check) { foreach ($this->checks as $check) {
list($checkClass, $checkTitle) = $check; list($checkClass, $checkTitle) = $check;
if (is_string($checkClass)) { if (is_string($checkClass)) {
$checkInst = Object::create_from_string($checkClass); $checkInst = Injector::inst()->create($checkClass);
if ($checkInst instanceof EnvironmentCheck) { if ($checkInst instanceof EnvironmentCheck) {
$output[] = [$checkInst, $checkTitle]; $output[] = [$checkInst, $checkTitle];
} else { } else {