Merge branch 'main' into patch-1

fabianaromagnoli · Jan 11, 2025 · 5c11a1d · 5c11a1d
2 parents 98f53cf + 2a4ebc4
commit 5c11a1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -868,8 +868,8 @@
 'Documentation':
   - changed-files:
     - any-glob-to-any-file: [
-      docs/*.md
-      docs/**/*.md
+      docs/*.md,
+      docs/**/*.md,
       docs_includes/*.md
     ]
 

diff --git a/tests/unit/Mage/Core/Model/LayoutTest.php b/tests/unit/Mage/Core/Model/LayoutTest.php
@@ -125,7 +125,11 @@ public function provideGetBlockSingleton(): Generator
     public function testGetBlockSingletonError(): void
     {
         $this->expectException(\Error::class);
-        $this->expectExceptionMessage("Class 'Mage_Invalid_Block_Type' not found");
+        if (PHP_VERSION_ID >= 80000) {
+            $this->expectExceptionMessage('Class "Mage_Invalid_Block_Type" not found');
+        } else {
+            $this->expectExceptionMessage("Class 'Mage_Invalid_Block_Type' not found");
+        }
 
         $this->subject->getBlockSingleton('invalid/type');
     }