Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

Extractor/ReflectionExtractor.php

@@ -722,7 +722,7 @@ private function isAllowedProperty(string $class, string $property, bool $writeA
                     return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PRIVATE);
                 }
 
-                if (\PHP_VERSION_ID >= 80400 &&$reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
+                if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
                     return false;
                 }
             }
@@ -976,7 +976,7 @@ private function getWriteVisiblityForProperty(\ReflectionProperty $reflectionPro
 
             if ($reflectionProperty->isProtectedSet()) {
                 return PropertyWriteInfo::VISIBILITY_PROTECTED;
-           }
+            }
         }
 
         if ($reflectionProperty->isPrivate()) {

PropertyDocBlockExtractorInterface.php

@@ -28,7 +28,7 @@ interface PropertyDocBlockExtractorInterface
      * by the following priority:
      *  - constructor promoted argument
      *  - the class property
-     *  - a mutator method for that property
+     *  - a mutator method for that property.
      *
      * If no doc block is found, it will return null.
      */

Tests/Extractor/SerializerExtractorTest.php

@@ -52,6 +52,6 @@ public function testGetPropertiesWithAnyGroup()
 
     public function testGetPropertiesWithNonExistentClassReturnsNull()
     {
-        $this->assertSame(null, $this->extractor->getProperties('NonExistent'));
+        $this->assertNull($this->extractor->getProperties('NonExistent'));
     }
 }

Tests/PropertyInfoCacheExtractorTest.php

@@ -90,7 +90,7 @@ public function testIsInitializable()
      */
     public function testNestedExtractorWithoutGetTypeImplementation(string $property, ?Type $expectedType)
     {
-        $propertyInfoCacheExtractor = new PropertyInfoCacheExtractor(new class() implements PropertyInfoExtractorInterface {
+        $propertyInfoCacheExtractor = new PropertyInfoCacheExtractor(new class implements PropertyInfoExtractorInterface {
             private PropertyTypeExtractorInterface $propertyTypeExtractor;
 
             public function __construct()

Tests/PropertyInfoExtractorTest.php

@@ -30,7 +30,7 @@ class PropertyInfoExtractorTest extends AbstractPropertyInfoExtractorTest
      */
     public function testNestedExtractorWithoutGetTypeImplementation(string $property, ?Type $expectedType)
     {
-        $propertyInfoExtractor = new PropertyInfoExtractor([], [new class() implements PropertyTypeExtractorInterface {
+        $propertyInfoExtractor = new PropertyInfoExtractor([], [new class implements PropertyTypeExtractorInterface {
             private PropertyTypeExtractorInterface $propertyTypeExtractor;
 
             public function __construct()

Util/PhpStanTypeHelper.php

@@ -125,7 +125,7 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array
                 return [$mainType];
             }
 
-            $collection = $mainType->isCollection() || \is_a($mainType->getClassName(), \Traversable::class, true) || \is_a($mainType->getClassName(), \ArrayAccess::class, true);
+            $collection = $mainType->isCollection() || is_a($mainType->getClassName(), \Traversable::class, true) || is_a($mainType->getClassName(), \ArrayAccess::class, true);
 
             // it's safer to fall back to other extractors if the generic type is too abstract
             if (!$collection && !class_exists($mainType->getClassName()) && !interface_exists($mainType->getClassName(), false)) {