Merge branch '3.x'

.styleci.yml

@@ -1,11 +1,7 @@
 preset: symfony
 
 enabled:
-  - newline_after_open_tag
   - ordered_use
-  - short_array_syntax
 
 disabled:
   - unalign_equals
-  - braces
-  - property_separation

Describer/ExternalDocDescriber.php

@@ -22,7 +22,6 @@ class ExternalDocDescriber implements DescriberInterface
 
     /**
      * @param array|callable $externalDoc
-     * @param bool           $overwrite
      */
     public function __construct($externalDoc, bool $overwrite = false)
     {

Describer/RouteDescriber.php

@@ -27,8 +27,6 @@ final class RouteDescriber implements DescriberInterface, ModelRegistryAwareInte
     private $routeDescribers;
 
     /**
-     * @param RouteCollection                    $routeCollection
-     * @param ControllerReflector                $controllerReflector
      * @param RouteDescriberInterface[]|iterable $routeDescribers
      */
     public function __construct(RouteCollection $routeCollection, ControllerReflector $controllerReflector, $routeDescribers)

ModelDescriber/FormModelDescriber.php

@@ -229,8 +229,6 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
     }
 
     /**
-     * @param array $array
-     *
      * @return bool true if $array contains only numbers, false otherwise
      */
     private function isNumbersArray(array $array): bool
@@ -245,8 +243,6 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
     }
 
     /**
-     * @param array $array
-     *
      * @return bool true if $array contains only booleans, false otherwise
      */
     private function isBooleansArray(array $array): bool
@@ -261,8 +257,6 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
     }
 
     /**
-     * @param ResolvedFormTypeInterface $type
-     *
      * @return ResolvedFormTypeInterface|null
      */
     private function getBuiltinFormType(ResolvedFormTypeInterface $type)

ModelDescriber/JMSModelDescriber.php

@@ -282,8 +282,6 @@ class JMSModelDescriber implements ModelDescriberInterface, ModelRegistryAwareIn
     }
 
     /**
-     * @param array $type
-     *
      * @return bool|null
      */
     private function propertyTypeUsesGroups(array $type)

Routing/FilteredRouteCollectionBuilder.php

@@ -127,7 +127,7 @@ final class FilteredRouteCollectionBuilder
             return false;
         }
 
-        /** @var null|Areas $areas */
+        /** @var Areas|null $areas */
         $areas = $this->annotationReader->getMethodAnnotation(
             $method,
             Areas::class

Tests/Functional/Entity/SymfonyConstraints.php

@@ -104,97 +104,62 @@ class SymfonyConstraints
 
     /**
      * @Assert\Count(min="0", max="10")
-     *
-     * @param int $propertyNotBlank
      */
     public function setPropertyNotBlank(int $propertyNotBlank): void
     {
         $this->propertyNotBlank = $propertyNotBlank;
     }
 
-    /**
-     * @param int $propertyNotNull
-     */
     public function setPropertyNotNull(int $propertyNotNull): void
     {
         $this->propertyNotNull = $propertyNotNull;
     }
 
-    /**
-     * @param int $propertyAssertLength
-     */
     public function setPropertyAssertLength(int $propertyAssertLength): void
     {
         $this->propertyAssertLength = $propertyAssertLength;
     }
 
-    /**
-     * @param int $propertyRegex
-     */
     public function setPropertyRegex(int $propertyRegex): void
     {
         $this->propertyRegex = $propertyRegex;
     }
 
-    /**
-     * @param int $propertyCount
-     */
     public function setPropertyCount(int $propertyCount): void
     {
         $this->propertyCount = $propertyCount;
     }
 
-    /**
-     * @param int $propertyChoice
-     */
     public function setPropertyChoice(int $propertyChoice): void
     {
         $this->propertyChoice = $propertyChoice;
     }
 
-    /**
-     * @param int $propertyChoiceWithCallback
-     */
     public function setPropertyChoiceWithCallback(int $propertyChoiceWithCallback): void
     {
         $this->propertyChoiceWithCallback = $propertyChoiceWithCallback;
     }
 
-    /**
-     * @param int $propertyChoiceWithCallbackWithoutClass
-     */
     public function setPropertyChoiceWithCallbackWithoutClass(int $propertyChoiceWithCallbackWithoutClass): void
     {
         $this->propertyChoiceWithCallbackWithoutClass = $propertyChoiceWithCallbackWithoutClass;
     }
 
-    /**
-     * @param int $propertyExpression
-     */
     public function setPropertyExpression(int $propertyExpression): void
     {
         $this->propertyExpression = $propertyExpression;
     }
 
-    /**
-     * @param int $propertyRange
-     */
     public function setPropertyRange(int $propertyRange): void
     {
         $this->propertyRange = $propertyRange;
     }
 
-    /**
-     * @param int $propertyLessThan
-     */
     public function setPropertyLessThan(int $propertyLessThan): void
     {
         $this->propertyLessThan = $propertyLessThan;
     }
 
-    /**
-     * @param int $propertyLessThanOrEqual
-     */
     public function setPropertyLessThanOrEqual(int $propertyLessThanOrEqual): void
     {
         $this->propertyLessThanOrEqual = $propertyLessThanOrEqual;

Tests/Functional/Entity/User.php

@@ -97,16 +97,12 @@ class User
      */
     private $dateAsInterface;
 
-    /**
-     * @param float $money
-     */
     public function setMoney(float $money)
     {
         $this->money = $money;
     }
 
     /**
-     * @param int $id
      * @OA\Property(example=1)
      */
     public function setId(int $id)
@@ -131,9 +127,6 @@ class User
     {
     }
 
-    /**
-     * @param int $friendsNumber
-     */
     public function setFriendsNumber(int $friendsNumber)
     {
         $this->friendsNumber = $friendsNumber;
@@ -163,17 +156,11 @@ class User
     {
     }
 
-    /**
-     * @return \DateTimeInterface
-     */
     public function getDateAsInterface(): \DateTimeInterface
     {
         return $this->dateAsInterface;
     }
 
-    /**
-     * @param \DateTimeInterface $dateAsInterface
-     */
     public function setDateAsInterface(\DateTimeInterface $dateAsInterface)
     {
         $this->dateAsInterface = $dateAsInterface;

Tests/Functional/FunctionalTest.php

@@ -429,7 +429,7 @@ class FunctionalTest extends WebTestCase
 
     public function testSerializedNameAction()
     {
-      if (!class_exists(SerializedName::class)) {
+        if (!class_exists(SerializedName::class)) {
             $this->markTestSkipped('Annotation @SerializedName doesn\'t exist.');
         }
 

Util/ControllerReflector.php

@@ -38,8 +38,6 @@ class ControllerReflector
     /**
      * Returns the ReflectionMethod for the given controller string.
      *
-     * @param string $controller
-     *
      * @return \ReflectionMethod|null
      */
     public function getReflectionMethod(string $controller)