Merge pull request #1794 from deguif/php-cs-fixer-3.0.0

Update php-cs-fixer to 3.0.0

Author: XWB

.gitattributes

@@ -2,6 +2,6 @@
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /.scrutinizer.yml export-ignore
 /phpunit.xml.dist export-ignore

.github/workflows/continuous-integration.yaml

@@ -14,15 +14,15 @@ jobs:
           php-version: '7.4'
           coverage: 'none'
           extensions: 'json, mbstring, tokenizer'
-          tools: 'composer-normalize, php-cs-fixer:2.18.3'
+          tools: 'composer-normalize, php-cs-fixer:3.0.0'
 
       - name: 'Display tools versions'
         run: |
           composer-normalize --version
           php-cs-fixer --version
 
       - name: 'Check PHP code'
-        run: 'php-cs-fixer fix --diff --dry-run --allow-risky=yes --using-cache=false'
+        run: 'php-cs-fixer fix --diff --dry-run --allow-risky=yes --using-cache=no'
 
       - name: 'Check composer.json'
         run: 'composer-normalize --diff --dry-run --no-update-lock'

.gitignore

@@ -2,5 +2,5 @@ phpunit.xml
 vendor
 composer.lock
 composer.phar
-.php_cs
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -9,26 +9,26 @@
 file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
+        '@PHP71Migration' => true,
+        '@PSR2' => true,
+        '@PhpCsFixer' => true,
         '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'combine_consecutive_issets' => true,
-        'combine_consecutive_unsets' => true,
         'header_comment' => ['header' => $header],
         'is_null' => true,
-        'linebreak_after_opening_tag' => true,
-        'list_syntax' => ['syntax' => 'short'],
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'method_chaining_indentation' => false,
         'native_constant_invocation' => true,
-        'native_function_invocation' => true,
+        'native_function_invocation' => [
+            'include' => ['@all'],
+        ],
         'no_alias_functions' => true,
-        'no_useless_else' => true,
         'nullable_type_declaration_for_default_null_value' => true,
-        'ordered_class_elements' => true,
         'ordered_imports' => true,
+        'php_unit_test_class_requires_covers' => false,
         'phpdoc_no_empty_return' => false,
-        'ternary_to_null_coalescing' => true,
-        'visibility_required' => ['property', 'method', 'const'],
+        'visibility_required' => ['elements' => ['property', 'method', 'const']],
     ])
     ->setUsingCache(true)
     ->setFinder(

src/Command/PopulateCommand.php

@@ -154,7 +154,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * Recreates an index, populates it, and refreshes it.
      */
-    private function populateIndex(OutputInterface $output, string $index, bool $reset, $options): void
+    private function populateIndex(OutputInterface $output, string $index, bool $reset, array $options): void
     {
         $this->dispatcher->dispatch($event = new PreIndexPopulateEvent($index, $reset, $options));
 

src/DependencyInjection/Configuration.php

@@ -120,7 +120,8 @@ private function getPropertiesNode()
         $node
             ->useAttributeAsKey('name')
             ->prototype('variable')
-                ->treatNullLike([]);
+                ->treatNullLike([])
+        ;
 
         return $node;
     }
@@ -281,7 +282,8 @@ private function getPersistenceNode()
                         ->scalarNode('service')->end()
                     ->end()
                 ->end()
-            ->end();
+            ->end()
+        ;
 
         return $node;
     }
@@ -304,7 +306,8 @@ private function getSerializerNode()
                 ->booleanNode('serialize_null')
                     ->defaultFalse()
                 ->end()
-            ->end();
+            ->end()
+        ;
 
         return $node;
     }
@@ -470,7 +473,7 @@ private function addIndexesSection(ArrayNodeDefinition $rootNode)
     /**
      * @return ArrayNodeDefinition|\Symfony\Component\Config\Definition\Builder\NodeDefinition
      */
-    private function createTreeBuilderNode($name)
+    private function createTreeBuilderNode(string $name)
     {
         return (new TreeBuilder($name))->getRootNode();
     }

src/DependencyInjection/FOSElasticaExtension.php

@@ -93,15 +93,19 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->loadClients($config['clients'], $container);
         $container->setAlias('fos_elastica.client', \sprintf('fos_elastica.client.%s', $config['default_client']))
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
         $container->setAlias(ElasticaClient::class, 'fos_elastica.client')
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
         $container->setAlias(Client::class, 'fos_elastica.client')
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
 
         $this->loadIndexes($config['indexes'], $container);
         $container->setAlias('fos_elastica.index', \sprintf('fos_elastica.index.%s', $config['default_index']))
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
         $container->setParameter('fos_elastica.default_index', $config['default_index']);
 
         if ($usedIndexNames = \array_intersect_key($config['indexes'], $config['index_templates'])) {
@@ -112,7 +116,8 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('fos_elastica.config_source.container')->replaceArgument(0, $this->indexConfigs);
         $container
             ->getDefinition('fos_elastica.config_source.template_container')
-            ->replaceArgument(0, $this->indexTemplateConfigs);
+            ->replaceArgument(0, $this->indexTemplateConfigs)
+        ;
 
         $this->loadIndexManager($container);
         $this->loadIndexTemplateManager($container);
@@ -536,10 +541,7 @@ private function loadIndexListener(array $indexConfig, ContainerBuilder $contain
         $listenerId = \sprintf('fos_elastica.listener.%s', $indexName);
         $listenerDef = new ChildDefinition($abstractListenerId);
         $listenerDef->replaceArgument(0, new Reference($objectPersisterId));
-        $listenerDef->replaceArgument(3, $indexConfig['listener']['logger'] ?
-            new Reference($indexConfig['listener']['logger']) :
-            null
-        );
+        $listenerDef->replaceArgument(3, $indexConfig['listener']['logger'] ? new Reference($indexConfig['listener']['logger']) : null);
         $listenerConfig = [
             'identifier' => $indexConfig['identifier'],
             'indexName' => $indexName,
@@ -640,18 +642,20 @@ private function loadTypeFinder(array $typeConfig, ContainerBuilder $container,
         }
 
         $container->getDefinition('fos_elastica.repository_manager')
-            ->addMethodCall('addIndex', $arguments);
+            ->addMethodCall('addIndex', $arguments)
+        ;
 
         $managerId = \sprintf('fos_elastica.manager.%s', $typeConfig['driver']);
         $container->getDefinition($managerId)
-            ->addMethodCall('addEntity', [$typeConfig['model'], $indexName]);
+            ->addMethodCall('addEntity', [$typeConfig['model'], $indexName])
+        ;
 
         return $finderId;
     }
 
     /**
      * Loads the index manager.
-     **/
+     */
     private function loadIndexManager(ContainerBuilder $container): void
     {
         $indexRefs = \array_map(function ($index) {
@@ -695,7 +699,8 @@ private function loadDriver(ContainerBuilder $container, string $driver): void
     private function loadSerializer(array $config, ContainerBuilder $container): void
     {
         $container->setAlias('fos_elastica.serializer', $config['serializer'])
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
 
         $serializer = $container->getDefinition('fos_elastica.serializer_callback_prototype');
         $serializer->setClass($config['callback_class']);
@@ -723,9 +728,11 @@ private function createDefaultManagerAlias(string $defaultManager, ContainerBuil
         }
 
         $container->setAlias('fos_elastica.manager', \sprintf('fos_elastica.manager.%s', $defaultManagerService))
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
         $container->setAlias(RepositoryManagerInterface::class, 'fos_elastica.manager')
-            ->setPublic(false);
+            ->setPublic(false)
+        ;
     }
 
     /**

src/Doctrine/AbstractElasticaToModelTransformer.php

@@ -28,14 +28,14 @@ abstract class AbstractElasticaToModelTransformer extends BaseTransformer
      *
      * @var ManagerRegistry
      */
-    protected $registry = null;
+    protected $registry;
 
     /**
      * Class of the model to map to the elastica documents.
      *
      * @var string
      */
-    protected $objectClass = null;
+    protected $objectClass;
 
     /**
      * Optional parameters.
@@ -77,7 +77,7 @@ public function getObjectClass(): string
      * @throws \RuntimeException
      *
      * @return array
-     **/
+     */
     public function transform(array $elasticaObjects)
     {
         $ids = $highlights = [];

src/Doctrine/MongoDB/ElasticaToModelTransformer.php

@@ -38,6 +38,7 @@ protected function findByIdentifiers(array $identifierValues, $hydrate)
             ->hydrate($hydrate)
             ->getQuery()
             ->execute()
-            ->toArray();
+            ->toArray()
+        ;
     }
 }

src/Doctrine/ORM/ElasticaToModelTransformer.php

@@ -40,7 +40,8 @@ protected function findByIdentifiers(array $identifierValues, $hydrate)
 
         $qb = $this->getEntityQueryBuilder();
         $qb->andWhere($qb->expr()->in(static::ENTITY_ALIAS.'.'.$this->options['identifier'], ':values'))
-            ->setParameter('values', $identifierValues);
+            ->setParameter('values', $identifierValues)
+        ;
 
         $query = $qb->getQuery();
 
@@ -60,7 +61,8 @@ protected function getEntityQueryBuilder()
     {
         $repository = $this->registry
             ->getManagerForClass($this->objectClass)
-            ->getRepository($this->objectClass);
+            ->getRepository($this->objectClass)
+        ;
 
         return $repository->{$this->options['query_builder_method']}(static::ENTITY_ALIAS);
     }