minor #14588 [Debug] Fixed ClassNotFoundFatalErrorHandlerTest (xelaris)

fabpot · fabpot · commit 45cd637cae0a · 2015-05-08T16:42:46.000+02:00
This PR was merged into the 2.6 branch. Discussion ---------- [Debug] Fixed ClassNotFoundFatalErrorHandlerTest | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14573 | License | MIT | Doc PR | Since `testCannotRedeclareClass` is skipped on case-sensitive filesystems, it won't have any effect on the travis build, but fixes the issue described in #14573 for e.g. OS X. Commits ------- f7def8c [Debug] Fixed ClassNotFoundFatalErrorHandlerTest
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -181,11 +181,11 @@ function ($className) { /* do nothing here */ },
 
     public function testCannotRedeclareClass()
     {
-        if (!file_exists(__DIR__.'/../FIXTURES/REQUIREDTWICE.PHP')) {
+        if (!file_exists(__DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP')) {
             $this->markTestSkipped('Can only be run on case insensitive filesystems');
         }
 
-        require_once __DIR__.'/../FIXTURES/REQUIREDTWICE.PHP';
+        require_once __DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP';
 
         $error = array(
             'type' => 1,
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/RequiredTwice.php b/src/Symfony/Component/Debug/Tests/Fixtures/RequiredTwice.php
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures2/RequiredTwice.php b/src/Symfony/Component/Debug/Tests/Fixtures2/RequiredTwice.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures2;
+
+class RequiredTwice
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,11 @@ function ($className) { /* do nothing here */ },`
`181`	`181`
`182`	`182`	`public function testCannotRedeclareClass()`
`183`	`183`	`{`
`184`		`- if (!file_exists(__DIR__.'/../FIXTURES/REQUIREDTWICE.PHP')) {`
	`184`	`+ if (!file_exists(__DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP')) {`
`185`	`185`	`$this->markTestSkipped('Can only be run on case insensitive filesystems');`
`186`	`186`	`}`
`187`	`187`
`188`		`- require_once __DIR__.'/../FIXTURES/REQUIREDTWICE.PHP';`
	`188`	`+ require_once __DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP';`
`189`	`189`
`190`	`190`	`$error = array(`
`191`	`191`	`'type' => 1,`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace Symfony\Component\Debug\Tests\Fixtures2;
++
 +class RequiredTwice
 +{
 +}