Merge branch '4.1'

* 4.1:
  SCA: removed unused variables
  Remove duplicate condition
  fix useless space in docblock
  remove unneeded tearDown method
  [Intl] Update the ICU data to 63.1
  [FrameworkBundle] Fix broken exception message
  [Messenger] send using the routing_key for AMQP transport
  also clean away the NO_AUTO_CACHE_CONTROL_HEADER if we have no session
  [TwigBundle] Fix usage of TwigBundle without FrameworkBundle
  Revert "fixed CS"
  [Serializer] Reduce class discriminator overhead
  Skip empty proxy code
  [Security] Fix "exclude-from-classmap"
  [Security] Removed unsed trait import
  [Config] Fix @method annotation
  add missing double-quotes to extra_fields output message
  [DI] Default undefined env to empty string during compile
  Convert InsufficientAuthenticationException to HttpException

Author: nicolas-grekas

Compiler/ValidateEnvPlaceholdersPass.php

@@ -48,7 +48,7 @@ public function process(ContainerBuilder $container)
             foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
                 $values = array();
                 if (false === $i = strpos($env, ':')) {
-                    $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : null;
+                    $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::$typeFixtures['string'];
                     $defaultType = null !== $default ? self::getType($default) : 'string';
                     $values[$defaultType] = $default;
                 } else {

ContainerBuilder.php

@@ -1124,7 +1124,7 @@ private function createService(Definition $definition, array &$inlineServices, $
                 }
             }
         } else {
-            $r = new \ReflectionClass($class = $parameterBag->resolveValue($definition->getClass()));
+            $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
 
             $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
 

Dumper/PhpDumper.php

@@ -403,7 +403,9 @@ private function generateProxyClasses()
             $alreadyGenerated[$class] = true;
             // register class' reflector for resource tracking
             $this->container->getReflectionClass($class);
-            $proxyCode = "\n".$proxyDumper->getProxyCode($definition);
+            if ("\n" === $proxyCode = "\n".$proxyDumper->getProxyCode($definition)) {
+                continue;
+            }
             if ($strip) {
                 $proxyCode = "<?php\n".$proxyCode;
                 $proxyCode = substr(Kernel::stripComments($proxyCode), 5);

Loader/YamlFileLoader.php

@@ -802,7 +802,7 @@ private function checkDefinition($id, array $definition, $file)
     {
         if ($this->isLoadingInstanceof) {
             $keywords = self::$instanceofKeywords;
-        } elseif ($throw = (isset($definition['resource']) || isset($definition['namespace']))) {
+        } elseif (isset($definition['resource']) || isset($definition['namespace'])) {
             $keywords = self::$prototypeKeywords;
         } else {
             $keywords = self::$serviceKeywords;

Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

@@ -48,6 +48,7 @@ public function testDefaultEnvWithoutPrefixIsValidatedInConfig()
         $container->registerExtension($ext = new EnvExtension());
         $container->prependExtensionConfig('env_extension', $expected = array(
             'float_node' => '%env(FLOATISH)%',
+            'string_node' => '%env(UNDEFINED)%',
         ));
 
         $this->doProcess($container);
@@ -313,6 +314,14 @@ public function getConfigTreeBuilder()
                 ->arrayNode('simple_array_node')->end()
                 ->enumNode('enum_node')->values(array('a', 'b'))->end()
                 ->variableNode('variable_node')->end()
+                ->scalarNode('string_node')
+                    ->validate()
+                        ->ifTrue(function ($value) {
+                            return !\is_string($value);
+                        })
+                        ->thenInvalid('%s is not a string')
+                    ->end()
+                ->end()
             ->end();
 
         return $treeBuilder;