Skip to content

Commit e9a6d23

Browse files
committed
Merge branch '5.x' into 5.next
2 parents b444d37 + 97cd328 commit e9a6d23

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/stale@v9
19+
- uses: actions/stale@v10
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222
stale-issue-message: 'This issue is stale because it has been open for 120 days with no activity. Remove the `stale` label or comment or this will be closed in 15 days'

config/bootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
* When debug = true the metadata cache should only last for a short time.
100100
*/
101101
if (Configure::read('debug')) {
102-
Configure::write('Cache._cake_model_.duration', '+2 minutes');
103-
Configure::write('Cache._cake_translations_.duration', '+2 minutes');
102+
Configure::write('Cache._cake_model_.duration', '+1 minute');
103+
Configure::write('Cache._cake_translations_.duration', '+1 minute');
104104
}
105105

106106
/*

phpcs.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0"?>
22
<ruleset name="App">
3-
<config name="installed_paths" value="../../cakephp/cakephp-codesniffer"/>
4-
53
<rule ref="CakePHP"/>
64
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
75
<exclude-pattern>*/src/Controller/*</exclude-pattern>

templates/Error/error400.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77
use Cake\Core\Configure;
88

9-
$this->layout = 'error';
9+
$this->setLayout('error');
1010

1111
if (Configure::read('debug')) :
12-
$this->layout = 'dev_error';
12+
$this->setLayout('dev_error');
1313

1414
$this->assign('title', $message);
1515
$this->assign('templateName', 'error400.php');

templates/Error/error500.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
use Cake\Core\Configure;
88
use Cake\Error\Debugger;
99

10-
$this->layout = 'error';
10+
$this->setLayout('error');
1111

1212
if (Configure::read('debug')) :
13-
$this->layout = 'dev_error';
13+
$this->setLayout('dev_error');
1414

1515
$this->assign('title', $message);
1616
$this->assign('templateName', 'error500.php');

0 commit comments

Comments
 (0)