Merge branch '3.4'

* 3.4:
  deprecated profiler.matcher configuration
  fixed CS

UPGRADE-3.4.md

@@ -210,6 +210,11 @@ Process
  * The `Symfony\Component\Process\ProcessBuilder` class has been deprecated,
    use the `Symfony\Component\Process\Process` class directly instead.
 
+Profiler
+--------
+
+ * The `profiler.matcher` option has been deprecated.
+
 SecurityBundle
 --------------
 

UPGRADE-4.0.md

@@ -583,6 +583,11 @@ Process
    
  * The `getEnhanceWindowsCompatibility()` and `setEnhanceWindowsCompatibility()` methods of the `Process` class have been removed.
 
+Profiler
+--------
+
+ * The `profiler.matcher` option has been removed.
+
 ProxyManager
 ------------
 

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

@@ -24,6 +24,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
  * Removed `doctrine/cache` from the list of required dependencies in `composer.json`
  * Deprecated `validator.mapping.cache.doctrine.apc` service

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -186,6 +186,7 @@ class Configuration implements ConfigurationInterface
                         ->booleanNode('only_master_requests')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
                         ->arrayNode('matcher')
+                            ->setDeprecated('The "profiler.matcher" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
                             ->canBeEnabled()
                             ->performNoDeepMerging()
                             ->fixXmlConfig('ip')
@@ -220,7 +221,7 @@ class Configuration implements ConfigurationInterface
                                 $workflows = $v;
                                 unset($workflows['enabled']);
 
-                                if (count($workflows) === 1 && isset($workflows[0]['enabled'])) {
+                                if (1 === count($workflows) && isset($workflows[0]['enabled'])) {
                                     $workflows = array();
                                 }