fix coding standards

azjezz · Feb 17, 2021 · 76fbe09 · 76fbe09
1 parent 25f2ed7
commit 76fbe09
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Psl/Internal/internal_encoding.php b/src/Psl/Internal/internal_encoding.php
@@ -18,9 +18,22 @@
 function internal_encoding(?string $encoding = null): string
 {
     Psl\invariant(null === $encoding || is_encoding_valid($encoding), 'Invalid encoding.');
+    if (null !== $encoding) {
+        return $encoding;
+    }
+
+    /**
+     * @psalm-suppress ImpureFunctionCall
+     */
+    $internal_encoding = mb_internal_encoding();
+
     /**
      * @psalm-suppress ImpureFunctionCall - see https://github.com/azjezz/psl/issues/130
      * @psalm-suppress ImpureMethodCall - see https://github.com/azjezz/psl/issues/130
      */
-    return $encoding ?? (Type\string()->matches($internal_encoding = mb_internal_encoding()) ? $internal_encoding : 'UTF-8');
+    if (Type\string()->matches($internal_encoding)) {
+        return $internal_encoding;
+    }
+
+    return 'UTF-8';
 }
diff --git a/src/Psl/Type/Internal/NullType.php b/src/Psl/Type/Internal/NullType.php
@@ -8,8 +8,6 @@
 use Psl\Type\Exception\AssertException;
 use Psl\Type\Exception\CoercionException;
 
-use function is_null;
-
 /**
  * @extends Type\Type<null>
  *
@@ -34,7 +32,7 @@ public function matches($value): bool
      */
     public function coerce($value)
     {
-        if (is_null($value)) {
+        if (null === $value) {
             return null;
         }