fixed previous commit

src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php

@@ -30,6 +30,10 @@ class PhpFileLoader extends FileLoader
      */
     public function load($file)
     {
+        // the container and loader variables are exposed to the included file below
+        $container = $this->container;
+        $loader = $this;
+
         $path = $this->findFile($file);
         $this->currentDir = dirname($path);
         $this->container->addResource(new FileResource($path));

src/Symfony/Component/Routing/Loader/PhpFileLoader.php

@@ -30,6 +30,9 @@ class PhpFileLoader extends FileLoader
      */
     public function load($file, $type = null)
     {
+        // the loader variable is exposed to the included file below
+        $loader = $this;
+
         $path = $this->locator->locate($file);
 
         $collection = include $path;

src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php

@@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Http\EntryPoint;
 use Symfony\Component\EventDispatcher\EventInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
-use Symfony\Component\HttpKernel\Security\EntryPoint\NonceExpiredException;
+use Symfony\Component\Security\Core\Exception\NonceExpiredException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;

src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php

@@ -21,7 +21,7 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\HttpKernel\Security\EntryPoint\NonceExpiredException;
+use Symfony\Component\Security\Core\Exception\NonceExpiredException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;