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

Address feedback

Browse Source
This commit is contained in:
Daniel Hensby 2018-06-19 18:31:59 +01:00
parent 1d06dcdd28
commit cbdf547c1b
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Dev/State/FixtureTestState.php
View File

@ -166,7 +166,7 @@ class FixtureTestState implements TestState
$this->loadFixture($fixtureFile, $test);
}
// Flag as loaded
$this->loaded[get_class($test)] = true;
$this->loaded[strtolower(get_class($test))] = true;
}
/**
@ -265,7 +265,8 @@ class FixtureTestState implements TestState
*/
protected function resetFixtureFactory($class)
{
$this->fixtureFactories[strtolower($class)] = Injector::inst()->create(FixtureFactory::class);
$class = strtolower($class);
$this->fixtureFactories[$class] = Injector::inst()->create(FixtureFactory::class);
$this->loaded[$class] = false;
}
@ -277,6 +278,6 @@ class FixtureTestState implements TestState
*/
protected function getIsLoaded($class)
{
return !empty($this->loaded[$class]);
return !empty($this->loaded[strtolower($class)]);
}
}

2
src/ORM/Connect/Database.php
View File

@ -676,7 +676,7 @@ abstract class Database
public function transactionDepth()
{
// Placeholder error for transactional DBs that don't expose depth
if ($this->supportsTransactions()) {
if (!$this->supportsTransactions()) {
user_error(get_class($this) . " does not support transactionDepth", E_USER_WARNING);
}
return 0;

5
src/ORM/Connect/MySQLDatabase.php
View File

@ -360,10 +360,7 @@ class MySQLDatabase extends Database
return false;
}
--$this->transactionNesting;
if ($this->transactionNesting <= 0) {
$this->transactionNesting = 0;
$this->query('COMMIT AND ' . ($chain ? '' : 'NO ') . 'CHAIN');
}
$this->query('COMMIT AND ' . ($chain ? '' : 'NO ') . 'CHAIN');
return true;
}