Merge pull request #345 from cakephp/support-scalar

Add support for scalar type
cakephp · Oct 22, 2021 · fce45ed · fce45ed
2 parents e098e1f + 34e8e42
commit fce45ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CakePHP/Sniffs/Commenting/TypeHintSniff.php b/CakePHP/Sniffs/Commenting/TypeHintSniff.php
@@ -176,6 +176,7 @@ protected function getSortedTypeHint(array $types): string
             'callable-string',
             'class-string',
             'interface-string',
+            'scalar',
             'string',
             'float',
             'int',

diff --git a/CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc b/CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc
@@ -34,6 +34,6 @@ function test()
     /** @var class-string<\Cake\I18n\Number>|null */
     $testVar;
 
-    /** @psalm-var null|string|class-string<\Cake\I18n\Number>|array $testVar2 */
+    /** @psalm-var null|scalar|class-string<\Cake\I18n\Number>|array $testVar2 */
     $testVar2;
 }
diff --git a/CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc.fixed b/CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc.fixed
@@ -34,6 +34,6 @@ function test()
     /** @var class-string<\Cake\I18n\Number>|null */
     $testVar;
 
-    /** @psalm-var array|class-string<\Cake\I18n\Number>|string|null $testVar2 */
+    /** @psalm-var array|class-string<\Cake\I18n\Number>|scalar|null $testVar2 */
     $testVar2;
 }