Browse Source

Update psalm

ADmad 3 years ago
parent
commit
c23bcbf0d2

+ 1 - 1
composer.json

@@ -115,7 +115,7 @@
         ],
         "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon",
         "stan-baseline": "phpstan.phar --generate-baseline",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.8.0 psalm/phar:~4.26.0 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.8.0 psalm/phar:~4.28.0 && mv composer.backup composer.json",
         "lowest": "validate-prefer-lowest",
         "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
         "test": "phpunit",

+ 1 - 0
src/Cache/Engine/FileEngine.php

@@ -172,6 +172,7 @@ class FileEngine extends CacheEngine
         /** @psalm-suppress PossiblyNullReference */
         $this->_File->rewind();
         $time = time();
+        /** @psalm-suppress RiskyCast */
         $cachetime = (int)$this->_File->current();
 
         if ($cachetime < $time) {

+ 2 - 0
src/Core/functions.php

@@ -206,8 +206,10 @@ if (!function_exists('env')) {
             $key = 'SCRIPT_URL';
         }
 
+        /** @var string|null $val */
         $val = $_SERVER[$key] ?? $_ENV[$key] ?? null;
         if ($val == null && getenv($key) !== false) {
+            /** @var string|false $val */
             $val = getenv($key);
         }
 

+ 4 - 4
src/Database/Type/DateTimeType.php

@@ -328,7 +328,7 @@ class DateTimeType extends BaseType implements BatchCastingInterface
             return $value->setTimezone($this->defaultTimezone);
         }
 
-        /** @var class-string<\DatetimeInterface> $class */
+        /** @var class-string<\DateTimeInterface> $class */
         $class = $this->_className;
         try {
             if ($value === '' || $value === null || is_bool($value)) {
@@ -336,7 +336,7 @@ class DateTimeType extends BaseType implements BatchCastingInterface
             }
 
             if (is_int($value) || (is_string($value) && ctype_digit($value))) {
-                /** @var \Datetime|\DateTimeImmutable $dateTime */
+                /** @var \DateTime|\DateTimeImmutable $dateTime */
                 $dateTime = new $class('@' . $value);
 
                 return $dateTime->setTimezone($this->defaultTimezone);
@@ -349,7 +349,7 @@ class DateTimeType extends BaseType implements BatchCastingInterface
                     $dateTime = $this->_parseValue($value);
                 }
 
-                /** @var \Datetime|\DateTimeImmutable $dateTime */
+                /** @var \DateTime|\DateTimeImmutable $dateTime */
                 if ($dateTime !== null) {
                     $dateTime = $dateTime->setTimezone($this->defaultTimezone);
                 }
@@ -392,7 +392,7 @@ class DateTimeType extends BaseType implements BatchCastingInterface
             $value['microsecond']
         );
 
-        /** @var \Datetime|\DateTimeImmutable $dateTime */
+        /** @var \DateTime|\DateTimeImmutable $dateTime */
         $dateTime = new $class($format, $value['timezone'] ?? $this->userTimezone);
 
         return $dateTime->setTimezone($this->defaultTimezone);

+ 1 - 1
src/Http/Cookie/Cookie.php

@@ -236,7 +236,7 @@ class Cookie implements CookieInterface
      * Converts non null expiry value into DateTimeInterface instance.
      *
      * @param mixed $expires Expiry value.
-     * @return \DateTime|\DatetimeImmutable|null
+     * @return \DateTime|\DateTimeImmutable|null
      */
     protected static function dateTimeInstance($expires): ?DateTimeInterface
     {

+ 5 - 1
src/Validation/Validation.php

@@ -1332,7 +1332,11 @@ class Validation
     {
         if ($check instanceof UploadedFileInterface) {
             $code = $check->getError();
-        } elseif (is_array($check) && isset($check['error'])) {
+        } elseif (is_array($check)) {
+            if (!isset($check['error'])) {
+                return false;
+            }
+
             $code = $check['error'];
         } else {
             $code = $check;