[DowngradePhp81] Handle New_ inside array on DowngradeNewInInitializerRector

[samsonasik]

@TomasVotruba I tried to solve on https://github.com/rectorphp/rector-src/runs/4537147879?check_suite_focus=true#step:14:80

I tried downgrade command locally and it seems cause create property, but assign new in property, which still invalid, I will looking into it.

➜  rector-src git:(handle-new-in-array) bin/rector process vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php -c build/config/config-downgrade.php --dry-run
 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
1 file with changes
===================

1) vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php:23

    ---------- begin diff ----------
@@ @@
      * @var string
      */
     private const DATE_TIME_INTERFACE = 'DateTimeInterface';
-
     /**
+     * @readonly
+     * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
+     */
+    private $phpDocInfoFactory;
+    /**
+     * @var \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory
+     */
+    private $typeFactory;
+    /**
+     * @var array<string, \PHPStan\Type\Type>
+     */
+    private $doctrineTypeToScalarType = [
+        'tinyint' => new BooleanType(),
+        // integers
+        'smallint' => new IntegerType(),
+        'mediumint' => new IntegerType(),
+        'int' => new IntegerType(),
+        'integer' => new IntegerType(),
+        'bigint' => new IntegerType(),
+        'numeric' => new IntegerType(),
+        // floats
+        'decimal' => new FloatType(),
+        'float' => new FloatType(),
+        'double' => new FloatType(),
+        'real' => new FloatType(),
+        // strings
+        'tinytext' => new StringType(),
+        'mediumtext' => new StringType(),
+        'longtext' => new StringType(),
+        'text' => new StringType(),
+        'varchar' => new StringType(),
+        'string' => new StringType(),
+        'char' => new StringType(),
+        'longblob' => new StringType(),
+        'blob' => new StringType(),
+        'mediumblob' => new StringType(),
+        'tinyblob' => new StringType(),
+        'binary' => new StringType(),
+        'varbinary' => new StringType(),
+        'set' => new StringType(),
+        // date time objects
+        'date' => new ObjectType(self::DATE_TIME_INTERFACE),
+        'datetime' => new ObjectType(self::DATE_TIME_INTERFACE),
+        'timestamp' => new ObjectType(self::DATE_TIME_INTERFACE),
+        'time' => new ObjectType(self::DATE_TIME_INTERFACE),
+        'year' => new ObjectType(self::DATE_TIME_INTERFACE),
+    ];
+    /**
      * @param array<string, Type> $doctrineTypeToScalarType
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/basic-mapping.html#doctrine-mapping-types
      */
-    public function __construct(
-        private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private TypeFactory $typeFactory,
-        private array $doctrineTypeToScalarType = [
+    public function __construct(PhpDocInfoFactory $phpDocInfoFactory, TypeFactory $typeFactory, array $doctrineTypeToScalarType = null)
+    {
+        $doctrineTypeToScalarType = $doctrineTypeToScalarType ?? [
             'tinyint' => new BooleanType(),
             // integers
             'smallint' => new IntegerType(),
@@ @@
             'timestamp' => new ObjectType(self::DATE_TIME_INTERFACE),
             'time' => new ObjectType(self::DATE_TIME_INTERFACE),
             'year' => new ObjectType(self::DATE_TIME_INTERFACE),
-        ],
-    ) {
+        ];
+        $this->phpDocInfoFactory = $phpDocInfoFactory;
+        $this->typeFactory = $typeFactory;
+        $this->doctrineTypeToScalarType = $doctrineTypeToScalarType;
     }

     public function resolve(Property $property): ?Type
    ----------- end diff -----------

Applied rules:
 * DowngradeNullCoalescingOperatorRector (https://wiki.php.net/rfc/null_coalesce_equal_operator)
 * DowngradeTypedPropertyRector
 * DowngradeTrailingCommasInParamUseRector
 * DowngradeAttributeToAnnotationRector (https://php.watch/articles/php-attributes#syntax)
 * DowngradePropertyPromotionRector (https://wiki.php.net/rfc/constructor_promotion)
 * DowngradeNewInInitializerRector (https://wiki.php.net/rfc/new_in_initializers)
 * DowngradeReadonlyPropertyRector (https://wiki.php.net/rfc/readonly_properties_v2)


                                                                                                                        
 [OK] 1 file would have changed (dry-run) by Rector                                                                     
                                                                                                                        

[samsonasik]

I added failing fixture c7c87ee for combination between:

Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector;
Rector\DowngradePhp80\Rector\Class_\DowngradePropertyPromotionRector;
Rector\DowngradePhp81\Rector\FunctionLike\DowngradeNewInInitializerRector;

[samsonasik]

Fixed 🎉

[samsonasik]

I tried the downgrade script and it seems working ok:

bin/rector process vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php -c build/config/config-downgrade.php --dry-run
 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
1 file with changes
===================

1) vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php:23

    ---------- begin diff ----------
@@ @@
      * @var string
      */
     private const DATE_TIME_INTERFACE = 'DateTimeInterface';
-
     /**
+     * @readonly
+     * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
+     */
+    private $phpDocInfoFactory;
+    /**
+     * @var \Rector\NodeTypeResolver\PHPStan\Type\TypeFactory
+     */
+    private $typeFactory;
+    /**
+     * @var array<string, \PHPStan\Type\Type>
+     */
+    private $doctrineTypeToScalarType;
+    /**
      * @param array<string, Type> $doctrineTypeToScalarType
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/basic-mapping.html#doctrine-mapping-types
      */
-    public function __construct(
-        private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private TypeFactory $typeFactory,
-        private array $doctrineTypeToScalarType = [
+    public function __construct(PhpDocInfoFactory $phpDocInfoFactory, TypeFactory $typeFactory, array $doctrineTypeToScalarType = null)
+    {
+        $doctrineTypeToScalarType = $doctrineTypeToScalarType ?? [
             'tinyint' => new BooleanType(),
             // integers
             'smallint' => new IntegerType(),
@@ @@
             'timestamp' => new ObjectType(self::DATE_TIME_INTERFACE),
             'time' => new ObjectType(self::DATE_TIME_INTERFACE),
             'year' => new ObjectType(self::DATE_TIME_INTERFACE),
-        ],
-    ) {
+        ];
+        $this->phpDocInfoFactory = $phpDocInfoFactory;
+        $this->typeFactory = $typeFactory;
+        $this->doctrineTypeToScalarType = $doctrineTypeToScalarType;
     }

     public function resolve(Property $property): ?Type
    ----------- end diff -----------

Applied rules:
 * DowngradeNullCoalescingOperatorRector (https://wiki.php.net/rfc/null_coalesce_equal_operator)
 * DowngradeTypedPropertyRector
 * DowngradeTrailingCommasInParamUseRector
 * DowngradeAttributeToAnnotationRector (https://php.watch/articles/php-attributes#syntax)
 * DowngradePropertyPromotionRector (https://wiki.php.net/rfc/constructor_promotion)
 * DowngradeNewInInitializerRector (https://wiki.php.net/rfc/new_in_initializers)
 * DowngradeReadonlyPropertyRector (https://wiki.php.net/rfc/readonly_properties_v2)

[samsonasik]

@TomasVotruba let's give it a try.

[samsonasik]

@TomasVotruba it works 🎉

[TomasVotruba]

Thank you for the rescue 😊