diff --git a/.github/workflows/extdn-integration-tests-pre-install.sh b/.github/workflows/extdn-integration-tests-pre-install.sh index 089cb9f..5eba56d 100644 --- a/.github/workflows/extdn-integration-tests-pre-install.sh +++ b/.github/workflows/extdn-integration-tests-pre-install.sh @@ -2,7 +2,7 @@ composer config minimum-stability dev composer config prefer-stable false -composer require yireo/magento2-integration-test-helper --no-update +composer require --dev yireo/magento2-integration-test-helper --no-update composer require yireo/magento2-replace-bundled:^4.0 --no-update composer require yireo/magento2-replace-inventory:^4.0 --no-update diff --git a/.github/workflows/extdn-phpstan-pre-install.sh b/.github/workflows/extdn-phpstan-pre-install.sh index e4eeb72..2dafffc 100644 --- a/.github/workflows/extdn-phpstan-pre-install.sh +++ b/.github/workflows/extdn-phpstan-pre-install.sh @@ -5,6 +5,7 @@ composer config prefer-stable false composer require yireo/magento2-integration-test-helper --no-update composer config --no-plugins allow-plugins true + composer require --dev phpstan/extension-installer --no-update composer require --dev bitexpert/phpstan-magento --no-update diff --git a/.github/workflows/extdn-phpstan.yml b/.github/workflows/extdn-phpstan.yml index d3510a8..65d4d4a 100644 --- a/.github/workflows/extdn-phpstan.yml +++ b/.github/workflows/extdn-phpstan.yml @@ -16,7 +16,6 @@ jobs: uses: actions/cache@v2 with: path: "${{ steps.determine-composer-cache-directory.outputs.directory }}" - #path: /tmp/composer-cache key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} - uses: extdn/github-actions-m2/magento-phpstan/8.3@master diff --git a/Plugin/AddCspInlineScripts.php b/Plugin/AddCspInlineScripts.php index c47d646..32efe8d 100644 --- a/Plugin/AddCspInlineScripts.php +++ b/Plugin/AddCspInlineScripts.php @@ -18,7 +18,7 @@ public function __construct( public function afterToHtml(Template $block, $html): string { if (false === strstr((string)$block->getNameInLayout(), 'yireo_googletagmanager2.')) { - return $html; + return (string)$html; } return $this->replaceInlineScripts->replace((string)$html);