tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX: ClassManifest errors if files contain duplicate class names (fixes #3210)

Browse Source
This commit is contained in:
Loz Calver 2014-06-16 13:05:03 +01:00
parent 34304cf6e4
commit 3d71a22a98
5 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/manifest/ClassManifest.php
View File

@ -391,14 +391,15 @@ class SS_ClassManifest {
$extends = substr($extends, 1);
}
if (array_key_exists($name, $this->classes)) {
$lowercaseName = strtolower($name);
if (array_key_exists($lowercaseName, $this->classes)) {
throw new Exception(sprintf(
'There are two files containing the "%s" class: "%s" and "%s"',
$name, $this->classes[$name], $pathname
$name, $this->classes[$lowercaseName], $pathname
));
}
$this->classes[strtolower($name)] = $pathname;
$this->classes[$lowercaseName] = $pathname;
if ($extends) {
$extends = strtolower($extends);

10
tests/core/manifest/ClassManifestTest.php
View File

@ -126,4 +126,14 @@ class ClassManifestTest extends SapphireTest {
public function testManifestExcludeFilesPrefixedWithUnderscore() {
$this->assertNotContains('ignore', array_keys($this->manifest->getClasses()));
}
/**
* Assert that ClassManifest throws an exception when it encounters two files
* which contain classes with the same name
* @expectedException Exception
*/
public function testManifestWarnsAboutDuplicateClasses() {
$dummy = new SS_ClassManifest(dirname(__FILE__) . '/fixtures/classmanifest_duplicates', false, true, false);
}
}

0
tests/core/manifest/fixtures/classmanifest_duplicates/module/_config.php Normal file
View File

5
tests/core/manifest/fixtures/classmanifest_duplicates/module/classes/TestClassA.php Normal file
View File

@ -0,0 +1,5 @@
<?php
/**
* @ignore
*/
class TESTClass { }

5
tests/core/manifest/fixtures/classmanifest_duplicates/module/classes/TestClassB.php Normal file
View File

@ -0,0 +1,5 @@
<?php
/**
* @ignore
*/
class testCLASS { }