From 45da90b0c25803e75fb94b5d11fcfd15dca5d61e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 04:00:05 +0000 Subject: [PATCH 1/8] Bump actions/stale from 7 to 8 Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From 47e16ba5f54ad3087851b8a02eca61cd82388cda Mon Sep 17 00:00:00 2001 From: Tobse Date: Sun, 9 Apr 2023 09:29:12 +0200 Subject: [PATCH 2/8] add .ttc to .gitattributes Add Truetype collections (.ttc files) to .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) 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 From 3df05ab6c409980c2814c27efe0668b5d32057e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 03:59:04 +0000 Subject: [PATCH 3/8] Update josegonzalez/dotenv requirement from ^3.2 to ^4.0 Updates the requirements on [josegonzalez/dotenv](https://github.com/josegonzalez/php-dotenv) to permit the latest version. - [Release notes](https://github.com/josegonzalez/php-dotenv/releases) - [Commits](https://github.com/josegonzalez/php-dotenv/compare/3.2.0...4.0.0) --- updated-dependencies: - dependency-name: josegonzalez/dotenv dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 826f6eea7e..0b5cbdb3c8 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "cakephp/bake": "^2.6", "cakephp/cakephp-codesniffer": "^4.5", "cakephp/debug_kit": "^4.5", - "josegonzalez/dotenv": "^3.2", + "josegonzalez/dotenv": "^4.0", "phpunit/phpunit": "~8.5.0 || ^9.3" }, "suggest": { From 8ec4404e8db6b9e7e25615957508be24a88bcc6b Mon Sep 17 00:00:00 2001 From: andrii-pukhalevych Date: Sun, 25 Jun 2023 21:35:04 +0300 Subject: [PATCH 4/8] Use Debugger::trimPath() and Debugger::editorUrl() for error templates --- templates/Error/error400.php | 9 +++++---- templates/Error/error500.php | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) 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'); From c81e4f7044da2af75347a020baa7eb8cc4a385ba Mon Sep 17 00:00:00 2001 From: ADmad Date: Sun, 16 Jul 2023 20:11:47 +0530 Subject: [PATCH 5/8] Remove `static` keyword from the function in routes.php. This allows using `$this` in the function to reference the application class instance. This is required for cases like building an AuthencationMiddleware instance. --- config/routes.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/routes.php b/config/routes.php index 1c4f70f722..91f5571bc9 100644 --- a/config/routes.php +++ b/config/routes.php @@ -24,7 +24,11 @@ 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 + * `$this` to reference the application class instance if required. + */ +return function (RouteBuilder $routes) { /* * The default class to use for all routes * From 8b0c98462bbe7b399815683de9c2ba52d0d66c7e Mon Sep 17 00:00:00 2001 From: ADmad Date: Mon, 17 Jul 2023 16:06:08 +0530 Subject: [PATCH 6/8] Update comment description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marc Würth --- config/routes.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/routes.php b/config/routes.php index 91f5571bc9..50dee91cf9 100644 --- a/config/routes.php +++ b/config/routes.php @@ -24,9 +24,10 @@ use Cake\Routing\Route\DashedRoute; use Cake\Routing\RouteBuilder; -/** - * This file is loaded in the context of the `Application` class. So you can - * `$this` to reference the application class instance if required. +/* + * 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) { /* From 5d914d1ac5e4c1ac77eb84f1cae1a70af4d6a363 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 21 Jul 2023 15:02:03 +0200 Subject: [PATCH 7/8] Use file config instead. --- .github/workflows/ci.yml | 2 +- composer.json | 5 ++--- phpcs.xml | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d406eb84a..e3a79dc10f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: run: composer install - 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/composer.json b/composer.json index 0b5cbdb3c8..b114ec3efd 100644 --- a/composer.json +++ b/composer.json @@ -42,9 +42,8 @@ "@test", "@cs-check" ], - "cs-check": "phpcs --colors -p src/ tests/", - "cs-fix": "phpcbf --colors -p src/ tests/", - "stan": "phpstan analyse", + "cs-check": "phpcs --colors -p", + "cs-fix": "phpcbf --colors -p", "test": "phpunit --colors=always" }, "prefer-stable": true, diff --git a/phpcs.xml b/phpcs.xml index f58219da1c..9c508e896a 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -3,4 +3,7 @@ + + src/ + tests/ From 46ef34192fd6ea97865369f86f8d7d939a3353c8 Mon Sep 17 00:00:00 2001 From: Mark Scherer Date: Fri, 21 Jul 2023 18:27:53 +0200 Subject: [PATCH 8/8] Set return type for closures --- config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.php b/config/routes.php index 50dee91cf9..f1c28804b0 100644 --- a/config/routes.php +++ b/config/routes.php @@ -29,7 +29,7 @@ * So you can use `$this` to reference the application class instance * if required. */ -return function (RouteBuilder $routes) { +return function (RouteBuilder $routes): void { /* * The default class to use for all routes * @@ -49,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 @@ -83,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