diff --git a/composer.json b/composer.json index dd0c262c..113147cb 100644 --- a/composer.json +++ b/composer.json @@ -44,49 +44,49 @@ "ext-xml": "*", "ext-curl": "*", - "swiftmailer/swiftmailer": "5.4.*", - "symfony/yaml": "~3.4", - "symfony/console": "~3.4", - "symfony/finder": "~3.4", - "symfony/dom-crawler": "~3.4", - "symfony/css-selector": "~3.4", - "symfony/browser-kit": "~3.4", - "symfony/process": "~3.4", - "symfony/filesystem": "~3.4", - "symfony/debug": "~3.4", - "symfony/dependency-injection": "~3.4", - "symfony/event-dispatcher": "~3.4", - "psr/log": "1.0.*", - "monolog/monolog": "1.22.*", - "pimple/pimple": "3.0.*", - "robmorgan/phinx": "0.8.*", - "sensiolabs/ansi-to-html": "1.1.*", - "pda/pheanstalk": "3.1.*", - "guzzlehttp/guzzle": "6.2.*", - "jasongrimes/paginator": "~1.0", + "swiftmailer/swiftmailer": "~5.4.0", + "symfony/yaml": "~3.4.0", + "symfony/console": "~3.4.0", + "symfony/finder": "~3.4.0", + "symfony/dom-crawler": "~3.4.0", + "symfony/css-selector": "~3.4.0", + "symfony/browser-kit": "~3.4.0", + "symfony/process": "~3.4.0", + "symfony/filesystem": "~3.4.0", + "symfony/debug": "~3.4.0", + "symfony/dependency-injection": "~3.4.0", + "symfony/event-dispatcher": "~3.4.0", + "psr/log": "~1.0.0", + "monolog/monolog": "~1.22.0", + "pimple/pimple": "~3.0.0", + "robmorgan/phinx": "~0.8.0", + "sensiolabs/ansi-to-html": "~1.1.0", + "pda/pheanstalk": "~3.1.0", + "guzzlehttp/guzzle": "~6.2.0", + "jasongrimes/paginator": "~1.0.0", - "phpunit/phpunit": "5.7.*", - "codeception/codeception": "2.3.*", - "phpmd/phpmd": "2.6.*", - "sebastian/phpcpd": "2.0.*", - "squizlabs/php_codesniffer": "2.8.*", - "block8/php-docblock-checker": "1.3.*", - "phploc/phploc": "4.0.*", - "jakub-onderka/php-parallel-lint": "0.9.*", - "sensiolabs/security-checker": "4.0.*", + "phpunit/phpunit": "~5.7.0", + "codeception/codeception": "~2.3.0", + "phpmd/phpmd": "~2.6.0", + "sebastian/phpcpd": "~2.0.0", + "squizlabs/php_codesniffer": "~2.8.0", + "block8/php-docblock-checker": "~1.3.0", + "phploc/phploc": "~4.0.0", + "jakub-onderka/php-parallel-lint": "~0.9.0", + "sensiolabs/security-checker": "~4.0.0", - "doctrine/instantiator": "1.0.*", - "phpunit/php-token-stream": "~1.0", - "phpdocumentor/reflection-docblock": "~2.0", + "doctrine/instantiator": "~1.0.0", + "phpunit/php-token-stream": "~1.4.0", + "phpdocumentor/reflection-docblock": "~2.0.0", - "mnsami/composer-custom-directory-installer": "1.1.*", + "mnsami/composer-custom-directory-installer": "~1.1.0", - "npm-asset/sprintf-js": "1.0.*", - "npm-asset/codemirror": "5.23.*", - "bower-asset/admin-lte": "2.3.*", - "bower-asset/font-awesome": "4.7.*", - "bower-asset/ionicons": "2.0.*", - "bower-asset/raphael": "2.2.*" + "npm-asset/sprintf-js": "~1.0.0", + "npm-asset/codemirror": "~5.23.0", + "bower-asset/admin-lte": "~2.3.0", + "bower-asset/font-awesome": "~4.7.0", + "bower-asset/ionicons": "~2.0.0", + "bower-asset/raphael": "~2.2.0" }, "suggest": { "maknz/slack": "For SlackNotify plugin", diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php index 74d7d538..ade38d25 100644 --- a/src/PHPCensor/Languages/lang.en.php +++ b/src/PHPCensor/Languages/lang.en.php @@ -153,7 +153,7 @@ PHP Censor', 'source_manual_web' => 'Manual (from Web)', 'source_manual_console' => 'Manual (from CLI)', 'source_periodical' => 'Periodical', - 'source_webhook' => 'Webhook', + 'source_webhook' => 'Webhook (Push)', 'source_webhook_pull_request' => 'Webhook (Pull request)', 'webhooks' => 'Webhooks', diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php index dd052793..fd3f7f0a 100644 --- a/src/PHPCensor/Languages/lang.ru.php +++ b/src/PHPCensor/Languages/lang.ru.php @@ -149,7 +149,7 @@ PHP Censor', 'source_manual_web' => 'Вручную (Через Web)', 'source_manual_console' => 'Вручную (Через CLI)', 'source_periodical' => 'Переодический', - 'source_webhook' => 'Webhook', + 'source_webhook' => 'Webhook (Push)', 'source_webhook_pull_request' => 'Webhook (Pull request)', 'webhooks' => 'Webhooks', diff --git a/src/PHPCensor/View/exception.phtml b/src/PHPCensor/View/exception.phtml index 69aeb124..75a2f282 100644 --- a/src/PHPCensor/View/exception.phtml +++ b/src/PHPCensor/View/exception.phtml @@ -1,16 +1,22 @@ +

Sorry, there was a problem

- -
- Message: getMessage(); ?>
- File: getFile(); ?>
- Line: getLine(); ?>
- Trace: -
getTraceAsString(); ?>
-
-
\ No newline at end of file + User()->getIsAdmin()): ?> +
+ Message: getMessage(); ?>
+ File: getFile(); ?>
+ Line: getLine(); ?>
+ Trace: +
getTraceAsString(); ?>
+
+ +