remove ability to access $this and the loader's internal state

Author: xabbuh

CHANGELOG.md

@@ -4,6 +4,7 @@ CHANGELOG
 8.0
 ---
 
+ * Remove support for using `$this` or the loader's internal scope from PHP config files; use the `$loader` variable instead
  * Remove `ExtensionInterface::getXsdValidationBasePath()` and `getNamespace()` without alternatives, the XML configuration format is no longer supported
  * Add argument `$throwOnAbstract` to `ContainerBuilder::findTaggedResourceIds()`
  * Registering a service without a class when its id is a non-existing FQCN throws an error

Loader/PhpFileLoader.php

@@ -75,20 +75,8 @@ class_exists(ContainerConfigurator::class);
         }, null, null);
 
         try {
-            try {
-                if (1 === $result = $load($path, $this->env)) {
-                    $result = null;
-                }
-            } catch (\Error $e) {
-                $load = \Closure::bind(function ($path, $env) use ($container, $loader, $resource, $type) {
-                    return include $path;
-                }, $this, ProtectedPhpFileLoader::class);
-
-                if (1 === $result = $load($path, $this->env)) {
-                    $result = null;
-                }
-
-                trigger_deprecation('symfony/dependency-injection', '8.1', '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());
+            if (1 === $result = $load($path, $this->env)) {
+                $result = null;
             }
 
             if (\is_object($result) && \is_callable($result)) {

Tests/Loader/PhpFileLoaderTest.php

@@ -15,8 +15,6 @@
 require_once __DIR__.'/../Fixtures/includes/fixture_app_services.php';
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
-use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\FileLocator;
@@ -368,16 +366,4 @@ public function testReturnsGenerator()
         $loader->load('return_generator.php');
         $this->assertSame([['color' => 'red']], $container->getExtensionConfig('acme'));
     }
-
-    #[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 8.1: Using \`\$this\` or its internal scope in config files is deprecated, use the \`\$loader\` variable instead in ".+" on line \d+\.$}');
-
-        $loader->load('legacy_internal_scope.php');
-    }
 }