Psalm improvements (#50)

Author: Fantom409

psalm.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
- errorLevel="6"
- resolveFromConfigFile="true"
+ errorLevel="1"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns="https://getpsalm.org/schema/config"
  xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/Inflector.php

@@ -53,6 +53,7 @@ final class Inflector
 
  /**
  * @var string[] The rules for converting a word into its plural form.
+ * @psalm-var array<string,string>
  * The keys are the regular expressions and the values are the corresponding replacements.
  */
  private array $pluralizeRules = [
@@ -91,6 +92,7 @@ final class Inflector
 
  /**
  * @var string[] The rules for converting a word into its singular form.
+ * @psalm-var array<string, string>
  * The keys are the regular expressions and the values are the corresponding replacements.
  */
  private array $singularizeRules = [
@@ -138,6 +140,7 @@ final class Inflector
  ];
 
  /**
+ * @psalm-var array<string, string>
  * @var string[] The special rules for converting a word between its plural form and singular form.
  * The keys are the special words in singular form, and the values are the corresponding plural form.
  */
@@ -285,6 +288,7 @@ final class Inflector
 
  /**
  * @param string[] $rules The rules for converting a word into its plural form.
+ * @psalm-param array<string, string> $rules
  * The keys are the regular expressions and the values are the corresponding replacements.
  * @return self
  */
@@ -307,6 +311,7 @@ public function getPluralizeRules(): array
  /**
  * @param string[] $rules The rules for converting a word into its singular form.
  * The keys are the regular expressions and the values are the corresponding replacements.
+ * @psalm-param array<string, string> $rules
  * @return self
  */
  public function withSingularizeRules(array $rules): self
@@ -327,6 +332,7 @@ public function getSingularizeRules(): array
 
  /**
  * @param string[] $rules The special rules for converting a word between its plural form and singular form.
+ * @psalm-param array<string, string> $rules
  * The keys are the special words in singular form, and the values are the corresponding plural form.
  * @return self
  */
@@ -351,7 +357,7 @@ public function getSpecialRules(): array
  * a {@see \Transliterator} can be built for transliteration. Used by {@see toTransliterated()} when intl is available.
  * Defaults to {@see TRANSLITERATE_LOOSE}.
  * @return self
- *@see https://secure.php.net/manual/en/transliterator.transliterate.php
+ * @see https://secure.php.net/manual/en/transliterator.transliterate.php
  */
  public function withTransliterator($transliterator): self
  {

src/NumericHelper.php

@@ -47,6 +47,9 @@ public static function toOrdinal($value): string
  */
  public static function normalize($value): string
  {
+ /**
+ * @psalm-suppress DocblockTypeContradiction
+ */
  if (!is_scalar($value)) {
  $type = gettype($value);
  throw new \InvalidArgumentException("Value must be scalar. $type given.");

src/StringHelper.php

@@ -184,6 +184,9 @@ public static function startsWithIgnoringCase(string $input, ?string $with): boo
  return true;
  }
 
+ /**
+ * @psalm-suppress PossiblyNullArgument
+ */
  return static::lowercase(static::substring($input, 0, $bytes, '8bit')) === static::lowercase($with);
  }
 
@@ -233,6 +236,9 @@ public static function endsWithIgnoringCase(string $input, ?string $with): bool
  return true;
  }
 
+ /**
+ * @psalm-suppress PossiblyNullArgument
+ */
  return static::lowercase(mb_substr($input, -$bytes, mb_strlen($input, '8bit'), '8bit')) === static::lowercase($with);
  }
 

tests/NumericHelperTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Yiisoft\Strings\Tests;
 
 use PHPUnit\Framework\TestCase;

tests/StringHelperTest.php

@@ -158,6 +158,7 @@ public function testStartsWithIgnoringCase(): void
  $this->assertTrue(StringHelper::startsWithIgnoringCase('HTTP://BÜrger.DE/', 'http://bürger.de'));
  $this->assertTrue(StringHelper::startsWithIgnoringCase('üЯйΨB', 'ÜяЙΨ'));
  $this->assertTrue(StringHelper::startsWithIgnoringCase('anything', ''));
+ $this->assertTrue(StringHelper::startsWithIgnoringCase('anything', null));
  }
 
  /**
@@ -210,6 +211,7 @@ public function testEndsWithIgnoringCase(): void
  $this->assertTrue(StringHelper::endsWithIgnoringCase('string', 'nG'));
  $this->assertTrue(StringHelper::endsWithIgnoringCase('BüЯйΨ', 'ÜяЙΨ'));
  $this->assertTrue(StringHelper::endsWithIgnoringCase('anything', ''));
+ $this->assertTrue(StringHelper::endsWithIgnoringCase('anything', null));
  }
 
  public function testCountWords(): void

tests/WildcardPatternTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Yiisoft\Strings\Tests;
 
 use PHPUnit\Framework\TestCase;