FIX: fix tests, drop php55, simplify build matrix
A few SS4 changes have left this module broken; this is a fix-up Note that silverstripe/versioned is required on any test run because the assets test objects are coupled to it.
This commit is contained in:
parent
745a9f93ef
commit
29b6e04b0b
16
.travis.yml
16
.travis.yml
|
@ -4,14 +4,14 @@ sudo: false
|
|||
|
||||
language: php
|
||||
|
||||
php:
|
||||
- 5.5
|
||||
- 5.6
|
||||
- 7.0
|
||||
|
||||
env:
|
||||
- DB=MYSQL CORE_RELEASE=4
|
||||
- DB=PGSQL CORE_RELEASE=4
|
||||
matrix:
|
||||
include:
|
||||
- php: 5.6
|
||||
env: DB=MYSQL CORE_RELEASE=4
|
||||
- php: 7.0
|
||||
env: DB=PGSQL CORE_RELEASE=4
|
||||
- php: 7.1.2
|
||||
env: DB=MYSQL CORE_RELEASE=4
|
||||
|
||||
before_script:
|
||||
- composer self-update || true
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
"silverstripe/framework": "^4.0@dev"
|
||||
},
|
||||
"require-dev": {
|
||||
"hafriedlander/phockito": "dev-master"
|
||||
"hafriedlander/phockito": "dev-master",
|
||||
"silverstripe/versioned": "^1@dev"
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
namespace SilverStripe\EnvironmentCheck;
|
||||
|
||||
use Psr\Log\LogLevel;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use SilverStripe\Control\Director;
|
||||
use SilverStripe\Control\Email\Email;
|
||||
use SilverStripe\Control\HTTPResponse;
|
||||
|
@ -239,7 +240,7 @@ class EnvironmentChecker extends RequestHandler
|
|||
*/
|
||||
public function log($message, $level)
|
||||
{
|
||||
Injector::inst()->get('Logger')->log($level, $message);
|
||||
Injector::inst()->get(LoggerInterface::class)->log($level, $message);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -9,6 +9,7 @@ use SilverStripe\Dev\SapphireTest;
|
|||
use SilverStripe\Dev\TestOnly;
|
||||
use SilverStripe\EnvironmentCheck\EnvironmentCheck;
|
||||
use SilverStripe\EnvironmentCheck\EnvironmentCheckSuite;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* Class EnvironmentCheckerTest
|
||||
|
@ -26,13 +27,13 @@ class EnvironmentCheckerTest extends SapphireTest
|
|||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function setUpOnce()
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
parent::setUpOnce();
|
||||
parent::setUpBeforeClass();
|
||||
|
||||
Phockito::include_hamcrest();
|
||||
|
||||
$logger = Injector::inst()->get('Logger');
|
||||
$logger = Injector::inst()->get(LoggerInterface::class);
|
||||
if ($logger instanceof \Monolog\Logger) {
|
||||
// It logs to stderr by default - disable
|
||||
$logger->pushHandler(new \Monolog\Handler\NullHandler);
|
||||
|
@ -71,7 +72,7 @@ class EnvironmentCheckerTest extends SapphireTest
|
|||
);
|
||||
|
||||
$response = $checker->index();
|
||||
Phockito::verify($checker, 0)->log(anything(), anything());
|
||||
Phockito::verify($checker, 0)->log(\anything(), \anything());
|
||||
EnvironmentCheckSuite::reset();
|
||||
}
|
||||
|
||||
|
@ -88,8 +89,8 @@ class EnvironmentCheckerTest extends SapphireTest
|
|||
);
|
||||
|
||||
$response = $checker->index();
|
||||
Phockito::verify($checker, 1)->log(containsString('warning'), anything());
|
||||
Phockito::verify($checker, 0)->log(containsString('error'), anything());
|
||||
Phockito::verify($checker, 1)->log(containsString('warning'), \anything());
|
||||
Phockito::verify($checker, 0)->log(containsString('error'), \anything());
|
||||
EnvironmentCheckSuite::reset();
|
||||
}
|
||||
|
||||
|
@ -106,8 +107,8 @@ class EnvironmentCheckerTest extends SapphireTest
|
|||
);
|
||||
|
||||
$response = $checker->index();
|
||||
Phockito::verify($checker, 0)->log(containsString('warning'), anything());
|
||||
Phockito::verify($checker, 1)->log(containsString('error'), anything());
|
||||
Phockito::verify($checker, 0)->log(containsString('warning'), \anything());
|
||||
Phockito::verify($checker, 1)->log(containsString('error'), \anything());
|
||||
EnvironmentCheckSuite::reset();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue