Merge pull request #961 from cakephp/5.x-merge

merge 4.x => 5.x

.gitattributes

@@ -23,6 +23,7 @@
 *.phar binary
 *.woff binary
 *.woff2 binary
+*.ttc binary
 *.ttf binary
 *.otf binary
 *.eot binary

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
  uses: ramsey/composer-install@v2
 
  - name: Run PHP CodeSniffer
- run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr
+ run: vendor/bin/phpcs --report=checkstyle | cs2pr
 
  - name: Run phpstan
  if: always()

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/stale@v7
+ - uses: actions/stale@v8
  with:
  repo-token: ${{ secrets.GITHUB_TOKEN }}
  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'

composer.json

@@ -42,8 +42,8 @@
  "@test",
  "@cs-check"
  ],
- "cs-check": "phpcs --colors -p src/ tests/",
- "cs-fix": "phpcbf --colors -p src/ tests/",
+ "cs-check": "phpcs --colors -p",
+ "cs-fix": "phpcbf --colors -p",
  "stan": "phpstan analyse",
  "test": "phpunit --colors=always"
  },

config/routes.php

@@ -24,7 +24,12 @@
 use Cake\Routing\Route\DashedRoute;
 use Cake\Routing\RouteBuilder;
 
-return static function (RouteBuilder $routes) {
+/*
+ * This file is loaded in the context of the `Application` class.
+ * So you can use `$this` to reference the application class instance
+ * if required.
+ */
+return function (RouteBuilder $routes): void {
  /*
  * The default class to use for all routes
  *
@@ -44,7 +49,7 @@
  */
  $routes->setRouteClass(DashedRoute::class);
 
- $routes->scope('/', function (RouteBuilder $builder) {
+ $routes->scope('/', function (RouteBuilder $builder): void {
  /*
  * Here, we are connecting '/' (base path) to a controller called 'Pages',
  * its action called 'display', and we pass a param to select the view file
@@ -78,7 +83,7 @@
  * open new scope and define routes there.
  *
  * ```
- * $routes->scope('/api', function (RouteBuilder $builder) {
+ * $routes->scope('/api', function (RouteBuilder $builder): void {
  * // No $builder->applyMiddleware() here.
  *
  * // Parse specified extensions from URLs

phpcs.xml

@@ -6,4 +6,7 @@
  <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
  <exclude-pattern>*/src/Controller/*</exclude-pattern>
  </rule>
+
+ <file>src/</file>
+ <file>tests/</file>
 </ruleset>

templates/Error/error400.php

@@ -25,13 +25,14 @@
  </p>
 <?php endif; ?>
 <?php if (!empty($error->params)) : ?>
-  <strong>SQL Query Params: </strong>
-  <?php Debugger::dump($error->params) ?>
+ <strong>SQL Query Params: </strong>
+ <?php Debugger::dump($error->params) ?>
 <?php endif; ?>
-<?= $this->element('auto_table_warning') ?>
+
 <?php
+ echo $this->element('auto_table_warning');
 
-$this->end();
+ $this->end();
 endif;
 ?>
 <h2><?= h($message) ?></h2>

templates/Error/error500.php

@@ -29,8 +29,10 @@
  <?php Debugger::dump($error->params) ?>
 <?php endif; ?>
 <?php if ($error instanceof Error) : ?>
+ <?php $file = $error->getFile() ?>
+ <?php $line = $error->getLine() ?>
  <strong>Error in: </strong>
- <?= sprintf('%s, line %s', str_replace(ROOT, 'ROOT', $error->getFile()), $error->getLine()) ?>
+ <?= $this->Html->link(sprintf('%s, line %s', Debugger::trimPath($file), $line), Debugger::editorUrl($file, $line)); ?>
 <?php endif; ?>
 <?php
  echo $this->element('auto_table_warning');