Skip to content

Commit d19dc63

Browse files
committed
Merge branch '5.x' into 5.next
2 parents db7c99e + 9a7f511 commit d19dc63

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

config/app.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,4 +412,9 @@
412412
'Session' => [
413413
'defaults' => 'php',
414414
],
415+
'DebugKit' => [
416+
'forceEnable' => filter_var(env('DEBUG_KIT_FORCE_ENABLE', false), FILTER_VALIDATE_BOOLEAN),
417+
'safeTld' => env('DEBUG_KIT_SAFE_TLD', null),
418+
'ignoreAuthorization' => env('DEBUG_KIT_IGNORE_AUTHORIZATION', false)
419+
],
415420
];

config/plugins.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@
1919
* @license https://opensource.org/licenses/mit-license.php MIT License
2020
*/
2121

22+
/*
23+
* List of plugins to load in the form `PluginName` => `[configuration options]`.
24+
*
25+
* Available options:
26+
* - onlyDebug: Load the plugin only in debug mode. Default false.
27+
* - onlyCli: Load the plugin only in CLI mode. Default false.
28+
* - optional: Do not throw an exception if the plugin is not found. Default false.
29+
*/
2230
return [
23-
// Plugins only needed when in debug mode
2431
'DebugKit' => ['onlyDebug' => true],
25-
26-
// Optional plugins which are only needed in CLI commands
2732
'Bake' => ['onlyCli' => true, 'optional' => true],
28-
29-
// Required plugins only in CLI commands
3033
'Migrations' => ['onlyCli' => true],
3134

32-
// Add your custom plugins here
35+
// Additional plugins here
3336
];

templates/Pages/home.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@
134134
<?php else : ?>
135135
<li class="bullet problem">Your version of PHP does NOT have the intl extension loaded.</li>
136136
<?php endif; ?>
137+
138+
<?php if (ini_get('zend.assertions') !== '1') : ?>
139+
<li class="bullet problem">You should set <code>zend.assertions</code> to <code>1</code> in your <code>php.ini</code> for your development environment.</li>
140+
<?php endif; ?>
137141
</ul>
138142
</div>
139143
<div class="column">

0 commit comments

Comments
 (0)