From 56e16024fff742b5036e31f6f94a5bc42362109f Mon Sep 17 00:00:00 2001
From: Jisse Reitsma <jisse@yireo.com>
Date: Fri, 23 Aug 2024 19:20:02 +0200
Subject: [PATCH 1/2] Force return of string

---
 Plugin/AddCspInlineScripts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugin/AddCspInlineScripts.php b/Plugin/AddCspInlineScripts.php
index 528a843..bf818c4 100644
--- a/Plugin/AddCspInlineScripts.php
+++ b/Plugin/AddCspInlineScripts.php
@@ -26,7 +26,7 @@ public function afterToHtml(Template $block, $html): string
         }
 
         if (false === strstr((string)$block->getNameInLayout(), 'yireo_googletagmanager2.')) {
-            return $html;
+            return (string)$html;
         }
 
         $scripts = $this->scriptFinder->find($html);

From 61e160a08cd814893c03728bb9dd79868518d799 Mon Sep 17 00:00:00 2001
From: Jisse Reitsma <jisse@yireo.com>
Date: Fri, 23 Aug 2024 19:26:27 +0200
Subject: [PATCH 2/2] Clean workflows

---
 .github/workflows/extdn-integration-tests-pre-install.sh | 2 +-
 .github/workflows/extdn-phpstan-pre-install.sh           | 2 --
 .github/workflows/extdn-phpstan.yml                      | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

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 6ffad5b..2dafffc 100644
--- a/.github/workflows/extdn-phpstan-pre-install.sh
+++ b/.github/workflows/extdn-phpstan-pre-install.sh
@@ -5,8 +5,6 @@ composer config prefer-stable false
 composer require yireo/magento2-integration-test-helper --no-update
 
 composer config --no-plugins allow-plugins true
-#composer config allow-plugins.phpstan/extension-installer true
-#composer magento/composer-dependency-version-audit-plugin 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