Merge branch '2.8' into 3.4

* 2.8:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer

Author: nicolas-grekas

.php_cs.dist

@@ -12,6 +12,10 @@ return PhpCsFixer\Config::create()
         'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
         'array_syntax' => array('syntax' => 'long'),
         'protected_to_private' => false,
+        // TODO remove the disabling once https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3876 is merged and released
+        'native_constant_invocation' => false,
+        // Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
+        'native_function_invocation' => array('include' => array('@compiler_optimized'), 'scope' => 'namespaced'),
     ))
     ->setRiskyAllowed(true)
     ->setFinder(
@@ -24,21 +28,24 @@ return PhpCsFixer\Config::create()
                 'Symfony/Component/Routing/Tests/Fixtures/dumper',
                 // fixture templates
                 'Symfony/Component/Templating/Tests/Fixtures/templates',
+                'Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TemplatePathsCache',
                 'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
                 // generated fixtures
                 'Symfony/Component/VarDumper/Tests/Fixtures',
                 // resource templates
                 'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
+                // explicit trigger_error tests
+                'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
             ))
+            // Support for older PHPunit version
+            ->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')
             // file content autogenerated by `var_export`
             ->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
             // test template
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit heredoc test
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
             // explicit trigger_error tests
-            ->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt')
-            ->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt')
             ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
     )
 ;

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -54,7 +54,7 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null)
             $initialized = isset($this->initialized[$eventName]);
 
             foreach ($this->listeners[$eventName] as $hash => $listener) {
-                if (!$initialized && is_string($listener)) {
+                if (!$initialized && \is_string($listener)) {
                     $this->listeners[$eventName][$hash] = $listener = $this->container->get($listener);
                 }
 
@@ -98,7 +98,7 @@ public function hasListeners($event)
      */
     public function addEventListener($events, $listener)
     {
-        if (is_string($listener)) {
+        if (\is_string($listener)) {
             if ($this->initialized) {
                 throw new \RuntimeException('Adding lazy-loading listeners after construction is not supported.');
             }
@@ -124,7 +124,7 @@ public function addEventListener($events, $listener)
      */
     public function removeEventListener($events, $listener)
     {
-        if (is_string($listener)) {
+        if (\is_string($listener)) {
             $hash = '_service_'.$listener;
         } else {
             // Picks the hash code related to that listener

src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

@@ -134,14 +134,14 @@ private function sanitizeQuery($connectionName, $query)
         if (null === $query['params']) {
             $query['params'] = array();
         }
-        if (!is_array($query['params'])) {
+        if (!\is_array($query['params'])) {
             $query['params'] = array($query['params']);
         }
         foreach ($query['params'] as $j => $param) {
             if (isset($query['types'][$j])) {
                 // Transform the param according to the type
                 $type = $query['types'][$j];
-                if (is_string($type)) {
+                if (\is_string($type)) {
                     $type = Type::getType($type);
                 }
                 if ($type instanceof Type) {
@@ -172,15 +172,15 @@ private function sanitizeQuery($connectionName, $query)
      */
     private function sanitizeParam($var)
     {
-        if (is_object($var)) {
-            $className = get_class($var);
+        if (\is_object($var)) {
+            $className = \get_class($var);
 
             return method_exists($var, '__toString') ?
                 array(sprintf('Object(%s): "%s"', $className, $var->__toString()), false) :
                 array(sprintf('Object(%s)', $className), false);
         }
 
-        if (is_array($var)) {
+        if (\is_array($var)) {
             $a = array();
             $original = true;
             foreach ($var as $k => $v) {
@@ -192,7 +192,7 @@ private function sanitizeParam($var)
             return array($a, $original);
         }
 
-        if (is_resource($var)) {
+        if (\is_resource($var)) {
             return array(sprintf('Resource(%s)', get_resource_type($var)), false);
         }
 

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -141,7 +141,7 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
      */
     protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
     {
-        $bundleDir = dirname($bundle->getFileName());
+        $bundleDir = \dirname($bundle->getFileName());
 
         if (!$bundleConfig['type']) {
             $bundleConfig['type'] = $this->detectMetadataDriver($bundleDir, $container);
@@ -153,7 +153,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
         }
 
         if (!$bundleConfig['dir']) {
-            if (in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
+            if (\in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
             } else {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
@@ -240,7 +240,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
             throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
         }
 
-        if (!in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
+        if (!\in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
             throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
                 '"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
                 'You can register them by adding a new driver to the '.
@@ -272,7 +272,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
             // add the closest existing directory as a resource
             $resource = $dir.'/'.$configPath;
             while (!is_dir($resource)) {
-                $resource = dirname($resource);
+                $resource = \dirname($resource);
             }
             $container->fileExists($resource, false);
 

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php

@@ -59,7 +59,7 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, $mappi
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if ($container->fileExists($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
+            if ($container->fileExists($file = \dirname($reflection->getFileName()).'/'.$validationPath)) {
                 $files[] = $file;
             }
         }

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php

@@ -141,7 +141,7 @@ private function findAndSortTags($tagName, ContainerBuilder $container)
 
         if ($sortedTags) {
             krsort($sortedTags);
-            $sortedTags = call_user_func_array('array_merge', $sortedTags);
+            $sortedTags = \call_user_func_array('array_merge', $sortedTags);
         }
 
         return $sortedTags;

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -124,7 +124,7 @@ public function __construct($driver, array $namespaces, array $managerParameters
         $this->managerParameters = $managerParameters;
         $this->driverPattern = $driverPattern;
         $this->enabledParameter = $enabledParameter;
-        if (count($aliasMap) && (!$configurationPattern || !$registerAliasMethodName)) {
+        if (\count($aliasMap) && (!$configurationPattern || !$registerAliasMethodName)) {
             throw new \InvalidArgumentException('configurationPattern and registerAliasMethodName are required to register namespace alias');
         }
         $this->configurationPattern = $configurationPattern;
@@ -149,7 +149,7 @@ public function process(ContainerBuilder $container)
             $chainDriverDef->addMethodCall('addDriver', array($mappingDriverDef, $namespace));
         }
 
-        if (!count($this->aliasMap)) {
+        if (!\count($this->aliasMap)) {
             return;
         }
 

src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php

@@ -97,7 +97,7 @@ public function loadValuesForChoices(array $choices, $value = null)
 
         // Optimize performance for single-field identifiers. We already
         // know that the IDs are used as values
-        $optimize = null === $value || is_array($value) && $value[0] === $this->idReader;
+        $optimize = null === $value || \is_array($value) && $value[0] === $this->idReader;
 
         // Attention: This optimization does not check choices for existence
         if ($optimize && !$this->choiceList && $this->idReader->isSingleId()) {
@@ -134,7 +134,7 @@ public function loadChoicesForValues(array $values, $value = null)
 
         // Optimize performance in case we have an object loader and
         // a single-field identifier
-        $optimize = null === $value || is_array($value) && $this->idReader === $value[0];
+        $optimize = null === $value || \is_array($value) && $this->idReader === $value[0];
 
         if ($optimize && !$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
             $unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);

src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

@@ -42,8 +42,8 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata)
 
         $this->om = $om;
         $this->classMetadata = $classMetadata;
-        $this->singleId = 1 === count($ids);
-        $this->intId = $this->singleId && in_array($idType, array('integer', 'smallint', 'bigint'));
+        $this->singleId = 1 === \count($ids);
+        $this->intId = $this->singleId && \in_array($idType, array('integer', 'smallint', 'bigint'));
         $this->idField = current($ids);
 
         // single field association are resolved, since the schema column could be an int
@@ -95,7 +95,7 @@ public function getIdValue($object)
         }
 
         if (!$this->om->contains($object)) {
-            throw new RuntimeException(sprintf('Entity of type "%s" passed to the choice field must be managed. Maybe you forget to persist it in the entity manager?', get_class($object)));
+            throw new RuntimeException(sprintf('Entity of type "%s" passed to the choice field must be managed. Maybe you forget to persist it in the entity manager?', \get_class($object)));
         }
 
         $this->om->initializeObject($object);

src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

@@ -64,15 +64,15 @@ public function getEntitiesByIds($identifier, array $values)
         // Guess type
         $entity = current($qb->getRootEntities());
         $metadata = $qb->getEntityManager()->getClassMetadata($entity);
-        if (in_array($metadata->getTypeOfField($identifier), array('integer', 'bigint', 'smallint'))) {
+        if (\in_array($metadata->getTypeOfField($identifier), array('integer', 'bigint', 'smallint'))) {
             $parameterType = Connection::PARAM_INT_ARRAY;
 
             // Filter out non-integer values (e.g. ""). If we don't, some
             // databases such as PostgreSQL fail.
             $values = array_values(array_filter($values, function ($v) {
                 return (string) $v === (string) (int) $v || ctype_digit($v);
             }));
-        } elseif (in_array($metadata->getTypeOfField($identifier), array('uuid', 'guid'))) {
+        } elseif (\in_array($metadata->getTypeOfField($identifier), array('uuid', 'guid'))) {
             $parameterType = Connection::PARAM_STR_ARRAY;
 
             // Like above, but we just filter out empty strings.