From f8524f04efe71cc0ef70e44f926db20e1fb63ddc Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Sat, 14 Feb 2026 13:40:37 -0500 Subject: [PATCH] Handle cakephp 5.3 deprecations --- .github/workflows/pull-request.yml | 4 ++-- plugins/bake/src/{Plugin.php => BakePlugin.php} | 2 +- .../src/{Plugin.php => CollectionViewPlugin.php} | 2 +- plugins/crud/src/{Plugin.php => CrudPlugin.php} | 2 +- .../src/{Plugin.php => ExceptionRenderPlugin.php} | 2 +- plugins/hal-view/src/{Plugin.php => HalViewPlugin.php} | 2 +- plugins/json-ld-view/src/{Plugin.php => JsonLdViewPlugin.php} | 2 +- plugins/jwt-auth/src/{Plugin.php => JwtAuthPlugin.php} | 2 +- plugins/mixerapi/src/{Plugin.php => MixerApiPlugin.php} | 2 +- plugins/mixerapi/tests/TestCase/PluginTest.php | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename plugins/bake/src/{Plugin.php => BakePlugin.php} (96%) rename plugins/collection-view/src/{Plugin.php => CollectionViewPlugin.php} (96%) rename plugins/crud/src/{Plugin.php => CrudPlugin.php} (99%) rename plugins/exception-render/src/{Plugin.php => ExceptionRenderPlugin.php} (95%) rename plugins/hal-view/src/{Plugin.php => HalViewPlugin.php} (96%) rename plugins/json-ld-view/src/{Plugin.php => JsonLdViewPlugin.php} (97%) rename plugins/jwt-auth/src/{Plugin.php => JwtAuthPlugin.php} (95%) rename plugins/mixerapi/src/{Plugin.php => MixerApiPlugin.php} (97%) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ec69c89..6959bb7 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['8.1', '8.4'] + php-versions: ['8.1', '8.5'] steps: - name: Checkout uses: actions/checkout@v2 @@ -124,7 +124,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['~5.0.0', '~5.2'] + version: ['~5.0.0', '^5.0'] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/plugins/bake/src/Plugin.php b/plugins/bake/src/BakePlugin.php similarity index 96% rename from plugins/bake/src/Plugin.php rename to plugins/bake/src/BakePlugin.php index 2765ed6..5ba194f 100644 --- a/plugins/bake/src/Plugin.php +++ b/plugins/bake/src/BakePlugin.php @@ -9,7 +9,7 @@ use Cake\Event\EventInterface; use Cake\Event\EventManager; -class Plugin extends BasePlugin +class BakePlugin extends BasePlugin { /** * @inheritDoc diff --git a/plugins/collection-view/src/Plugin.php b/plugins/collection-view/src/CollectionViewPlugin.php similarity index 96% rename from plugins/collection-view/src/Plugin.php rename to plugins/collection-view/src/CollectionViewPlugin.php index 2037a59..4214250 100644 --- a/plugins/collection-view/src/Plugin.php +++ b/plugins/collection-view/src/CollectionViewPlugin.php @@ -7,7 +7,7 @@ use Cake\Core\Configure; use Cake\Core\PluginApplicationInterface; -class Plugin extends BasePlugin +class CollectionViewPlugin extends BasePlugin { /** * @inheritDoc diff --git a/plugins/crud/src/Plugin.php b/plugins/crud/src/CrudPlugin.php similarity index 99% rename from plugins/crud/src/Plugin.php rename to plugins/crud/src/CrudPlugin.php index 281be63..b122638 100755 --- a/plugins/crud/src/Plugin.php +++ b/plugins/crud/src/CrudPlugin.php @@ -15,7 +15,7 @@ * * @experimental */ -class Plugin extends BasePlugin +class CrudPlugin extends BasePlugin { protected ?string $name = 'MixerApi/Crud'; diff --git a/plugins/exception-render/src/Plugin.php b/plugins/exception-render/src/ExceptionRenderPlugin.php similarity index 95% rename from plugins/exception-render/src/Plugin.php rename to plugins/exception-render/src/ExceptionRenderPlugin.php index a280732..83ac305 100644 --- a/plugins/exception-render/src/Plugin.php +++ b/plugins/exception-render/src/ExceptionRenderPlugin.php @@ -6,7 +6,7 @@ use Cake\Core\BasePlugin; use Cake\Core\PluginApplicationInterface; -class Plugin extends BasePlugin +class ExceptionRenderPlugin extends BasePlugin { /** * Plugin name. diff --git a/plugins/hal-view/src/Plugin.php b/plugins/hal-view/src/HalViewPlugin.php similarity index 96% rename from plugins/hal-view/src/Plugin.php rename to plugins/hal-view/src/HalViewPlugin.php index c4eb547..28ed5d1 100644 --- a/plugins/hal-view/src/Plugin.php +++ b/plugins/hal-view/src/HalViewPlugin.php @@ -6,7 +6,7 @@ use Cake\Core\BasePlugin; use Cake\Core\PluginApplicationInterface; -class Plugin extends BasePlugin +class HalViewPlugin extends BasePlugin { /** * Plugin name. diff --git a/plugins/json-ld-view/src/Plugin.php b/plugins/json-ld-view/src/JsonLdViewPlugin.php similarity index 97% rename from plugins/json-ld-view/src/Plugin.php rename to plugins/json-ld-view/src/JsonLdViewPlugin.php index fa04de7..a48f562 100644 --- a/plugins/json-ld-view/src/Plugin.php +++ b/plugins/json-ld-view/src/JsonLdViewPlugin.php @@ -7,7 +7,7 @@ use Cake\Core\Configure; use Cake\Core\PluginApplicationInterface; -class Plugin extends BasePlugin +class JsonLdViewPlugin extends BasePlugin { /** * Plugin name. diff --git a/plugins/jwt-auth/src/Plugin.php b/plugins/jwt-auth/src/JwtAuthPlugin.php similarity index 95% rename from plugins/jwt-auth/src/Plugin.php rename to plugins/jwt-auth/src/JwtAuthPlugin.php index bf7f9d1..ef7972d 100755 --- a/plugins/jwt-auth/src/Plugin.php +++ b/plugins/jwt-auth/src/JwtAuthPlugin.php @@ -8,7 +8,7 @@ /** * Plugin for JwtAuth */ -class Plugin extends BasePlugin +class JwtAuthPlugin extends BasePlugin { /** * Plugin name. diff --git a/plugins/mixerapi/src/Plugin.php b/plugins/mixerapi/src/MixerApiPlugin.php similarity index 97% rename from plugins/mixerapi/src/Plugin.php rename to plugins/mixerapi/src/MixerApiPlugin.php index 09e6cde..8126318 100644 --- a/plugins/mixerapi/src/Plugin.php +++ b/plugins/mixerapi/src/MixerApiPlugin.php @@ -11,7 +11,7 @@ use MixerApi\Command\InstallCommand; use MixerApi\Service\InstallerService; -class Plugin extends BasePlugin +class MixerApiPlugin extends BasePlugin { /** * Plugin name. diff --git a/plugins/mixerapi/tests/TestCase/PluginTest.php b/plugins/mixerapi/tests/TestCase/PluginTest.php index 542c952..ea00ac6 100644 --- a/plugins/mixerapi/tests/TestCase/PluginTest.php +++ b/plugins/mixerapi/tests/TestCase/PluginTest.php @@ -19,7 +19,7 @@ public function setUp(): void public function test_bootstrap(): void { - $plugin = new \MixerApi\Plugin(); + $plugin = new \MixerApi\MixerApiPlugin(); $plugin->bootstrap(new Application(CONFIG)); $plugins = [