Merge branch '7.1' into 7.2

fabpot · fabpot · commit 02d5fce9919c · 2024-06-02T17:49:41.000+02:00
* 7.1:
  [Scheduler] Throw an exception when no dispatcher has been passed to a Schedule
  [Mime] Fix TextPart using an unknown File
  Fix autoload configs to avoid warnings when building optimized autoloaders
  Fix autoload configs to avoid warnings when building optimized autoloaders
diff --git a/composer.json b/composer.json
@@ -184,7 +184,8 @@
             "Symfony\\Bridge\\PsrHttpMessage\\": "src/Symfony/Bridge/PsrHttpMessage/",
             "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
             "Symfony\\Bundle\\": "src/Symfony/Bundle/",
-            "Symfony\\Component\\": "src/Symfony/Component/"
+            "Symfony\\Component\\": "src/Symfony/Component/",
+            "Symfony\\Runtime\\Symfony\\Component\\": "src/Symfony/Component/Runtime/Internal/"
         },
         "files": [
             "src/Symfony/Component/String/Resources/functions.php"
@@ -193,7 +194,8 @@
             "src/Symfony/Component/Cache/Traits/ValueWrapper.php"
         ],
         "exclude-from-classmap": [
-            "**/Tests/"
+            "**/Tests/",
+            "**/bin/"
         ]
     },
     "autoload-dev": {
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -32,7 +32,8 @@
         "files": [ "bootstrap.php" ],
         "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" },
         "exclude-from-classmap": [
-            "/Tests/"
+            "/Tests/",
+            "/bin/"
         ]
     },
     "bin": [
diff --git a/src/Symfony/Component/Emoji/composer.json b/src/Symfony/Component/Emoji/composer.json
@@ -28,7 +28,8 @@
         "psr-4": { "Symfony\\Component\\Emoji\\": "" },
         "exclude-from-classmap": [
             "/Tests/",
-            "/Resources/data/"
+            "/Resources/data/",
+            "/Resources/bin/"
         ]
     },
     "minimum-stability": "dev"
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -125,7 +125,11 @@ public function getName(): ?string
     public function getBody(): string
     {
         if ($this->body instanceof File) {
-            return file_get_contents($this->body->getPath());
+            if (false === $ret = @file_get_contents($this->body->getPath())) {
+                throw new InvalidArgumentException(error_get_last()['message']);
+            }
+
+            return $ret;
         }
 
         if (null === $this->seekable) {
diff --git a/src/Symfony/Component/Mime/Tests/Part/TextPartTest.php b/src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
@@ -58,6 +58,16 @@ public function testConstructorWithFile()
         $this->assertSame('content', implode('', iterator_to_array($p->bodyToIterable())));
     }
 
+    public function testConstructorWithUnknownFile()
+    {
+        $p = new TextPart(new File(\dirname(__DIR__).'/Fixtures/unknown.txt'));
+
+        // Exception should be thrown only when the body is accessed
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('{Failed to open stream}');
+        $p->getBody();
+    }
+
     public function testConstructorWithNonStringOrResource()
     {
         $this->expectException(\TypeError::class);
diff --git a/src/Symfony/Component/Scheduler/Schedule.php b/src/Symfony/Component/Scheduler/Schedule.php
@@ -141,20 +141,32 @@ public function getSchedule(): static
 
     public function before(callable $listener, int $priority = 0): static
     {
+        if (!$this->dispatcher) {
+            throw new LogicException(sprintf('To register a listener with "%s()", you need to set an event dispatcher on the Schedule.', __METHOD__));
+        }
+
         $this->dispatcher->addListener(PreRunEvent::class, $listener, $priority);
 
         return $this;
     }
 
     public function after(callable $listener, int $priority = 0): static
     {
+        if (!$this->dispatcher) {
+            throw new LogicException(sprintf('To register a listener with "%s()", you need to set an event dispatcher on the Schedule.', __METHOD__));
+        }
+
         $this->dispatcher->addListener(PostRunEvent::class, $listener, $priority);
 
         return $this;
     }
 
     public function onFailure(callable $listener, int $priority = 0): static
     {
+        if (!$this->dispatcher) {
+            throw new LogicException(sprintf('To register a listener with "%s()", you need to set an event dispatcher on the Schedule.', __METHOD__));
+        }
+
         $this->dispatcher->addListener(FailureEvent::class, $listener, $priority);
 
         return $this;
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -56,7 +56,8 @@
     "autoload": {
         "psr-4": { "Symfony\\Component\\Validator\\": "" },
         "exclude-from-classmap": [
-            "/Tests/"
+            "/Tests/",
+            "/Resources/bin/"
         ]
     },
     "minimum-stability": "dev"

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,11 @@ public function getName(): ?string`
`125`	`125`	`public function getBody(): string`
`126`	`126`	`{`
`127`	`127`	`if ($this->body instanceof File) {`
`128`		`- return file_get_contents($this->body->getPath());`
	`128`	`+ if (false === $ret = @file_get_contents($this->body->getPath())) {`
	`129`	`+ throw new InvalidArgumentException(error_get_last()['message']);`
	`130`	`+ }`
	`131`	`+`
	`132`	`+ return $ret;`
`129`	`133`	`}`
`130`	`134`
`131`	`135`	`if (null === $this->seekable) {`
Original file line number	Diff line number	Diff line change
`@@ -141,20 +141,32 @@ public function getSchedule(): static`
`141`	`141`
`142`	`142`	`public function before(callable $listener, int $priority = 0): static`
`143`	`143`	`{`
	`144`	`+ if (!$this->dispatcher) {`
	`145`	`+ throw new LogicException(sprintf('To register a listener with "%s()", you need to set an event dispatcher on the Schedule.', __METHOD__));`
	`146`	`+ }`
	`147`	`+`
`144`	`148`	`$this->dispatcher->addListener(PreRunEvent::class, $listener, $priority);`
`145`	`149`
`146`	`150`	`return $this;`
`147`	`151`	`}`
`148`	`152`
`149`	`153`	`public function after(callable $listener, int $priority = 0): static`
`150`	`154`	`{`
	`155`	`+ if (!$this->dispatcher) {`
	`156`	`+ throw new LogicException(sprintf('To register a listener with "%s()", you need to set an event dispatcher on the Schedule.', __METHOD__));`
	`157`	`+ }`
	`158`	`+`
`151`	`159`	`$this->dispatcher->addListener(PostRunEvent::class, $listener, $priority);`
`152`	`160`
`153`	`161`	`return $this;`
`154`	`162`	`}`
`155`	`163`
`156`	`164`	`public function onFailure(callable $listener, int $priority = 0): static`
`157`	`165`	`{`
	`166`	`+ if (!$this->dispatcher) {`
	`167`	`+ throw new LogicException(sprintf('To register a listener with "%s()", you need to set an event dispatcher on the Schedule.', __METHOD__));`
	`168`	`+ }`
	`169`	`+`
`158`	`170`	`$this->dispatcher->addListener(FailureEvent::class, $listener, $priority);`
`159`	`171`
`160`	`172`	`return $this;`