fixup

HeahDude · HeahDude · commit e47d0707fc76 · 2022-12-06T09:02:06.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -698,7 +698,7 @@ public function prependExtensionConfig(string $name, array $config)
      *
      * @throws ParameterNotFoundException if the parameter is not defined
      */
-    public function deprecateParameter(string $name, string $package, string $version, ?string $message = null): void
+    public function deprecateParameter(string $name, string $package, string $version, string $message = null): void
     {
         if (!$this->parameterBag instanceof ParameterBag) {
             throw new BadMethodCallException(sprintf('The parameter bag must be an instance of "%s" to call "%s".', ParameterBag::class, __METHOD__));
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1628,7 +1628,7 @@ public function getParameterBag(): ParameterBagInterface
             $code = preg_replace('/^.*buildParameters.*\n(\s*__trigger_deprecation__\n)?.*\n.*\n\n?/m', '', $code);
         }
         if (($bag = $this->container->getParameterBag()) instanceof ParameterBag && $bag->allDeprecated()) {
-            $code = preg_replace("/( +)__trigger_deprecation__/m", <<<'EOF'
+            $code = preg_replace('/( +)__trigger_deprecation__/m', <<<'EOF'
                 $1if (isset($this->deprecatedParameters[$name])) {
                 $1    $deprecated = $this->deprecatedParameters[$name];
                 $1    trigger_deprecation($deprecated['package'], $deprecated['version'], $deprecated['message'], $name);
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -49,7 +49,7 @@ public function set(string $name, array|bool|string|int|float|\UnitEnum|null $va
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
-    public function deprecate(string $name, string $package, string $version, ?string $message = null)
+    public function deprecate(string $name, string $package, string $version, string $message = null)
     {
         throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');
     }
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -114,7 +114,7 @@ public function set(string $name, array|bool|string|int|float|\UnitEnum|null $va
      *
      * @throws ParameterNotFoundException if the parameter is not defined
      */
-    public function deprecate(string $name, string $package, string $version, ?string $message = null)
+    public function deprecate(string $name, string $package, string $version, string $message = null)
     {
         if (!\array_key_exists($name, $this->parameters)) {
             throw new ParameterNotFoundException($name);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -149,7 +149,7 @@ public function testDeprecateParameterThrowsWhenParameterIsUndefined()
 
     public function testDeprecateParameterThrowsWhenParameterBagIsNotInternal()
     {
-        $builder = new ContainerBuilder(new class implements ParameterBagInterface {
+        $builder = new ContainerBuilder(new class() implements ParameterBagInterface {
             public function clear()
             {
             }

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ public function prependExtensionConfig(string $name, array $config)`
`698`	`698`	`*`
`699`	`699`	`* @throws ParameterNotFoundException if the parameter is not defined`
`700`	`700`	`*/`
`701`		`- public function deprecateParameter(string $name, string $package, string $version, ?string $message = null): void`
	`701`	`+ public function deprecateParameter(string $name, string $package, string $version, string $message = null): void`
`702`	`702`	`{`
`703`	`703`	`if (!$this->parameterBag instanceof ParameterBag) {`
`704`	`704`	`throw new BadMethodCallException(sprintf('The parameter bag must be an instance of "%s" to call "%s".', ParameterBag::class, __METHOD__));`
Original file line number	Diff line number	Diff line change
`@@ -1628,7 +1628,7 @@ public function getParameterBag(): ParameterBagInterface`
`1628`	`1628`	`$code = preg_replace('/^.buildParameters.\n(\s__trigger_deprecation__\n)?.\n.*\n\n?/m', '', $code);`
`1629`	`1629`	`}`
`1630`	`1630`	`if (($bag = $this->container->getParameterBag()) instanceof ParameterBag && $bag->allDeprecated()) {`
`1631`		`- $code = preg_replace("/( +)__trigger_deprecation__/m", <<<'EOF'`
	`1631`	`+ $code = preg_replace('/( +)__trigger_deprecation__/m', <<<'EOF'`
`1632`	`1632`	`$1if (isset($this->deprecatedParameters[$name])) {`
`1633`	`1633`	`$1 $deprecated = $this->deprecatedParameters[$name];`
`1634`	`1634`	`$1 trigger_deprecation($deprecated['package'], $deprecated['version'], $deprecated['message'], $name);`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function set(string $name, array\|bool\|string\|int\|float\|\UnitEnum\|null $va`
`49`	`49`	`throw new LogicException('Impossible to call set() on a frozen ParameterBag.');`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function deprecate(string $name, string $package, string $version, ?string $message = null)`
	`52`	`+ public function deprecate(string $name, string $package, string $version, string $message = null)`
`53`	`53`	`{`
`54`	`54`	`throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function set(string $name, array\|bool\|string\|int\|float\|\UnitEnum\|null $va`
`114`	`114`	`*`
`115`	`115`	`* @throws ParameterNotFoundException if the parameter is not defined`
`116`	`116`	`*/`
`117`		`- public function deprecate(string $name, string $package, string $version, ?string $message = null)`
	`117`	`+ public function deprecate(string $name, string $package, string $version, string $message = null)`
`118`	`118`	`{`
`119`	`119`	`if (!\array_key_exists($name, $this->parameters)) {`
`120`	`120`	`throw new ParameterNotFoundException($name);`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function testDeprecateParameterThrowsWhenParameterIsUndefined()`
`149`	`149`
`150`	`150`	`public function testDeprecateParameterThrowsWhenParameterBagIsNotInternal()`
`151`	`151`	`{`
`152`		`- $builder = new ContainerBuilder(new class implements ParameterBagInterface {`
	`152`	`+ $builder = new ContainerBuilder(new class() implements ParameterBagInterface {`
`153`	`153`	`public function clear()`
`154`	`154`	`{`
`155`	`155`	`}`