Merge branch 'master' of github.com:yireo/Yireo_GoogleTagManager2

yireo · Aug 26, 2024 · 17efb91 · 17efb91
2 parents 9ec0b4a + 61e160a
commit 17efb91
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);