Fixing deprecated usage - adding cast to string and tags size check

fastly · May 13, 2024 · 37969c8 · 37969c8
1 parent 0ed56f1
commit 37969c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Model/Api.php b/Model/Api.php
@@ -534,7 +534,7 @@ public function uploadSnippet($version, array $snippet)
         if (isset($snippet['content'])) {
             $adminUrl = $this->vcl->getAdminFrontName();
             $adminPathTimeout = $this->config->getAdminPathTimeout();
-            $ignoredUrlParameters = $this->config->getIgnoredUrlParameters();
+            $ignoredUrlParameters = (string)$this->config->getIgnoredUrlParameters();
 
             if ($ignoredUrlParameters === "") {
                 $queryParameters = '&';

diff --git a/Model/ResponsePlugin.php b/Model/ResponsePlugin.php
@@ -79,7 +79,10 @@ public function aroundSetHeader(Http $subject, callable $proceed, $name, $value,
         // Make the necessary adjustment
         $value = $this->cacheTags->convertCacheTags(str_replace(',', ' ', $value));
         $tagsSize = $this->config->getXMagentoTagsSize();
-        if (strlen($value) > $tagsSize) {
+
+        if ($tagsSize === 0) {
+            $value = "";
+        } else if (strlen($value) > $tagsSize) {
             $trimmedArgs = substr($value, 0, $tagsSize);
             $value = substr($trimmedArgs, 0, strrpos($trimmedArgs, ' ', -1));
         }