mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-08 22:26:46 +02:00
Code Issues Releases Wiki Activity

feat(core): add filp/whoops instead of zeuxisoo/slim-whoops #472

Browse Source
This commit is contained in:
Awilum
2020-09-07 19:08:17 +03:00
parent 5875ac9ca9
commit d7def87f34
2 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -36,7 +36,7 @@
"flextype-components/session" : "1.1.1",
"slim/slim": "~3.12.3",
"zeuxisoo/slim-whoops": "~0.6.5",
"filp/whoops": "~2.7.3",
"league/glide-slim": "~1.0.0",
"league/event": "~2.2.0",

73
src/flextype/bootstrap.php
View File

@@ -12,7 +12,11 @@ namespace Flextype;
use Flextype\Foundation\Flextype;
use Flextype\Component\Registry\Registry;
use Flextype\Component\Session\Session;
use Zeuxisoo\Whoops\Provider\Slim\WhoopsMiddleware;
use Slim\Http\Environment;
use Slim\Http\Uri;
use Whoops\Util\Misc;
use Whoops\Handler\PrettyPageHandler;
use Whoops\Handler\JsonResponseHandler;
use function date_default_timezone_set;
use function error_reporting;
use function file_exists;
@@ -44,8 +48,6 @@ include_once ROOT_DIR . '/src/flextype/preflight.php';
$flextype = Flextype::getInstance([
'settings' => [
'debug' => $registry->get('flextype.settings.errors.display'),
'whoops.editor' => $registry->get('flextype.settings.whoops.editor'),
'whoops.page_title' => $registry->get('flextype.settings.whoops.page_title'),
'displayErrorDetails' => $registry->get('flextype.settings.display_error_details'),
'addContentLengthHeader' => $registry->get('flextype.settings.add_content_length_header'),
'routerCacheFile' => $registry->get('flextype.settings.router_cache_file'),
@@ -56,6 +58,56 @@ $flextype = Flextype::getInstance([
],
]);
/**
* Display Errors
*/
if ($registry->get('flextype.settings.errors.display')) {
$environment = new Environment($_SERVER);
$uri = Uri::createFromEnvironment($environment);
$prettyPageHandler = new PrettyPageHandler();
$prettyPageHandler->setEditor($registry->get('flextype.settings.whoops.editor'));
$prettyPageHandler->setPageTitle($registry->get('flextype.settings.whoops.page_title'));
$prettyPageHandler->addDataTable('Flextype Application', [
'Application Class' => get_class(flextype()),
'Script Name' => $environment->get('SCRIPT_NAME'),
'Request URI' => $environment->get('PATH_INFO') ?: '<none>',
]);
$prettyPageHandler->addDataTable('Flextype Application (Request)', array(
'Path' => $uri->getPath(),
'URL' => (string) $uri,
'Query String' => $uri->getQuery() ?: '<none>',
'Scheme' => $uri->getScheme() ?: '<none>',
'Port' => $uri->getPort() ?: '<none>',
'Host' => $uri->getHost() ?: '<none>',
));
// Set Whoops to default exception handler
$whoops = new \Whoops\Run;
$whoops->pushHandler($prettyPageHandler);
// Enable JsonResponseHandler when request is AJAX
if (Misc::isAjaxRequest()){
$whoops->pushHandler(new JsonResponseHandler());
}
$whoops->register();
flextype()->container()['phpErrorHandler'] =
flextype()->container()['errorHandler'] =
function() use ($whoops) {
new WhoopsErrorHandler($whoops);
};
flextype()->container()['whoops'] = $whoops;
} else {
error_reporting(0);
}
/**
* Include Dependencies
*/
@@ -79,19 +131,6 @@ function_exists('mb_language') and mb_language('uni');
function_exists('mb_regex_encoding') and mb_regex_encoding(flextype('registry')->get('flextype.settings.charset'));
function_exists('mb_internal_encoding') and mb_internal_encoding(flextype('registry')->get('flextype.settings.charset'));
/**
* Display Errors
*/
if (flextype('registry')->get('flextype.settings.errors.display')) {
/**
* Add WhoopsMiddleware
*/
flextype()->add(new WhoopsMiddleware());
} else {
error_reporting(0);
}
/**
* Set default timezone
*/
@@ -125,7 +164,7 @@ foreach ($entry_fields as $field_name => $field) {
if (! file_exists($entry_field_file_path)) {
continue;
}
include_once $entry_field_file_path;
}