diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index dc5290c098438..2c21302bed491 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -899,6 +899,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)
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 132904c303f1d..8a42bfb29ee20 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1351,7 +1351,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']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
index 9139a6c898fc9..f41574d3b58da 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/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)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index dfdf84893c82c..6483732ef7364 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -196,6 +196,7 @@
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: