From 57f4c88c265a1febaef4dbd1facef12a6e707e76 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 22 Oct 2025 13:49:26 -0400 Subject: [PATCH 1/7] Testing mixerapi/core --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1d035d14..ad0135d4 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "cakephp/cakephp": "^5.0", "symfony/yaml": "^5.0", "phpdocumentor/reflection-docblock": "^5.1", - "mixerapi/core": "^2.0" + "mixerapi/core": "dev-master" }, "suggest": { "cakephp/bake": "Used by SwaggerBake bake templates", @@ -78,6 +78,7 @@ "config": { "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true - } + }, + "prefer-stable": true } } From 9d83c1515ee92552546206f937852afa093c804c Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 29 Oct 2025 17:13:11 -0400 Subject: [PATCH 2/7] Update to mixerapi/core v2.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ad0135d4..edfcaaa9 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "cakephp/cakephp": "^5.0", "symfony/yaml": "^5.0", "phpdocumentor/reflection-docblock": "^5.1", - "mixerapi/core": "dev-master" + "mixerapi/core": "^2.1" }, "suggest": { "cakephp/bake": "Used by SwaggerBake bake templates", From 87bccfd4b3a4d72e6df6e341797e39d13e527877 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 29 Oct 2025 17:13:59 -0400 Subject: [PATCH 3/7] Remove mixerapi/core as a suggestion (its required) --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index edfcaaa9..f45046b1 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,7 @@ }, "suggest": { "cakephp/bake": "Used by SwaggerBake bake templates", - "friendsofcake/search": "Required by SwaggerBake #[OpenApiSearch]", - "mixerapi/mixerapi": "Streamline development of your API with MixerAPI" + "friendsofcake/search": "Required by SwaggerBake #[OpenApiSearch]" }, "require-dev": { "phpunit/phpunit": "^10.0", From 79b5efa22ec81d26cd2c26a8982c62c346beffa4 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 29 Oct 2025 17:16:42 -0400 Subject: [PATCH 4/7] Clear composer cache --- .github/workflows/pull-request.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 65d29ea2..193aa283 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,6 +24,7 @@ jobs: if: steps.composer-cache.outputs.cache-hit != 'true' run: | composer self-update + composer clear-cache composer validate composer install --prefer-dist --no-progress @@ -49,6 +50,7 @@ jobs: if: steps.composer-cache.outputs.cache-hit != 'true' run: | composer self-update + composer clear-cache composer validate composer install --prefer-dist --no-progress @@ -85,6 +87,7 @@ jobs: - name: CakePHP ${{matrix.version}} Compatability run: | composer self-update + composer clear-cache rm -rf composer.lock composer require cakephp/cakephp:${{matrix.version}} --no-update composer install --prefer-dist --no-progress From 1b152338204de395812357938fb709f1d2179732 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 29 Oct 2025 17:23:17 -0400 Subject: [PATCH 5/7] Remove grumphp --- README.md | 10 +--------- composer.json | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 27c046f0..c031340d 100644 --- a/README.md +++ b/README.md @@ -451,12 +451,4 @@ PHPUnit, PHPCS, PHPSTAN, and PHPMD: ```console composer analyze -``` - -[GrumPHP](https://github.com/phpro/grumphp) can be used to run tests and static analyzers in a pre-commit hook. - -```console -composer grumphp-init -``` - -I've set grumphp to be installed globally: https://github.com/phpro/grumphp/blob/master/doc/installation/global.md +``` \ No newline at end of file diff --git a/composer.json b/composer.json index f45046b1..5fbcc55e 100644 --- a/composer.json +++ b/composer.json @@ -59,9 +59,7 @@ "phpstan": "phpstan analyse src/", "test": "phpunit --colors=always", "phpmd": "phpmd src/ ansi phpmd.xml", - "coverage": "phpunit --coverage-html coverage-reports/", - "grumphp-init": "grumphp git:init", - "grumphp": "grumphp" + "coverage": "phpunit --coverage-html coverage-reports/" }, "support": { "issues": "https://github.com/cnizzardini/cakephp-swagger-bake/issues", From e79f24d622ed13d9d2834d10c02083e13f186fd2 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 29 Oct 2025 17:24:54 -0400 Subject: [PATCH 6/7] Remove composer clear-cache debugging, has no effect in gh pipeline --- .github/workflows/pull-request.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 193aa283..65d29ea2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,7 +24,6 @@ jobs: if: steps.composer-cache.outputs.cache-hit != 'true' run: | composer self-update - composer clear-cache composer validate composer install --prefer-dist --no-progress @@ -50,7 +49,6 @@ jobs: if: steps.composer-cache.outputs.cache-hit != 'true' run: | composer self-update - composer clear-cache composer validate composer install --prefer-dist --no-progress @@ -87,7 +85,6 @@ jobs: - name: CakePHP ${{matrix.version}} Compatability run: | composer self-update - composer clear-cache rm -rf composer.lock composer require cakephp/cakephp:${{matrix.version}} --no-update composer install --prefer-dist --no-progress From 1bb5161d9c35c0ed81d2a91500057605593b58c8 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Wed, 29 Oct 2025 17:26:54 -0400 Subject: [PATCH 7/7] only req mixerapi/core v2.0 (instead of hard require 2.1) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5fbcc55e..9aa3ad6a 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "cakephp/cakephp": "^5.0", "symfony/yaml": "^5.0", "phpdocumentor/reflection-docblock": "^5.1", - "mixerapi/core": "^2.1" + "mixerapi/core": "^2.0" }, "suggest": { "cakephp/bake": "Used by SwaggerBake bake templates",