symfony · nicolas-grekas · Jul 26, 2018 · Jul 5, 2018 · Jul 24, 2018 · Jul 24, 2018
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -15,6 +15,10 @@ return PhpCsFixer\Config::create()
         // rule disabled due to https://bugs.php.net/bug.php?id=60573 bug;
         // to be re-enabled (by dropping next line, rule is part of @Symfony already) on branch that requires PHP 5.4+
         'self_accessor' => 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(
@@ -32,16 +36,18 @@ return PhpCsFixer\Config::create()
                 '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')
     )
 ;
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/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

diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -120,14 +120,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) {
@@ -158,11 +158,11 @@ private function sanitizeQuery($connectionName, $query)
      */
     private function sanitizeParam($var)
     {
-        if (is_object($var)) {
-            return array(sprintf('Object(%s)', get_class($var)), false);
+        if (\is_object($var)) {
+            return array(sprintf('Object(%s)', \get_class($var)), false);
         }
 
-        if (is_array($var)) {
+        if (\is_array($var)) {
             $a = array();
             $original = true;
             foreach ($var as $k => $v) {
@@ -174,7 +174,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);
         }
 

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -142,7 +142,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);
@@ -154,7 +154,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();
@@ -241,7 +241,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 '.
@@ -264,17 +264,17 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
         $configPath = $this->getMappingResourceConfigDirectory();
         $resource = $dir.'/'.$configPath;
         while (!is_dir($resource)) {
-            $resource = dirname($resource);
+            $resource = \dirname($resource);
         }
 
         $container->addResource(new FileResource($resource));
 
         $extension = $this->getMappingResourceExtension();
-        if (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) && count($files)) {
+        if (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) && \count($files)) {
             return 'xml';
-        } elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.yml')) && count($files)) {
+        } elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.yml')) && \count($files)) {
             return 'yml';
-        } elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.php')) && count($files)) {
+        } elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.php')) && \count($files)) {
             return 'php';
         }
 

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -60,7 +60,7 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, $mappi
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if (is_file($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
+            if (is_file($file = \dirname($reflection->getFileName()).'/'.$validationPath)) {
                 $files[] = $file;
                 $container->addResource(new FileResource($file));
             }

diff --git a/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -153,7 +153,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;

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/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;
         }
 

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -88,7 +88,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()) {
@@ -125,7 +125,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) && $value[0] === $this->idReader;
+        $optimize = null === $value || \is_array($value) && $value[0] === $this->idReader;
 
         if ($optimize && !$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
             $unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -117,7 +117,7 @@ public function __construct(ObjectManager $manager, $class, $labelPath = null, E
         $this->entityLoader = $entityLoader;
         $this->classMetadata = $manager->getClassMetadata($class);
         $this->class = $this->classMetadata->getName();
-        $this->loaded = is_array($entities) || $entities instanceof \Traversable;
+        $this->loaded = \is_array($entities) || $entities instanceof \Traversable;
         $this->preferredEntities = $preferredEntities;
         list(
             $this->idAsIndex,
@@ -449,13 +449,13 @@ private function getIdentifierInfoForClass(ClassMetadata $classMetadata)
 
         $identifiers = $classMetadata->getIdentifierFieldNames();
 
-        if (1 === count($identifiers)) {
+        if (1 === \count($identifiers)) {
             $identifier = $identifiers[0];
 
             if (!$classMetadata->hasAssociation($identifier)) {
                 $idAsValue = true;
 
-                if (in_array($classMetadata->getTypeOfField($identifier), array('integer', 'smallint', 'bigint'))) {
+                if (\in_array($classMetadata->getTypeOfField($identifier), array('integer', 'smallint', 'bigint'))) {
                     $idAsIndex = true;
                 }
             }

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/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);

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -98,15 +98,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.

diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
@@ -36,7 +36,7 @@ public function transform($collection)
 
         // For cases when the collection getter returns $collection->toArray()
         // in order to prevent modifications of the returned collection
-        if (is_array($collection)) {
+        if (\is_array($collection)) {
             return $collection;
         }
 

diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -131,7 +131,7 @@ public function guessMaxLength($class, $property)
                 return new ValueGuess($mapping['length'], Guess::HIGH_CONFIDENCE);
             }
 
-            if (in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
+            if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
                 return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
             }
         }
@@ -144,7 +144,7 @@ public function guessPattern($class, $property)
     {
         $ret = $this->getMetadata($class);
         if ($ret && isset($ret[0]->fieldMappings[$property]) && !$ret[0]->hasAssociation($property)) {
-            if (in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
+            if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
                 return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
             }
         }

diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
@@ -41,7 +41,7 @@ public function onBind(FormEvent $event)
 
         // If all items were removed, call clear which has a higher
         // performance on persistent collections
-        if ($collection instanceof Collection && 0 === count($data)) {
+        if ($collection instanceof Collection && 0 === \count($data)) {
             $collection->clear();
         }
     }

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -259,8 +259,8 @@ public function configureOptions(OptionsResolver $resolver)
         // Invoke the query builder closure so that we can cache choice lists
         // for equal query builders
         $queryBuilderNormalizer = function (Options $options, $queryBuilder) {
-            if (is_callable($queryBuilder)) {
-                $queryBuilder = call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
+            if (\is_callable($queryBuilder)) {
+                $queryBuilder = \call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
             }
 
             return $queryBuilder;

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -28,8 +28,8 @@ public function configureOptions(OptionsResolver $resolver)
         // Invoke the query builder closure so that we can cache choice lists
         // for equal query builders
         $queryBuilderNormalizer = function (Options $options, $queryBuilder) {
-            if (is_callable($queryBuilder)) {
-                $queryBuilder = call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
+            if (\is_callable($queryBuilder)) {
+                $queryBuilder = \call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
 
                 if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {
                     throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');

diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -71,12 +71,12 @@ private function normalizeParams(array $params)
     {
         foreach ($params as $index => $param) {
             // normalize recursively
-            if (is_array($param)) {
+            if (\is_array($param)) {
                 $params[$index] = $this->normalizeParams($param);
                 continue;
             }
 
-            if (!is_string($params[$index])) {
+            if (!\is_string($params[$index])) {
                 continue;
             }
 

diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -52,7 +52,7 @@ public function loadUserByUsername($username)
         } else {
             if (!$repository instanceof UserLoaderInterface) {
                 if (!$repository instanceof UserProviderInterface) {
-                    throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, get_class($repository)));
+                    throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, \get_class($repository)));
                 }
 
                 @trigger_error('Implementing Symfony\Component\Security\Core\User\UserProviderInterface in a Doctrine repository when using the entity provider is deprecated since Symfony 2.8 and will not be supported in 3.0. Make the repository implement Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.', E_USER_DEPRECATED);
@@ -75,7 +75,7 @@ public function refreshUser(UserInterface $user)
     {
         $class = $this->getClass();
         if (!$user instanceof $class) {
-            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
         $repository = $this->getRepository();

diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
@@ -30,7 +30,7 @@ class DoctrineTestHelper
      */
     public static function createTestEntityManager()
     {
-        if (!extension_loaded('pdo_sqlite')) {
+        if (!\extension_loaded('pdo_sqlite')) {
             TestCase::markTestSkipped('Extension pdo_sqlite is required.');
         }