Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit fb38e4927d90 · 2023-07-27T09:02:19.000+02:00
* 6.4:
  More short closures + isset instead of null checks + etc.
diff --git a/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -551,7 +551,7 @@ private function set(string $type, string $id): void
 
     private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): \Closure
     {
-        if (null === $this->typesClone->container) {
+        if (!isset($this->typesClone->container)) {
             $this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());
             $this->typesClone->container->setAliases($this->container->getAliases());
             $this->typesClone->container->setDefinitions($this->container->getDefinitions());
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -1626,7 +1626,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Loader/Configurator/AbstractConfigurator.php b/Loader/Configurator/AbstractConfigurator.php
@@ -27,7 +27,7 @@ abstract class AbstractConfigurator
     public const FACTORY = 'unknown';
 
     /**
-     * @var callable(mixed, bool)|null
+     * @var \Closure(mixed, bool):mixed|null
      */
     public static $valuePreProcessor;
 
diff --git a/Tests/Fixtures/php/services10.php b/Tests/Fixtures/php/services10.php
@@ -72,7 +72,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services12.php b/Tests/Fixtures/php/services12.php
@@ -72,7 +72,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services19.php b/Tests/Fixtures/php/services19.php
@@ -87,7 +87,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services26.php b/Tests/Fixtures/php/services26.php
@@ -83,7 +83,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services8.php b/Tests/Fixtures/php/services8.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services9_as_files.txt b/Tests/Fixtures/php/services9_as_files.txt
@@ -678,7 +678,7 @@ class ProjectServiceContainer extends Container
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services9_compiled.php b/Tests/Fixtures/php/services9_compiled.php
@@ -462,7 +462,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services9_inlined_factories.txt b/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -521,7 +521,7 @@ class ProjectServiceContainer extends Container
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -114,7 +114,7 @@ class ProjectServiceContainer extends Container
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_array_params.php b/Tests/Fixtures/php/services_array_params.php
@@ -76,7 +76,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_base64_env.php b/Tests/Fixtures/php/services_base64_env.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_csv_env.php b/Tests/Fixtures/php/services_csv_env.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_default_env.php b/Tests/Fixtures/php/services_default_env.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_deprecated_parameters.php b/Tests/Fixtures/php/services_deprecated_parameters.php
@@ -80,7 +80,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt b/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
@@ -124,7 +124,7 @@ class ProjectServiceContainer extends Container
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_env_in_id.php b/Tests/Fixtures/php/services_env_in_id.php
@@ -91,7 +91,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_errored_definition.php b/Tests/Fixtures/php/services_errored_definition.php
@@ -462,7 +462,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_json_env.php b/Tests/Fixtures/php/services_json_env.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_query_string_env.php b/Tests/Fixtures/php/services_query_string_env.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_rot13_env.php b/Tests/Fixtures/php/services_rot13_env.php
@@ -95,7 +95,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_unsupported_characters.php b/Tests/Fixtures/php/services_unsupported_characters.php
@@ -94,7 +94,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
diff --git a/Tests/Fixtures/php/services_url_env.php b/Tests/Fixtures/php/services_url_env.php
@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void
 
     public function getParameterBag(): ParameterBagInterface
     {
-        if (null === $this->parameterBag) {
+        if (!isset($this->parameterBag)) {
             $parameters = $this->parameters;
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ private function set(string $type, string $id): void`
`551`	`551`
`552`	`552`	`private function createTypeNotFoundMessageCallback(TypedReference $reference, string $label): \Closure`
`553`	`553`	`{`
`554`		`- if (null === $this->typesClone->container) {`
	`554`	`+ if (!isset($this->typesClone->container)) {`
`555`	`555`	`$this->typesClone->container = new ContainerBuilder($this->container->getParameterBag());`
`556`	`556`	`$this->typesClone->container->setAliases($this->container->getAliases());`
`557`	`557`	`$this->typesClone->container->setDefinitions($this->container->getDefinitions());`
Original file line number	Diff line number	Diff line change
`@@ -1626,7 +1626,7 @@ public function setParameter(string $name, $value): void`
`1626`	`1626`
`1627`	`1627`	`public function getParameterBag(): ParameterBagInterface`
`1628`	`1628`	`{`
`1629`		`- if (null === $this->parameterBag) {`
	`1629`	`+ if (!isset($this->parameterBag)) {`
`1630`	`1630`	`$parameters = $this->parameters;`
`1631`	`1631`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`1632`	`1632`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function setParameter(string $name, $value): void`
`72`	`72`
`73`	`73`	`public function getParameterBag(): ParameterBagInterface`
`74`	`74`	`{`
`75`		`- if (null === $this->parameterBag) {`
	`75`	`+ if (!isset($this->parameterBag)) {`
`76`	`76`	`$parameters = $this->parameters;`
`77`	`77`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`78`	`78`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function setParameter(string $name, $value): void`
`87`	`87`
`88`	`88`	`public function getParameterBag(): ParameterBagInterface`
`89`	`89`	`{`
`90`		`- if (null === $this->parameterBag) {`
	`90`	`+ if (!isset($this->parameterBag)) {`
`91`	`91`	`$parameters = $this->parameters;`
`92`	`92`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`93`	`93`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function setParameter(string $name, $value): void`
`83`	`83`
`84`	`84`	`public function getParameterBag(): ParameterBagInterface`
`85`	`85`	`{`
`86`		`- if (null === $this->parameterBag) {`
	`86`	`+ if (!isset($this->parameterBag)) {`
`87`	`87`	`$parameters = $this->parameters;`
`88`	`88`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`89`	`89`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function setParameter(string $name, $value): void`
`59`	`59`
`60`	`60`	`public function getParameterBag(): ParameterBagInterface`
`61`	`61`	`{`
`62`		`- if (null === $this->parameterBag) {`
	`62`	`+ if (!isset($this->parameterBag)) {`
`63`	`63`	`$parameters = $this->parameters;`
`64`	`64`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`65`	`65`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ class ProjectServiceContainer extends Container`
`678`	`678`
`679`	`679`	`public function getParameterBag(): ParameterBagInterface`
`680`	`680`	`{`
`681`		`- if (null === $this->parameterBag) {`
	`681`	`+ if (!isset($this->parameterBag)) {`
`682`	`682`	`$parameters = $this->parameters;`
`683`	`683`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`684`	`684`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ public function setParameter(string $name, $value): void`
`462`	`462`
`463`	`463`	`public function getParameterBag(): ParameterBagInterface`
`464`	`464`	`{`
`465`		`- if (null === $this->parameterBag) {`
	`465`	`+ if (!isset($this->parameterBag)) {`
`466`	`466`	`$parameters = $this->parameters;`
`467`	`467`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`468`	`468`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`