Merge branch '6.4' into 7.0

* 6.4: (26 commits)
  [AssetMapper] Fix: also download files referenced by url() in CSS
  [AssetMapper] Fix eager imports are not deduplicated
  [Mime] Add `TemplatedEmail::$locale` to the serialized props
  fix tests
  add return types to test fixtures
  fix merge
  [Cache] Get TRUNCATE statement from platform
  do not detect the deserialization_path context value twice
  fix detecting the database server version
  [Cache] Add url decoding of password in `RedisTrait` DSN
  [Serializer] Remove incompatible type declaration with PHP 7.2
  [Serializer] Fix test
  Fix denormalizing empty string into object|null parameter
  [PropertyInfo] Fixed promoted property type detection for `PhpStanExtractor`
  [Serializer] Move discrimination to abstract
  [Serializer] Fix deserialization_path missing using contructor
  [Serializer] Fix access to private when Ignore
  [AssetMapper] Adding an option (true by default) to not publish dot files
  [AssetMapper] Fixing out-of-date test on Windows
  [HttpKernel] Fix logging deprecations to the "php" channel when channel "deprecation" is not defined
  ...

Author: fabpot

DependencyInjection/Configuration.php

@@ -860,6 +860,11 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->prototype('scalar')->end()
                             ->example(['*/assets/build/*', '*/*_.scss'])
                         ->end()
+                        // boolean called  defaulting to true
+                        ->booleanNode('exclude_dotfiles')
+                            ->info('If true, any files starting with "." will be excluded from the asset mapper')
+                            ->defaultTrue()
+                        ->end()
                         ->booleanNode('server')
                             ->info('If true, a "dev server" will return the assets from the public directory (true in "debug" mode only by default)')
                             ->defaultValue($this->debug)

DependencyInjection/FrameworkExtension.php

@@ -1325,7 +1325,8 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
 
         $container->getDefinition('asset_mapper.repository')
             ->setArgument(0, $paths)
-            ->setArgument(2, $excludedPathPatterns);
+            ->setArgument(2, $excludedPathPatterns)
+            ->setArgument(3, $config['exclude_dotfiles']);
 
         $container->getDefinition('asset_mapper.public_assets_path_resolver')
             ->setArgument(0, $config['public_prefix']);

Resources/config/asset_mapper.php

@@ -74,6 +74,7 @@
                 abstract_arg('array of asset mapper paths'),
                 param('kernel.project_dir'),
                 abstract_arg('array of excluded path patterns'),
+                abstract_arg('exclude dot files'),
             ])
 
         ->set('asset_mapper.public_assets_path_resolver', PublicAssetsPathResolver::class)

Resources/config/debug_prod.php

@@ -27,7 +27,7 @@
                 param('debug.error_handler.throw_at'),
                 param('kernel.debug'),
                 param('kernel.debug'),
-                service('logger')->nullOnInvalid(),
+                null, // Deprecation logger if different from the one above
             ])
             ->tag('monolog.logger', ['channel' => 'php'])
 

Resources/config/schema/symfony-1.0.xsd

@@ -194,6 +194,7 @@
             <xsd:element name="importmap-script-attribute" type="asset_mapper_attribute" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="exclude-dotfiles" type="xsd:boolean" />
         <xsd:attribute name="server" type="xsd:boolean" />
         <xsd:attribute name="public-prefix" type="xsd:string" />
         <xsd:attribute name="missing-import-mode" type="missing-import-mode" />

Tests/DependencyInjection/ConfigurationTest.php

@@ -137,6 +137,7 @@ public function testAssetMapperCanBeEnabled()
             'importmap_polyfill' => 'es-module-shims',
             'vendor_dir' => '%kernel.project_dir%/assets/vendor',
             'importmap_script_attributes' => [],
+            'exclude_dotfiles' => true,
         ];
 
         $this->assertEquals($defaultConfig, $config['asset_mapper']);
@@ -671,6 +672,7 @@ protected static function getBundleDefaultConfig()
                 'importmap_polyfill' => 'es-module-shims',
                 'vendor_dir' => '%kernel.project_dir%/assets/vendor',
                 'importmap_script_attributes' => [],
+                'exclude_dotfiles' => true,
             ],
             'cache' => [
                 'pools' => [],