Update php-cs-fixer and tighten CS

Author: teohhanhui

.circleci/config.yml

@@ -86,7 +86,7 @@ jobs:
       - *update-composer
       - run:
           name: Install PHP-CS-Fixer
-          command: composer global require friendsofphp/php-cs-fixer:^2.12
+          command: composer global require friendsofphp/php-cs-fixer:^2.13
       - *save-composer-cache-by-revision
       - *save-composer-cache-by-branch
       - run:

.php_cs.dist

@@ -45,11 +45,6 @@ return PhpCsFixer\Config::create()
             'header' => $header,
             'location' => 'after_open',
         ],
-        'native_function_invocation' => [
-            'include' => [
-                '@compiler_optimized',
-            ],
-        ],
         'no_extra_blank_lines' => [
             'tokens' => [
                 'break',
@@ -74,8 +69,11 @@ return PhpCsFixer\Config::create()
             ],
             'sortAlgorithm' => 'alpha',
         ],
+        'php_unit_method_casing' => [
+            'case' => 'camel_case',
+        ],
         'phpdoc_order' => true,
-        // 'simplified_null_return' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
         'strict_comparison' => true,
         'strict_param' => true,
         'ternary_to_null_coalescing' => true,

src/Api/FilterLocatorTrait.php

@@ -48,7 +48,6 @@ private function setFilterLocator($filterLocator = null, bool $allowNull = false
     /**
      * Gets a filter with a backward compatibility.
      *
-     *
      * @return FilterInterface|null
      */
     private function getFilter(string $filterId)

src/Api/IriConverterInterface.php

@@ -27,7 +27,6 @@ interface IriConverterInterface
     /**
      * Retrieves an item from its IRI.
      *
-     *
      * @throws InvalidArgumentException
      * @throws ItemNotFoundException
      *
@@ -48,23 +47,20 @@ public function getIriFromItem($item, int $referenceType = UrlGeneratorInterface
     /**
      * Gets the IRI associated with the given resource collection.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getIriFromResourceClass(string $resourceClass, int $referenceType = UrlGeneratorInterface::ABS_PATH): string;
 
     /**
      * Gets the item IRI associated with the given resource.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getItemIriFromResourceClass(string $resourceClass, array $identifiers, int $referenceType = UrlGeneratorInterface::ABS_PATH): string;
 
     /**
      * Gets the IRI associated with the given resource subresource.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getSubresourceIriFromResourceClass(string $resourceClass, array $identifiers, int $referenceType = UrlGeneratorInterface::ABS_PATH): string;

src/Api/OperationMethodResolverInterface.php

@@ -25,15 +25,13 @@ interface OperationMethodResolverInterface
     /**
      * Resolves the uppercased HTTP method associated with a collection operation.
      *
-     *
      * @throws RuntimeException
      */
     public function getCollectionOperationMethod(string $resourceClass, string $operationName): string;
 
     /**
      * Resolves the uppercased HTTP method associated with an item operation.
      *
-     *
      * @throws RuntimeException
      */
     public function getItemOperationMethod(string $resourceClass, string $operationName): string;

src/Api/ResourceClassResolverInterface.php

@@ -25,7 +25,6 @@ interface ResourceClassResolverInterface
     /**
      * Guesses the associated resource.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getResourceClass($value, string $resourceClass = null, bool $strict = false): string;

src/Bridge/Doctrine/Common/DataPersister.php

@@ -78,7 +78,6 @@ public function remove($data)
     /**
      * Gets the Doctrine object manager associated with given data.
      *
-     *
      * @return DoctrineObjectManager|null
      */
     private function getManager($data)

src/Bridge/Doctrine/EventListener/WriteListener.php

@@ -72,7 +72,6 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
     /**
      * Gets the manager if applicable.
      *
-     *
      * @return ObjectManager|null
      */
     private function getManager(string $resourceClass, $data)

src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php

@@ -262,7 +262,6 @@ protected function extractProperties(Request $request/*, string $resourceClass*/
     /**
      * Adds the necessary joins for a nested property.
      *
-     *
      * @throws InvalidArgumentException If property is not nested
      *
      * @return array An array where the first element is the join $alias of the leaf entity,

src/Bridge/Doctrine/Orm/Filter/ExistsFilter.php

@@ -167,8 +167,6 @@ protected function isNullableField(string $property, string $resourceClass): boo
     /**
      * Determines whether an association is nullable.
      *
-     *
-     *
      * @see https://github.com/doctrine/doctrine2/blob/v2.5.4/lib/Doctrine/ORM/Tools/EntityGenerator.php#L1221-L1246
      */
     private function isAssociationNullable(array $associationMapping): bool