Skip to content

Commit cb1284e

Browse files
author
Sebastian Michaelsen
committed
Improve automatic detection of project root directory
Remove unused import statements in the Dispatcher
1 parent 511d279 commit cb1284e

File tree

6 files changed

+4
-8
lines changed

6 files changed

+4
-8
lines changed

classes/Configuration/DefaultConfiguration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class DefaultConfiguration {
1111
* @throws ApplicationPartMissingException
1212
*/
1313
public static function initialize($application) {
14-
$project_root = isset($_ENV['AppZap\PHPFramework\ProjectRoot']) ? $_ENV['AppZap\PHPFramework\ProjectRoot'] : dirname($_SERVER['DOCUMENT_ROOT'] . $_SERVER['PHP_SELF']);
14+
$project_root = isset($_ENV['AppZap\PHPFramework\ProjectRoot']) ? $_ENV['AppZap\PHPFramework\ProjectRoot'] : getcwd();
1515
$application_directory_path = $project_root . '/' . $application;
1616
$application_directory = realpath($application_directory_path);
1717
if (!is_dir($application_directory)) {

classes/Mvc/Dispatcher.php

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace AppZap\PHPFramework\Mvc;
33

44
use AppZap\PHPFramework\Cache\CacheFactory;
5-
use AppZap\PHPFramework\Configuration\Configuration;
6-
use AppZap\PHPFramework\Cache\Cache;
75
use AppZap\PHPFramework\Mvc\View\TwigView;
86
use AppZap\PHPFramework\SignalSlot\Dispatcher as SignalSlotDispatcher;
97

index.php.example

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
require_once 'vendor/autoload.php';
33

4-
# $_ENV['AppZap\PHPFramework\ProjectRoot'] = dirname(__FILE__);
5-
64
$application = 'myapp';
75
\AppZap\PHPFramework\Bootstrap::bootstrap($application);

tests/Functional/AppTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class AppTest extends \PHPUnit_Framework_TestCase {
77

88
public function setUp() {
9-
$_ENV['AppZap\PHPFramework\ProjectRoot'] = dirname(__FILE__);
9+
$_ENV['AppZap\PHPFramework\ProjectRoot'] = __DIR__;
1010
}
1111

1212
/**

tests/Unit/Configuration/DefaultConfigurationTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class DefaultConfigurationTest extends \PHPUnit_Framework_TestCase {
99

1010
public function setUp() {
11-
$_ENV['AppZap\PHPFramework\ProjectRoot'] = dirname(__FILE__);
11+
$_ENV['AppZap\PHPFramework\ProjectRoot'] = __DIR__;
1212
Configuration::reset();
1313
}
1414

tests/Unit/Configuration/Parser/IniParserTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class IniParserTest extends \PHPUnit_Framework_TestCase {
99

1010
public function setUp() {
11-
$_ENV['AppZap\PHPFramework\ProjectRoot'] = dirname(__FILE__);
11+
$_ENV['AppZap\PHPFramework\ProjectRoot'] = __DIR__;
1212
Configuration::reset();
1313
}
1414

0 commit comments

Comments
 (0)