[DependencyInjection] Throw when using $this or its internal scope from PHP config files; use the $loader variable instead

nicolas-grekas · nicolas-grekas · commit 7ffcd645256a · 2025-12-04T17:57:16.000+01:00
diff --git a/UPGRADE-7.4.md b/UPGRADE-7.4.md
@@ -33,10 +33,10 @@ Console
 DependencyInjection
 -------------------
 
+ * [BC BREAK] Throw when using `$this` or its internal scope from PHP config files; use the `$loader` variable instead
  * Add argument `$target` to `ContainerBuilder::registerAliasForArgument()`
  * Add argument `$throwOnAbstract` to `ContainerBuilder::findTaggedResourceIds()`
  * Deprecate registering a service without a class when its id is a non-existing FQCN
- * Deprecate using `$this` or its internal scope from PHP config files; use the `$loader` variable instead
  * Deprecate XML configuration format, use YAML or PHP instead
  * Deprecate `ExtensionInterface::getXsdValidationBasePath()` and `getNamespace()`;
    bundles that need to support older versions of Symfony can keep the methods
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 7.4
 ---
 
+ * [BC BREAK] Throw when using `$this` or its internal scope from PHP config files; use the `$loader` variable instead
  * Allow adding resource tags using any config format
  * Allow `#[AsAlias]` to be extended
  * Parse attributes found on abstract classes for resource definitions
@@ -12,7 +13,6 @@ CHANGELOG
  * Allow multiple `#[AsDecorator]` attributes
  * Handle declaring services using PHP arrays that follow the same shape as corresponding yaml files
  * Add `AppReference` to help writing PHP configs using yaml-like array-shapes
- * Deprecate using `$this` or its internal scope from PHP config files; use the `$loader` variable instead
  * Deprecate XML configuration format, use YAML or PHP instead
  * Deprecate `ExtensionInterface::getXsdValidationBasePath()` and `getNamespace()`
  * Deprecate the fluent PHP format for semantic configuration, use `$container->extension()` or return an array instead
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -98,7 +98,7 @@ class_alias(AppReference::class, App::class);
                     $result = null;
                 }
 
-                trigger_deprecation('symfony/dependency-injection', '7.4', 'Using `$this` or its internal scope in config files is deprecated, use the `$loader` variable instead in "%s" on line %d.', $e->getFile(), $e->getLine());
+                throw new LogicException(\sprintf('Using `$this` or its internal scope in config files is not supported anymore, use the `$loader` variable instead in "%s" on line %d.', $e->getFile(), $e->getLine()), $e->getCode(), $e);
             }
 
             if (\is_object($result) && \is_callable($result)) {
@@ -301,10 +301,3 @@ private function configBuilder(string $namespace): ConfigBuilderInterface
         return $loader();
     }
 }
-
-/**
- * @internal
- */
-final class ProtectedPhpFileLoader extends PhpFileLoader
-{
-}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -331,14 +331,13 @@ public function testNamedClosure()
         $this->assertStringEqualsFile(\dirname(__DIR__).'/Fixtures/php/named_closure_compiled.php', $dumper->dump());
     }
 
-    #[IgnoreDeprecations]
-    #[Group('legacy')]
     public function testTriggersDeprecationWhenAccessingLoaderInternalScope()
     {
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $loader = new PhpFileLoader(new ContainerBuilder(), new FileLocator($fixtures.'/config'));
 
-        $this->expectUserDeprecationMessageMatches('{^Since symfony/dependency-injection 7.4: Using \`\$this\` or its internal scope in config files is deprecated, use the \`\$loader\` variable instead in ".+" on line \d+\.$}');
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessageMatches('/^Using \`\$this\` or its internal scope in config files is not supported anymore, use the \`\$loader\` variable instead in ".+" on line \d+\.$/');
 
         $loader->load('legacy_internal_scope.php');
     }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class_alias(AppReference::class, App::class);`
`98`	`98`	`$result = null;`
`99`	`99`	`}`
`100`	`100`
`101`		- trigger_deprecation('symfony/dependency-injection', '7.4', 'Using `$this` or its internal scope in config files is deprecated, use the `$loader` variable instead in "%s" on line %d.', $e->getFile(), $e->getLine());
	`101`	+ throw new LogicException(\sprintf('Using `$this` or its internal scope in config files is not supported anymore, use the `$loader` variable instead in "%s" on line %d.', $e->getFile(), $e->getLine()), $e->getCode(), $e);
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`if (\is_object($result) && \is_callable($result)) {`
`@@ -301,10 +301,3 @@ private function configBuilder(string $namespace): ConfigBuilderInterface`
`301`	`301`	`return $loader();`
`302`	`302`	`}`
`303`	`303`	`}`
`304`		`-`
`305`		`-/**`
`306`		`- * @internal`
`307`		`- */`
`308`		`-final class ProtectedPhpFileLoader extends PhpFileLoader`
`309`		`-{`
`310`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -331,14 +331,13 @@ public function testNamedClosure()`
`331`	`331`	`$this->assertStringEqualsFile(\dirname(__DIR__).'/Fixtures/php/named_closure_compiled.php', $dumper->dump());`
`332`	`332`	`}`
`333`	`333`
`334`		`- #[IgnoreDeprecations]`
`335`		`- #[Group('legacy')]`
`336`	`334`	`public function testTriggersDeprecationWhenAccessingLoaderInternalScope()`
`337`	`335`	`{`
`338`	`336`	`$fixtures = realpath(__DIR__.'/../Fixtures');`
`339`	`337`	`$loader = new PhpFileLoader(new ContainerBuilder(), new FileLocator($fixtures.'/config'));`
`340`	`338`
`341`		- $this->expectUserDeprecationMessageMatches('{^Since symfony/dependency-injection 7.4: Using \`\$this\` or its internal scope in config files is deprecated, use the \`\$loader\` variable instead in ".+" on line \d+\.$}');
	`339`	`+ $this->expectException(LogicException::class);`
	`340`	+ $this->expectExceptionMessageMatches('/^Using \`\$this\` or its internal scope in config files is not supported anymore, use the \`\$loader\` variable instead in ".+" on line \d+\.$/');
`342`	`341`
`343`	`342`	`$loader->load('legacy_internal_scope.php');`
`344`	`343`	`}`