Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 7e719b0c849e · 2023-12-20T13:32:14.000+01:00
* 7.0: [AssetMapper] Fix URL pattern when importing es-module-shims Allow psr/container 1.1 again [Notifier] Mention `postAt()` in the Slack bridge README remove unneeded @requires PHP from tests remove unneeded @requires PHP from tests
diff --git a/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -856,9 +856,6 @@ public function testUnionTypePassesWithFalse()
         $this->addToAssertionCount(1);
     }
 
-    /**
-     * @requires PHP 8.2
-     */
     public function testUnionTypePassesWithTrue()
     {
         $container = new ContainerBuilder();
diff --git a/Tests/Dumper/YamlDumperTest.php b/Tests/Dumper/YamlDumperTest.php
@@ -167,8 +167,6 @@ public function testDumpHandlesEnumeration()
     }
 
     /**
-     * @requires PHP 8.1
-     *
      * @dataProvider provideDefaultClasses
      */
     public function testDumpHandlesDefaultAttribute($class, $expectedFile)

Original file line number	Diff line number	Diff line change
`@@ -856,9 +856,6 @@ public function testUnionTypePassesWithFalse()`
`856`	`856`	`$this->addToAssertionCount(1);`
`857`	`857`	`}`
`858`	`858`
`859`		`- /**`
`860`		`- * @requires PHP 8.2`
`861`		`- */`
`862`	`859`	`public function testUnionTypePassesWithTrue()`
`863`	`860`	`{`
`864`	`861`	`$container = new ContainerBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,6 @@ public function testDumpHandlesEnumeration()`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/**`
`170`		`- * @requires PHP 8.1`
`171`		`- *`
`172`	`170`	`* @dataProvider provideDefaultClasses`
`173`	`171`	`*/`
`174`	`172`	`public function testDumpHandlesDefaultAttribute($class, $expectedFile)`