adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from Tounu/patch-3

Browse source 
Allow sub-directories for Fixture folder
This commit is contained in:
Tounu 2014-03-11 20:13:15 +01:00
commit 9078f350bd
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
View file

@ -114,17 +114,28 @@ class CakeFixtureManager {
$fixture = substr($fixture, strlen('core.'));
$fixturePaths[] = CAKE . 'Test' . DS . 'Fixture';
} elseif (strpos($fixture, 'app.') === 0) {
$fixture = substr($fixture, strlen('app.'));
$fixturePrefixLess = substr($fixture, strlen('app.'));
$pathTokenArray = explode('/', $fixturePrefixLess);
$fixture = array_pop($pathTokenArray);
$additionalPath = '';
foreach ($pathTokenArray as $pathToken) {
$additionalPath .= DS . $pathToken;
}
$fixturePaths = array(
TESTS . 'Fixture'
TESTS . 'Fixture' . $additionalPath
);
} elseif (strpos($fixture, 'plugin.') === 0) {
$parts = explode('.', $fixture, 3);
$pluginName = $parts[1];
$fixture = $parts[2];
$explodedFixture = explode('.', $fixturePrefixLess,3);
$pluginName = $explodedFixture[1];
$pathTokenArray = explode('/', $explodedFixture[2]);
$fixture = array_pop($pathTokenArray);
$additionalPath = '';
foreach ($pathTokenArray as $pathToken) {
$additionalPath .= DS . $pathToken;
}
$fixturePaths = array(
CakePlugin::path(Inflector::camelize($pluginName)) . 'Test' . DS . 'Fixture',
TESTS . 'Fixture'
CakePlugin::path(Inflector::camelize($pluginName)) . 'Test' . DS . 'Fixture' . $additionalPath,
TESTS . 'Fixture' . $additionalPath
);
} else {
$fixturePaths = array(