Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit d61a8ffb4ab9 · 2023-07-05T11:42:28.000+02:00
* 6.4:
  Add missing return types to magic methods
diff --git a/DataCollector/DataCollector.php b/DataCollector/DataCollector.php
@@ -82,6 +82,9 @@ public function __sleep(): array
         return ['data'];
     }
 
+    /**
+     * @return void
+     */
     public function __wakeup()
     {
     }
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -167,7 +167,7 @@ public function __sleep(): array
     /**
      * @internal
      */
-    public function __wakeup()
+    public function __wakeup(): void
     {
         parent::__wakeup();
 
diff --git a/Kernel.php b/Kernel.php
@@ -819,6 +819,9 @@ public function __sleep(): array
         return ['environment', 'debug'];
     }
 
+    /**
+     * @return void
+     */
     public function __wakeup()
     {
         if (\is_object($this->environment) || \is_object($this->debug)) {

Original file line number	Diff line number	Diff line change
`@@ -819,6 +819,9 @@ public function __sleep(): array`
`819`	`819`	`return ['environment', 'debug'];`
`820`	`820`	`}`
`821`	`821`
	`822`	`+ /**`
	`823`	`+ * @return void`
	`824`	`+ */`
`822`	`825`	`public function __wakeup()`
`823`	`826`	`{`
`824`	`827`	`if (\is_object($this->environment) \|\| \is_object($this->debug)) {`