Merge pull request #96 from puggan/bugfix/travis

sabas · web-flow · commit 794bce9f51eb · 2019-05-13T11:21:57.000+02:00
avoid chdir(), use __DIR__ instead
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -6,8 +6,7 @@
 }
 
 error_reporting(E_ALL | E_STRICT);
-chdir(__DIR__);
 
-require('classBootstrap.php');
+require(__DIR__ . '/classBootstrap.php');
 
 Bootstrap::init();
diff --git a/tests/classBootstrap.php b/tests/classBootstrap.php
@@ -16,8 +16,8 @@ protected static function initAutoloader()
         spl_autoload_register(
             function ($className) {
                 $path = str_replace('\\', '/', $className);
-                if (file_exists('../src/' . $path . '.php')) {
-                    include_once '../src/' . $path . '.php';
+                if (file_exists(__DIR__ . '/../src/' . $path . '.php')) {
+                    include_once __DIR__ . '/../src/' . $path . '.php';
                 }
             }
         );

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`error_reporting(E_ALL \| E_STRICT);`
`9`		`-chdir(__DIR__);`
`10`	`9`
`11`		`-require('classBootstrap.php');`
	`10`	`+require(__DIR__ . '/classBootstrap.php');`
`12`	`11`
`13`	`12`	`Bootstrap::init();`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ protected static function initAutoloader()`
`16`	`16`	`spl_autoload_register(`
`17`	`17`	`function ($className) {`
`18`	`18`	`$path = str_replace('\\', '/', $className);`
`19`		`- if (file_exists('../src/' . $path . '.php')) {`
`20`		`- include_once '../src/' . $path . '.php';`
	`19`	`+ if (file_exists(__DIR__ . '/../src/' . $path . '.php')) {`
	`20`	`+ include_once __DIR__ . '/../src/' . $path . '.php';`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`);`