diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35852fa..9e418ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,5 +20,5 @@ jobs: uses: bedita/github-workflows/.github/workflows/release.yml@v2 with: main_branch: 'master' - dist_branches: '["master","1.x"]' + dist_branches: '["master","5.x"]' version_bump: ${{ inputs.releaseType }} diff --git a/src/Plugin.php b/src/Plugin.php index 395012e..799cbab 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -18,6 +18,7 @@ use Cake\Console\CommandCollection; use Cake\Core\BasePlugin; use Cake\Core\PluginApplicationInterface; +use Cake\Http\BaseApplication; /** * Plugin class for BEdita\WebTools. @@ -54,7 +55,11 @@ public function bootstrap(PluginApplicationInterface $app): void // Call parent to load bootstrap from files. parent::bootstrap($app); + assert($app instanceof BaseApplication); + // Load more plugins here - $app->addPlugin('Cake/TwigView'); + if (!$app->getPlugins()->has('Cake/TwigView')) { + $app->addPlugin('Cake/TwigView'); + } } }