Merge pull request #77 from jawira/fix-psalm

Fix psalm
jawira · Nov 16, 2021 · e983ef4 · e983ef4
2 parents 2ed1418 + fc03aed
commit e983ef4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -1,5 +1,9 @@
 name: Quality assurance
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
 

diff --git a/psalm.xml b/psalm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<psalm errorLevel="5"
+<psalm errorLevel="1"
        resolveFromConfigFile="true"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="https://getpsalm.org/schema/config"

diff --git a/src/Glue/Gluer.php b/src/Glue/Gluer.php
@@ -53,7 +53,7 @@ abstract class Gluer
      * @param string[] $words
      * @param bool     $forceSimpleCaseMapping
      */
-    public function __construct(array $words, bool $forceSimpleCaseMapping)
+    final public function __construct(array $words, bool $forceSimpleCaseMapping)
     {
         $this->words     = $words;
         $this->lowerCase = MB_CASE_LOWER;
@@ -94,14 +94,13 @@ abstract public function glue(): string;
      */
     protected function setSimpleCaseMappingConstants(): self
     {
+        /** @var int $lowerCase */
         $lowerCase = defined('\MB_CASE_LOWER_SIMPLE') ? constant('\MB_CASE_LOWER_SIMPLE') : MB_CASE_LOWER;
+        /** @var int $upperCase */
         $upperCase = defined('\MB_CASE_UPPER_SIMPLE') ? constant('\MB_CASE_UPPER_SIMPLE') : MB_CASE_UPPER;
+        /** @var int $titleCase */
         $titleCase = defined('\MB_CASE_TITLE_SIMPLE') ? constant('\MB_CASE_TITLE_SIMPLE') : MB_CASE_TITLE;
 
-        assert(is_int($lowerCase));
-        assert(is_int($upperCase));
-        assert(is_int($titleCase));
-
         $this->lowerCase = $lowerCase;
         $this->upperCase = $upperCase;
         $this->titleCase = $titleCase;
@@ -146,7 +145,7 @@ protected function changeWordsCase(array $words, int $caseMode): array
             return $words;
         }
 
-        $closure = function (string $word) use ($caseMode) {
+        $closure = function (string $word) use ($caseMode): string {
             return mb_convert_case($word, $caseMode, self::ENCODING);
         };
 

diff --git a/src/Split/Splitter.php b/src/Split/Splitter.php
@@ -19,7 +19,7 @@ abstract class Splitter
      */
     protected $inputString;
 
-    public function __construct(string $inputString)
+    final public function __construct(string $inputString)
     {
         $this->inputString = $inputString;
     }