diff --git a/.github/labeler.yml b/.github/labeler.yml index 15952cb6064..37847108893 100644 --- 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 index 49405041991..253e816954b 100644 --- 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'); }