Skip to content

Commit 4d99e29

Browse files
committed
rename YESF_ROOT to YESF_PATH in order to be consistent
1 parent 9f4e0cd commit 4d99e29

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/Http/Interceptor/DefaultInterceptor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ private function handleNotFound(Request $request, Response $response) {
3333
$response->status(404);
3434
if (Yesf::app()->getEnvironment() === 'develop') {
3535
$response->assign('request', $request);
36-
$response->display(YESF_ROOT . 'Data/error_404_debug.php', true);
36+
$response->display(YESF_PATH . 'Data/error_404_debug.php', true);
3737
} else {
38-
$response->display(YESF_ROOT . 'Data/error_404.php', true);
38+
$response->display(YESF_PATH . 'Data/error_404.php', true);
3939
}
4040
}
4141
private function handleException(Request $request, Response $response) {
@@ -45,9 +45,9 @@ private function handleException(Request $request, Response $response) {
4545
if (Yesf::app()->getEnvironment() === 'develop') {
4646
$response->assign('exception', $exception);
4747
$response->assign('request', $request);
48-
$response->display(YESF_ROOT . 'Data/error_debug.php', true);
48+
$response->display(YESF_PATH . 'Data/error_debug.php', true);
4949
} else {
50-
$response->display(YESF_ROOT . 'Data/error.php', true);
50+
$response->display(YESF_PATH . 'Data/error.php', true);
5151
}
5252
}
5353
}

src/Http/Vars.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Vars {
1717
protected static $mimeTypes = null;
1818
public static function mimeType($extension, $includeCharset = true) {
1919
if (self::$mimeTypes === null) {
20-
self::$mimeTypes = require(YESF_ROOT . 'Data/mimeTypes.php');
20+
self::$mimeTypes = require(YESF_PATH . 'Data/mimeTypes.php');
2121
}
2222
$extension = strtolower($extension);
2323
if (!isset(self::$mimeTypes[$extension])) {

src/Yesf.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
use Yesf\Exception\NotFoundException;
2222
use Yesf\Exception\RequirementException;
2323

24-
if (!defined('YESF_ROOT')) {
25-
define('YESF_ROOT', __DIR__ . '/');
24+
if (!defined('YESF_PATH')) {
25+
define('YESF_PATH', __DIR__ . '/');
2626
}
2727

2828
set_error_handler(function($errno, $errstr, $errfile, $errline, $errcontext) {

tests/Cases/Http/VarsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class VarsTest extends TestCase {
99
public function testMimeType() {
10-
$mime = require(YESF_ROOT . 'Data/mimeTypes.php');
10+
$mime = require(YESF_PATH . 'Data/mimeTypes.php');
1111
$this->assertSame($mime['flv'], Vars::mimeType('Flv'));
1212
$this->assertEquals('text/html; charset=' . Yesf::app()->getConfig('charset', Yesf::CONF_PROJECT), Vars::mimeType('html'));
1313
$this->assertEquals('application/octet-stream', Vars::mimeType('unknown'));

tests/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
define('APP_PATH', __DIR__ . '/TestApp/');
66
define('TEST_SRC', __DIR__ . '/Cases/');
77
define('TEST_APP', __DIR__ . '/TestApp/');
8-
define('YESF_ROOT', PROJECT_PATH . 'src/');
8+
define('YESF_PATH', PROJECT_PATH . 'src/');
99
define('YESF_UNIT', 1);
1010
define('YESF_TEST', __DIR__ . '/');
1111
require(PROJECT_PATH . '/vendor/autoload.php');

0 commit comments

Comments
 (0)