Merge branch '2.4' into 2

This commit is contained in:
Steve Boyd 2023-02-02 16:20:55 +13:00
commit 5c8070044c

View File

@ -529,7 +529,10 @@ class TestSessionEnvironment
public function getState() public function getState()
{ {
$path = Director::getAbsFile($this->getFilePath()); $path = Director::getAbsFile($this->getFilePath());
return (file_exists($path ?? '')) ? json_decode(file_get_contents($path)) : new stdClass; if (file_exists($path ?? '')) {
return json_decode(file_get_contents($path)) ?: new stdClass;
}
return new stdClass;
} }
/** /**