Merge pull request #15 from danog/rm_tlist

Remove usages of deprecated TList types
php-standard-library · Nov 28, 2023 · bf6d560 · bf6d560
2 parents e6af6fc + 8623603
commit bf6d560
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/psl.yml b/.github/workflows/psl.yml
@@ -33,7 +33,7 @@ jobs:
         working-directory: psl
         run: |
           composer config repositories.psalm-plugin path ../
-          composer require --dev 'php-standard-library/psalm-plugin:*@dev'
+          composer require --dev 'php-standard-library/psalm-plugin:*@dev' 'vimeo/psalm:>=5.16'
 
       - name: "installing dependencies"
         working-directory: psl

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "vimeo/psalm": "^5.0"
+        "vimeo/psalm": ">=5.16"
     },
     "conflict": {
         "azjezz/psl": "<2.0"

diff --git a/src/EventHandler/Str/Chunk/FunctionReturnTypeProvider.php b/src/EventHandler/Str/Chunk/FunctionReturnTypeProvider.php
@@ -27,30 +27,26 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
         $argument_type = Argument::getType($event->getCallArgs(), $event->getStatementsSource(), 0);
         if (null === $argument_type) {
             // [unknown] -> list<string>
-            return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
+            return Type::getList(Type::getString());
         }
 
         $string_argument_type = $argument_type->getAtomicTypes()['string'] ?? null;
         if (null === $string_argument_type) {
             // [unknown] -> list<string>
-            return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
+            return Type::getList(Type::getString());
         }
 
         if ($string_argument_type instanceof Type\Atomic\TNonEmptyString) {
             // non-empty-lowercase-string => non-empty-list<non-empty-lowercase-string>
             if ($string_argument_type instanceof Type\Atomic\TNonEmptyLowercaseString) {
-                return new Type\Union([
-                    new Type\Atomic\TNonEmptyList(new Type\Union([
-                        new Type\Atomic\TNonEmptyLowercaseString()
-                    ]))
-                ]);
+                return Type::getNonEmptyList(Type::getNonEmptyLowercaseString());
             }
 
             // non-empty-string => non-empty-list<non-empty-string>
-            return new Type\Union([new Type\Atomic\TNonEmptyList(new Type\Union([new Type\Atomic\TNonEmptyString()]))]);
+            return Type::getNonEmptyList(Type::getNonEmptyString());
         }
 
         // string -> list<string>
-        return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
+        return Type::getList(Type::getString());
     }
 }
diff --git a/src/EventHandler/Str/Split/FunctionReturnTypeProvider.php b/src/EventHandler/Str/Split/FunctionReturnTypeProvider.php
@@ -27,30 +27,26 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
         $argument_type = Argument::getType($event->getCallArgs(), $event->getStatementsSource(), 0);
         if (null === $argument_type) {
             // [unknown] -> list<string>
-            return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
+            return Type::getList(Type::getString());
         }
 
         $string_argument_type = $argument_type->getAtomicTypes()['string'] ?? null;
         if (null === $string_argument_type) {
             // [unknown] -> list<string>
-            return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
+            return Type::getList(Type::getString());
         }
 
         if ($string_argument_type instanceof Type\Atomic\TNonEmptyString) {
             // non-empty-lowercase-string => non-empty-list<non-empty-lowercase-string>
             if ($string_argument_type instanceof Type\Atomic\TNonEmptyLowercaseString) {
-                return new Type\Union([
-                    new Type\Atomic\TNonEmptyList(new Type\Union([
-                        new Type\Atomic\TNonEmptyLowercaseString()
-                    ]))
-                ]);
+                return Type::getNonEmptyList(Type::getNonEmptyLowercaseString());
             }
 
             // non-empty-string => non-empty-list<non-empty-string>
-            return new Type\Union([new Type\Atomic\TNonEmptyList(new Type\Union([new Type\Atomic\TNonEmptyString()]))]);
+            return Type::getNonEmptyList(Type::getNonEmptyString());
         }
 
         // string -> list<string>
-        return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
+        return Type::getList(Type::getString());
     }
 }