Merge branch '4.0'

* 4.0: (24 commits)
  moved Twig runtime to proper class
  fixed deprecated messages in tests
  add PHP errors options to XML schema definition
  [HttpCache] Unlink tmp file on error
  Added LB translation for #26327 (Errors sign for people that do not see colors)
  [TwigBridge] Fix rendering of currency by MoneyType
  Import InvalidArgumentException in PdoAdapter
  [DI] Do not suggest writing an implementation when multiple exist
  [Intl] Update ICU data to 61.1
  Use 3rd person verb form in command description
  [Validator] Add Japanese translation
  Support phpdbg SAPI in Debug::enable()
  [HttpKernel] DumpDataCollector: do not flush when a dumper is provided
  [DI] Fix hardcoded cache dir for warmups
  [Routing] fix tests
  [Routing] Fixed the importing of files using glob patterns that match multiple resources
  [Ldap] cast to string when checking empty passwords
  [Validator] sync validator translation id
  [WebProfilerBundle] use the router to resolve file links
  no type errors with invalid submitted data types
  ...

Author: nicolas-grekas

Compiler/AutowirePass.php

@@ -360,10 +360,11 @@ private function createTypeNotFoundMessage(TypedReference $reference, $label)
 
             $message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ? sprintf('is missing a parent class (%s)', $parentMsg) : 'was not found');
         } else {
+            $alternatives = $this->createTypeAlternatives($reference);
             $message = $this->container->has($type) ? 'this service is abstract' : 'no such service exists';
-            $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $this->createTypeAlternatives($reference));
+            $message = sprintf('references %s "%s" but %s.%s', $r->isInterface() ? 'interface' : 'class', $type, $message, $alternatives);
 
-            if ($r->isInterface()) {
+            if ($r->isInterface() && !$alternatives) {
                 $message .= ' Did you create a class that implements this interface?';
             }
         }

Dumper/PhpDumper.php

@@ -249,7 +249,7 @@ public function dump(array $options = array())
     'container.build_hash' => '$hash',
     'container.build_id' => '$id',
     'container.build_time' => $time,
-));
+), __DIR__.\\DIRECTORY_SEPARATOR.'Container{$hash}');
 
 EOF;
         } else {
@@ -762,7 +762,7 @@ protected function {$methodName}($lazyInitialization)
         $code .= $this->addServiceInclude($id, $definition, $inlinedDefinitions);
 
         if ($this->getProxyDumper()->isProxyCandidate($definition)) {
-            $factoryCode = $asFile ? "\$this->load(__DIR__.'/%s.php', false)" : '$this->%s(false)';
+            $factoryCode = $asFile ? "\$this->load('%s.php', false)" : '$this->%s(false)';
             $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));
         }
 
@@ -925,7 +925,7 @@ public function __construct()
 
 EOF;
         if (null !== $this->targetDirRegex) {
-            $dir = $this->asFiles ? '$this->targetDirs[0] = \\dirname(__DIR__)' : '__DIR__';
+            $dir = $this->asFiles ? '$this->targetDirs[0] = \\dirname($containerDir)' : '__DIR__';
             $code .= <<<EOF
         \$dir = {$dir};
         for (\$i = 1; \$i <= {$this->targetDirMaxMatches}; ++\$i) {
@@ -935,9 +935,10 @@ public function __construct()
 EOF;
         }
         if ($this->asFiles) {
-            $code = str_replace('$parameters', "\$buildParameters;\n    private \$parameters", $code);
-            $code = str_replace('__construct()', '__construct(array $buildParameters = array())', $code);
+            $code = str_replace('$parameters', "\$buildParameters;\n    private \$containerDir;\n    private \$parameters", $code);
+            $code = str_replace('__construct()', '__construct(array $buildParameters = array(), $containerDir = __DIR__)', $code);
             $code .= "        \$this->buildParameters = \$buildParameters;\n";
+            $code .= "        \$this->containerDir = \$containerDir;\n";
         }
 
         if (Container::class !== $baseClassWithNamespace) {
@@ -989,7 +990,7 @@ public function isCompiled()
 
     protected function load(\$file, \$lazyLoad = true)
     {
-        return require \$file;
+        return require \$this->containerDir.\\DIRECTORY_SEPARATOR.\$file;
     }
 
 EOF;
@@ -1001,7 +1002,7 @@ protected function load(\$file, \$lazyLoad = true)
                 continue;
             }
             if ($this->asFiles) {
-                $proxyLoader = '$this->load(__DIR__."/{$class}.php")';
+                $proxyLoader = '$this->load("{$class}.php")';
             } elseif ($this->namespace) {
                 $proxyLoader = 'class_alias("'.$this->namespace.'\\\\{$class}", $class, false)';
             } else {
@@ -1050,7 +1051,7 @@ private function addRemovedIds(): string
             return '';
         }
         if ($this->asFiles) {
-            $code = "require __DIR__.'/removed-ids.php'";
+            $code = "require \$this->containerDir.\\DIRECTORY_SEPARATOR.'removed-ids.php'";
         } else {
             $code = '';
             $ids = array_keys($ids);
@@ -1093,7 +1094,7 @@ private function addFileMap(): string
         ksort($definitions);
         foreach ($definitions as $id => $definition) {
             if (!$definition->isSynthetic() && $definition->isPublic() && !$this->isHotPath($definition)) {
-                $code .= sprintf("            %s => __DIR__.'/%s.php',\n", $this->doExport($id), $this->generateMethodName($id));
+                $code .= sprintf("            %s => '%s.php',\n", $this->doExport($id), $this->generateMethodName($id));
             }
         }
 
@@ -1665,7 +1666,7 @@ private function getServiceCall(string $id, Reference $reference = null): string
                     $code = sprintf('$this->%s[\'%s\'] = %s', $definition->isPublic() ? 'services' : 'privates', $id, $code);
                 }
             } elseif ($this->asFiles && !$this->isHotPath($definition)) {
-                $code = sprintf("\$this->load(__DIR__.'/%s.php')", $this->generateMethodName($id));
+                $code = sprintf("\$this->load('%s.php')", $this->generateMethodName($id));
                 if (!$definition->isShared()) {
                     $factory = sprintf('$this->factories%s[\'%s\']', $definition->isPublic() ? '' : "['service_container']", $id);
                     $code = sprintf('(isset(%s) ? %1$s() : %s)', $factory, $code);
@@ -1803,7 +1804,7 @@ private function export($value)
             $prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';
             $suffix = $matches[0][1] + strlen($matches[0][0]);
             $suffix = isset($value[$suffix]) ? '.'.$this->doExport(substr($value, $suffix), true) : '';
-            $dirname = '__DIR__';
+            $dirname = $this->asFiles ? '$this->containerDir' : '__DIR__';
             $offset = 1 + $this->targetDirMaxMatches - count($matches);
 
             if ($this->asFiles || 0 < $offset) {

Tests/Compiler/AutowirePassTest.php

@@ -21,6 +21,7 @@
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -580,10 +581,6 @@ public function testIgnoreServiceWithClassNotExisting()
         $this->assertTrue($container->hasDefinition('bar'));
     }
 
-    /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
-     * @expectedExceptionMessage Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollision::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".
-     */
     public function testSetterInjectionCollisionThrowsException()
     {
         $container = new ContainerBuilder();
@@ -596,7 +593,14 @@ public function testSetterInjectionCollisionThrowsException()
         (new AutowireRequiredMethodsPass())->process($container);
 
         $pass = new AutowirePass();
-        $pass->process($container);
+
+        try {
+            $pass->process($container);
+        } catch (AutowiringFailedException $e) {
+        }
+
+        $this->assertNotNull($e);
+        $this->assertSame('Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollision::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".', $e->getMessage());
     }
 
     /**

Tests/Fixtures/php/services9_as_files.txt

@@ -60,7 +60,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 $this->services['baz'] = $instance = new \Baz();
 
-$instance->setFoo(($this->services['foo_with_inline'] ?? $this->load(__DIR__.'/getFooWithInlineService.php')));
+$instance->setFoo(($this->services['foo_with_inline'] ?? $this->load('getFooWithInlineService.php')));
 
 return $instance;
 
@@ -75,7 +75,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 $this->services['configured_service'] = $instance = new \stdClass();
 
 $a = new \ConfClass();
-$a->setFoo(($this->services['baz'] ?? $this->load(__DIR__.'/getBazService.php')));
+$a->setFoo(($this->services['baz'] ?? $this->load('getBazService.php')));
 
 $a->configureStdClass($instance);
 
@@ -145,7 +145,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'factory_service' shared service.
 
-return $this->services['factory_service'] = ($this->services['foo.baz'] ?? $this->load(__DIR__.'/getFoo_BazService.php'))->getInstance();
+return $this->services['factory_service'] = ($this->services['foo.baz'] ?? $this->load('getFoo_BazService.php'))->getInstance();
 
     [Container%s/getFactoryServiceSimpleService.php] => <?php
 
@@ -155,7 +155,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'factory_service_simple' shared service.
 
-return $this->services['factory_service_simple'] = ($this->privates['factory_simple'] ?? $this->load(__DIR__.'/getFactorySimpleService.php'))->getInstance();
+return $this->services['factory_service_simple'] = ($this->privates['factory_simple'] ?? $this->load('getFactorySimpleService.php'))->getInstance();
 
     [Container%s/getFactorySimpleService.php] => <?php
 
@@ -177,7 +177,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'foo' shared service.
 
-$a = ($this->services['foo.baz'] ?? $this->load(__DIR__.'/getFoo_BazService.php'));
+$a = ($this->services['foo.baz'] ?? $this->load('getFoo_BazService.php'));
 
 $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this);
 
@@ -214,7 +214,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 $this->factories['foo_bar'] = function () {
     // Returns the public 'foo_bar' service.
 
-    return new \Bar\FooClass(($this->services['deprecated_service'] ?? $this->load(__DIR__.'/getDeprecatedServiceService.php')));
+    return new \Bar\FooClass(($this->services['deprecated_service'] ?? $this->load('getDeprecatedServiceService.php')));
 };
 
 return $this->factories['foo_bar']();
@@ -232,7 +232,7 @@ $this->services['foo_with_inline'] = $instance = new \Foo();
 $a = new \Bar();
 
 $a->pub = 'pub';
-$a->setBaz(($this->services['baz'] ?? $this->load(__DIR__.'/getBazService.php')));
+$a->setBaz(($this->services['baz'] ?? $this->load('getBazService.php')));
 
 $instance->setBar($a);
 
@@ -247,7 +247,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // Returns the public 'lazy_context' shared service.
 
 return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
-    yield 'k1' => ($this->services['foo.baz'] ?? $this->load(__DIR__.'/getFoo_BazService.php'));
+    yield 'k1' => ($this->services['foo.baz'] ?? $this->load('getFoo_BazService.php'));
     yield 'k2' => $this;
 }, 2), new RewindableGenerator(function () {
     return new \EmptyIterator();
@@ -262,7 +262,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // Returns the public 'lazy_context_ignore_invalid_ref' shared service.
 
 return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
-    yield 0 => ($this->services['foo.baz'] ?? $this->load(__DIR__.'/getFoo_BazService.php'));
+    yield 0 => ($this->services['foo.baz'] ?? $this->load('getFoo_BazService.php'));
 }, 1), new RewindableGenerator(function () {
     return new \EmptyIterator();
 }, 0));
@@ -279,9 +279,9 @@ include_once ($this->targetDirs[0].'/Fixtures/includes/foo.php');
 
 $this->services['method_call1'] = $instance = new \Bar\FooClass();
 
-$instance->setBar(($this->services['foo'] ?? $this->load(__DIR__.'/getFooService.php')));
+$instance->setBar(($this->services['foo'] ?? $this->load('getFooService.php')));
 $instance->setBar(NULL);
-$instance->setBar((($this->services['foo'] ?? $this->load(__DIR__.'/getFooService.php'))->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+$instance->setBar((($this->services['foo'] ?? $this->load('getFooService.php'))->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
 
 return $instance;
 
@@ -326,7 +326,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'runtime_error' shared service.
 
-return $this->services['runtime_error'] = new \stdClass(($this->privates['errored_definition'] ?? $this->load(__DIR__.'/getErroredDefinitionService.php')));
+return $this->services['runtime_error'] = new \stdClass(($this->privates['errored_definition'] ?? $this->load('getErroredDefinitionService.php')));
 
     [Container%s/getServiceFromStaticMethodService.php] => <?php
 
@@ -347,7 +347,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 // Returns the public 'tagged_iterator' shared service.
 
 return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-    yield 0 => ($this->services['foo'] ?? $this->load(__DIR__.'/getFooService.php'));
+    yield 0 => ($this->services['foo'] ?? $this->load('getFooService.php'));
     yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
 }, 2));
 
@@ -382,6 +382,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 class ProjectServiceContainer extends Container
 {
     private $buildParameters;
+    private $containerDir;
     private $parameters;
     private $targetDirs = array();
 
@@ -390,13 +391,14 @@ class ProjectServiceContainer extends Container
      */
     protected $privates = array();
 
-    public function __construct(array $buildParameters = array())
+    public function __construct(array $buildParameters = array(), $containerDir = __DIR__)
     {
-        $dir = $this->targetDirs[0] = \dirname(__DIR__);
+        $dir = $this->targetDirs[0] = \dirname($containerDir);
         for ($i = 1; $i <= 5; ++$i) {
             $this->targetDirs[$i] = $dir = \dirname($dir);
         }
         $this->buildParameters = $buildParameters;
+        $this->containerDir = $containerDir;
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = array();
@@ -407,29 +409,29 @@ class ProjectServiceContainer extends Container
             'bar' => 'getBarService',
         );
         $this->fileMap = array(
-            'BAR' => __DIR__.'/getBAR2Service.php',
-            'BAR2' => __DIR__.'/getBAR22Service.php',
-            'bar2' => __DIR__.'/getBar23Service.php',
-            'baz' => __DIR__.'/getBazService.php',
-            'configured_service' => __DIR__.'/getConfiguredServiceService.php',
-            'configured_service_simple' => __DIR__.'/getConfiguredServiceSimpleService.php',
-            'decorator_service' => __DIR__.'/getDecoratorServiceService.php',
-            'decorator_service_with_name' => __DIR__.'/getDecoratorServiceWithNameService.php',
-            'deprecated_service' => __DIR__.'/getDeprecatedServiceService.php',
-            'factory_service' => __DIR__.'/getFactoryServiceService.php',
-            'factory_service_simple' => __DIR__.'/getFactoryServiceSimpleService.php',
-            'foo' => __DIR__.'/getFooService.php',
-            'foo.baz' => __DIR__.'/getFoo_BazService.php',
-            'foo_bar' => __DIR__.'/getFooBarService.php',
-            'foo_with_inline' => __DIR__.'/getFooWithInlineService.php',
-            'lazy_context' => __DIR__.'/getLazyContextService.php',
-            'lazy_context_ignore_invalid_ref' => __DIR__.'/getLazyContextIgnoreInvalidRefService.php',
-            'method_call1' => __DIR__.'/getMethodCall1Service.php',
-            'new_factory_service' => __DIR__.'/getNewFactoryServiceService.php',
-            'non_shared_foo' => __DIR__.'/getNonSharedFooService.php',
-            'runtime_error' => __DIR__.'/getRuntimeErrorService.php',
-            'service_from_static_method' => __DIR__.'/getServiceFromStaticMethodService.php',
-            'tagged_iterator' => __DIR__.'/getTaggedIteratorService.php',
+            'BAR' => 'getBAR2Service.php',
+            'BAR2' => 'getBAR22Service.php',
+            'bar2' => 'getBar23Service.php',
+            'baz' => 'getBazService.php',
+            'configured_service' => 'getConfiguredServiceService.php',
+            'configured_service_simple' => 'getConfiguredServiceSimpleService.php',
+            'decorator_service' => 'getDecoratorServiceService.php',
+            'decorator_service_with_name' => 'getDecoratorServiceWithNameService.php',
+            'deprecated_service' => 'getDeprecatedServiceService.php',
+            'factory_service' => 'getFactoryServiceService.php',
+            'factory_service_simple' => 'getFactoryServiceSimpleService.php',
+            'foo' => 'getFooService.php',
+            'foo.baz' => 'getFoo_BazService.php',
+            'foo_bar' => 'getFooBarService.php',
+            'foo_with_inline' => 'getFooWithInlineService.php',
+            'lazy_context' => 'getLazyContextService.php',
+            'lazy_context_ignore_invalid_ref' => 'getLazyContextIgnoreInvalidRefService.php',
+            'method_call1' => 'getMethodCall1Service.php',
+            'new_factory_service' => 'getNewFactoryServiceService.php',
+            'non_shared_foo' => 'getNonSharedFooService.php',
+            'runtime_error' => 'getRuntimeErrorService.php',
+            'service_from_static_method' => 'getServiceFromStaticMethodService.php',
+            'tagged_iterator' => 'getTaggedIteratorService.php',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
@@ -456,12 +458,12 @@ class ProjectServiceContainer extends Container
 
     public function getRemovedIds()
     {
-        return require __DIR__.'/removed-ids.php';
+        return require $this->containerDir.\DIRECTORY_SEPARATOR.'removed-ids.php';
     }
 
     protected function load($file, $lazyLoad = true)
     {
-        return require $file;
+        return require $this->containerDir.\DIRECTORY_SEPARATOR.$file;
     }
 
     /**
@@ -471,7 +473,7 @@ class ProjectServiceContainer extends Container
      */
     protected function getBarService()
     {
-        $a = ($this->services['foo.baz'] ?? $this->load(__DIR__.'/getFoo_BazService.php'));
+        $a = ($this->services['foo.baz'] ?? $this->load('getFoo_BazService.php'));
 
         $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
 
@@ -580,6 +582,6 @@ return new \Container%s\ProjectServiceContainer(array(
     'container.build_hash' => '%s',
     'container.build_id' => '%s',
     'container.build_time' => %d,
-));
+), __DIR__.\DIRECTORY_SEPARATOR.'Container%s');
 
 )