diff --git a/.gitattributes b/.gitattributes index 5b3e6f91da..1ebf0b221e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,6 +23,7 @@ *.phar binary *.woff binary *.woff2 binary +*.ttc binary *.ttf binary *.otf binary *.eot binary diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35c4bf358f..a2a2ca9bdf 100644 --- a/.github/workflows/ci.yml +++ b/.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() diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index e8f3ae7d87..69e7d139d4 100644 --- a/.github/workflows/stale.yml +++ b/.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' diff --git a/composer.json b/composer.json index 0611c9518c..cb95ab9d84 100644 --- a/composer.json +++ b/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" }, diff --git a/config/routes.php b/config/routes.php index 1c4f70f722..f1c28804b0 100644 --- a/config/routes.php +++ b/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 diff --git a/phpcs.xml b/phpcs.xml index f87a414b16..cb4c2dcef9 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -6,4 +6,7 @@ */src/Controller/* + + src/ + tests/ diff --git a/templates/Error/error400.php b/templates/Error/error400.php index 68c0e63418..9ead1656c8 100644 --- a/templates/Error/error400.php +++ b/templates/Error/error400.php @@ -25,13 +25,14 @@

params)) : ?> - SQL Query Params: - params) ?> + SQL Query Params: + params) ?> -element('auto_table_warning') ?> + element('auto_table_warning'); -$this->end(); + $this->end(); endif; ?>

diff --git a/templates/Error/error500.php b/templates/Error/error500.php index 0295c760d8..4f08488e90 100644 --- a/templates/Error/error500.php +++ b/templates/Error/error500.php @@ -29,8 +29,10 @@ params) ?> + getFile() ?> + getLine() ?> Error in: - getFile()), $error->getLine()) ?> + Html->link(sprintf('%s, line %s', Debugger::trimPath($file), $line), Debugger::editorUrl($file, $line)); ?> element('auto_table_warning');