Fix findings from PHP CS Fixer

Author: phansys

src/Loggable/Document/Repository/LogEntryRepository.php

@@ -43,10 +43,10 @@ class LogEntryRepository extends DocumentRepository
      *
      * @param object $document
      *
-     * @return LogEntry[]
-     *
      * @phpstan-param T $document
      *
+     * @return LogEntry[]
+     *
      * @phpstan-return array<array-key, LogEntry<T>>
      */
     public function getLogEntries($document)
@@ -71,11 +71,11 @@ public function getLogEntries($document)
      * @param object $document
      * @param int    $version
      *
+     * @phpstan-param T $document
+     *
      * @throws UnexpectedValueException
      *
      * @return void
-     *
-     * @phpstan-param T $document
      */
     public function revert($document, $version = 1)
     {
@@ -109,9 +109,9 @@ public function revert($document, $version = 1)
      * @param object               $document
      * @param array<string, mixed> $data
      *
-     * @return void
-     *
      * @phpstan-param T $document
+     *
+     * @return void
      */
     protected function fillDocument($document, array $data)
     {

src/Loggable/LoggableListener.php

@@ -285,10 +285,10 @@ protected function getUsername(): ?string
      * @param LogEntryInterface $logEntry The LogEntry being persisted
      * @param object            $object   The object being Logged
      *
-     * @return void
-     *
      * @phpstan-param LogEntryInterface<T> $logEntry
      * @phpstan-param T $object
+     *
+     * @return void
      */
     protected function prePersistLogEntry($logEntry, $object)
     {
@@ -306,10 +306,10 @@ protected function getNamespace()
      * @param object            $object
      * @param LogEntryInterface $logEntry
      *
-     * @return array<string, mixed>
-     *
      * @phpstan-param T $object
      * @phpstan-param LogEntryInterface<T> $logEntry
+     *
+     * @return array<string, mixed>
      */
     protected function getObjectChangeSetData($ea, $object, $logEntry)
     {
@@ -352,11 +352,11 @@ protected function getObjectChangeSetData($ea, $object, $logEntry)
      * @param string $action
      * @param object $object
      *
-     * @return LogEntryInterface|null
-     *
      * @phpstan-param LogEntryInterface::ACTION_CREATE|LogEntryInterface::ACTION_UPDATE|LogEntryInterface::ACTION_REMOVE $action
      * @phpstan-param T $object
      *
+     * @return LogEntryInterface|null
+     *
      * @phpstan-return LogEntryInterface<T>|null
      */
     protected function createLogEntry($action, $object, LoggableAdapter $ea)

src/Mapping/Driver.php

@@ -31,13 +31,13 @@ interface Driver
      * @param ClassMetadata<T>     $meta
      * @param array<string, mixed> $config
      *
-     * @throws InvalidMappingException if the mapping configuration is invalid
-     *
-     * @return void
-     *
      * @template T of object
      *
      * @phpstan-param ClassMetadata<T>&(OdmClassMetadata<T>|OrmClassMetadata<T>) $meta
+     *
+     * @throws InvalidMappingException if the mapping configuration is invalid
+     *
+     * @return void
      */
     public function readExtendedMetadata($meta, array &$config);
 

src/Mapping/Driver/AbstractAnnotationDriver.php

@@ -139,10 +139,10 @@ protected function isValidField($meta, $field)
      * @param ClassMetadata<object> $metadata the mapped class metadata
      * @param string                $name     the related object class name
      *
-     * @return string related class name or empty string if does not exist
-     *
      * @phpstan-param class-string|string $name
      *
+     * @return string related class name or empty string if does not exist
+     *
      * @phpstan-return class-string|''
      */
     protected function getRelatedClassName($metadata, $name)

src/Mapping/Driver/File.php

@@ -114,9 +114,9 @@ abstract protected function _loadMappingFile($file);
      *
      * @param string $className
      *
-     * @return array<string, mixed>|object|null
-     *
      * @phpstan-param class-string $className
+     *
+     * @return array<string, mixed>|object|null
      */
     protected function _getMapping($className)
     {
@@ -143,10 +143,10 @@ protected function _getMapping($className)
      * @param ClassMetadata<object> $metadata the mapped class metadata
      * @param string                $name     the related object class name
      *
-     * @return string related class name or empty string if does not exist
-     *
      * @phpstan-param class-string|string $name
      *
+     * @return string related class name or empty string if does not exist
+     *
      * @phpstan-return class-string|''
      */
     protected function getRelatedClassName($metadata, $name)

src/Tool/ORM/Repository/EntityRepositoryCompat.php

@@ -34,9 +34,9 @@ public function __call(string $method, array $args): mixed
          * @param string $method
          * @param array  $args
          *
-         * @return mixed
-         *
          * @phpstan-param list<mixed> $args
+         *
+         * @return mixed
          */
         abstract protected function doCallWithCompat($method, $args);
     }
@@ -55,9 +55,9 @@ trait EntityRepositoryCompat
          * @param string $method
          * @param array  $args
          *
-         * @return mixed
-         *
          * @phpstan-param list<mixed> $args
+         *
+         * @return mixed
          */
         public function __call($method, $args)
         {
@@ -68,9 +68,9 @@ public function __call($method, $args)
          * @param string $method
          * @param array  $args
          *
-         * @return mixed
-         *
          * @phpstan-param list<mixed> $args
+         *
+         * @return mixed
          */
         abstract protected function doCallWithCompat($method, $args);
     }

src/Translator/TranslationProxy.php

@@ -49,10 +49,10 @@ class TranslationProxy
      * @param string[] $properties   object properties to translate
      * @param string   $class        translation entity|document class
      *
-     * @throws \InvalidArgumentException Translation class doesn't implement TranslationInterface
-     *
      * @phpstan-param class-string<TranslationInterface> $class
      * @phpstan-param Collection<int, TranslationInterface> $coll
+     *
+     * @throws \InvalidArgumentException Translation class doesn't implement TranslationInterface
      */
     public function __construct($translatable, $locale, array $properties, $class, Collection $coll)
     {

src/Tree/Entity/Repository/AbstractTreeRepository.php

@@ -223,9 +223,9 @@ abstract public function getNodesHierarchyQuery($node = null, $direct = false, a
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return QueryBuilder QueryBuilder object
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return QueryBuilder QueryBuilder object
      */
     abstract public function getChildrenQueryBuilder($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false);
 
@@ -238,9 +238,9 @@ abstract public function getChildrenQueryBuilder($node = null, $direct = false,
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return Query Query object
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return Query Query object
      */
     abstract public function getChildrenQuery($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false);
 

src/Tree/Entity/Repository/ClosureTreeRepository.php

@@ -116,9 +116,9 @@ public function getPath($node)
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return QueryBuilder QueryBuilder object
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return QueryBuilder QueryBuilder object
      */
     public function childrenQueryBuilder($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {
@@ -193,9 +193,9 @@ public function childrenQueryBuilder($node = null, $direct = false, $sortByField
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return Query Query object
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return Query Query object
      */
     public function childrenQuery($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {
@@ -209,9 +209,9 @@ public function childrenQuery($node = null, $direct = false, $sortByField = null
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return array<int, object|null> List of children or null on failure
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return array<int, object|null> List of children or null on failure
      */
     public function children($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {

src/Tree/Entity/Repository/NestedTreeRepository.php

@@ -233,9 +233,9 @@ public function getPathAsString(object $node, array $options = []): string
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return QueryBuilder QueryBuilder object
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return QueryBuilder QueryBuilder object
      */
     public function childrenQueryBuilder($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {
@@ -309,9 +309,9 @@ public function childrenQueryBuilder($node = null, $direct = false, $sortByField
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return Query Query object
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return Query Query object
      */
     public function childrenQuery($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {
@@ -325,9 +325,9 @@ public function childrenQuery($node = null, $direct = false, $sortByField = null
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Flag indicating whether the given node should be included in the results
      *
-     * @return array<int, object> List of children
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
+     *
+     * @return array<int, object> List of children
      */
     public function children($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {
@@ -359,11 +359,11 @@ public function getChildren($node = null, $direct = false, $sortByField = null,
      * @param string $sortByField field name to sort by
      * @param string $direction   sort direction : "ASC" or "DESC"
      *
+     * @phpstan-param 'asc'|'desc'|'ASC'|'DESC' $direction
+     *
      * @throws InvalidArgumentException if input is not valid
      *
      * @return QueryBuilder
-     *
-     * @phpstan-param 'asc'|'desc'|'ASC'|'DESC' $direction
      */
     public function getLeafsQueryBuilder($root = null, $sortByField = null, $direction = 'ASC')
     {
@@ -415,9 +415,9 @@ public function getLeafsQueryBuilder($root = null, $sortByField = null, $directi
      * @param string $sortByField field name to sort by
      * @param string $direction   sort direction : "ASC" or "DESC"
      *
-     * @return Query
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC' $direction
+     *
+     * @return Query
      */
     public function getLeafsQuery($root = null, $sortByField = null, $direction = 'ASC')
     {
@@ -431,9 +431,9 @@ public function getLeafsQuery($root = null, $sortByField = null, $direction = 'A
      * @param string $sortByField field name to sort by
      * @param string $direction   sort direction : "ASC" or "DESC"
      *
-     * @return array<int, object>
-     *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC' $direction
+     *
+     * @return array<int, object>
      */
     public function getLeafs($root = null, $sortByField = null, $direction = 'ASC')
     {