Merge branch '11.x'

driesvints · driesvints · commit b563494009ff · 2024-04-10T17:19:59.000+02:00
# Conflicts:
#	CHANGELOG.md
#	src/Illuminate/Foundation/Application.php
diff --git a/Hub.php b/Hub.php
@@ -28,7 +28,7 @@ class Hub implements HubContract
      * @param  \Illuminate\Contracts\Container\Container|null  $container
      * @return void
      */
-    public function __construct(Container $container = null)
+    public function __construct(?Container $container = null)
     {
         $this->container = $container;
     }
diff --git a/Pipeline.php b/Pipeline.php
@@ -47,7 +47,7 @@ class Pipeline implements PipelineContract
      * @param  \Illuminate\Contracts\Container\Container|null  $container
      * @return void
      */
-    public function __construct(Container $container = null)
+    public function __construct(?Container $container = null)
     {
         $this->container = $container;
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Hub implements HubContract`
`28`	`28`	`* @param \Illuminate\Contracts\Container\Container\|null $container`
`29`	`29`	`* @return void`
`30`	`30`	`*/`
`31`		`- public function __construct(Container $container = null)`
	`31`	`+ public function __construct(?Container $container = null)`
`32`	`32`	`{`
`33`	`33`	`$this->container = $container;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class Pipeline implements PipelineContract`
`47`	`47`	`* @param \Illuminate\Contracts\Container\Container\|null $container`
`48`	`48`	`* @return void`
`49`	`49`	`*/`
`50`		`- public function __construct(Container $container = null)`
	`50`	`+ public function __construct(?Container $container = null)`
`51`	`51`	`{`
`52`	`52`	`$this->container = $container;`
`53`	`53`	`}`