Skip to content

Commit

Permalink
Merge pull request #15 from aharenchie/fix_panda_path
Browse files Browse the repository at this point in the history
PandaのテンプレートPathを変更しました。
  • Loading branch information
ryoryo authored Mar 19, 2019
2 parents 8a1a890 + 7c9b31b commit 850adcc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Panda.php
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ class Panda
self::CONFIG_ON_ERROR_FIRED => false,
self::CONFIG_ON_FATAL_ERROR => false,
self::CONFIG_ENABLE_FIREPHP => true,
self::CONFIG_FATAL_HTML => 'Panda/template/fatal.php',
self::CONFIG_HTTP_TPL => 'Panda/template/http.php',
self::CONFIG_FATAL_HTML => __DIR__ . '/Panda/templates/fatal.php',
self::CONFIG_HTTP_TPL => __DIR__ . '/Panda/templates/http.php',
self::CONFIG_CATCH_FATAL => false,
self::CONFIG_CATCH_STRICT => true,
self::CONFIG_PANDA_PATH => '/',
Expand Down
6 changes: 3 additions & 3 deletions tests/Test/Panda/PandaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ protected function setUp()
Panda::CONFIG_DEBUG => false,
Panda::CONFIG_VALID_PATH => ['/'],
Panda::CONFIG_LOG_PATH => '/tmp',
Panda::CONFIG_ON_FATAL_ERROR => dirname(__DIR__, 2) .'/Panda/template/fatal.html',
Panda::CONFIG_FATAL_HTML => dirname(__DIR__, 2) . '/Panda/template/fatal.html',
Panda::CONFIG_HTTP_TPL => dirname(__DIR__, 2) . '/Panda/template/http.php',
Panda::CONFIG_ON_FATAL_ERROR => dirname(__DIR__, 2) .'/Panda/templates/fatal.html',
Panda::CONFIG_FATAL_HTML => dirname(__DIR__, 2) . '/Panda/templates/fatal.html',
Panda::CONFIG_HTTP_TPL => dirname(__DIR__, 2) . '/Panda/templates/http.php',
Panda::CONFIG_CATCH_FATAL => false,
Panda::CONFIG_CATCH_STRICT => true,
Panda::CONFIG_PANDA_PATH => '/',
Expand Down

0 comments on commit 850adcc

Please sign in to comment.