chore: php 8 readiness, psalm and ea fixes

leocavalcante · Dec 29, 2020 · 58b0b2b · 58b0b2b
1 parent 277e2c8
commit 58b0b2b
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 127 deletions.
diff --git a/composer.json b/composer.json
@@ -95,7 +95,7 @@
         "generate-facades": "php bin/generate-facades.php",
         "fix": "phpcbf",
         "lint": "phpcs",
-        "analyze": "psalm --shepherd",
+        "analyze": "psalm --shepherd --no-cache",
         "test": "phpunit",
         "ci": [
             "@composer lint",

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-        bootstrap="vendor/autoload.php" colors="true" verbose="true">
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>tests/Unit</directory>
-        </testsuite>
-
-        <testsuite name="Integration">
-            <directory>tests/Integration</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-            <exclude>
-                <directory>src/Grpc</directory>
-                <directory>src/Swoole</directory>
-                <file>src/facades.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="coverage-clover" target="coverage-clover.xml"/>
-        <log type="coverage-html" target="coverage-html"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-    </logging>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  verbose="true"
+>
+  <coverage>
+    <include>
+      <directory>src</directory>
+    </include>
+    <exclude>
+      <directory>src/Grpc</directory>
+      <directory>src/Swoole</directory>
+      <file>src/facades.php</file>
+    </exclude>
+    <report>
+      <clover outputFile="coverage-clover.xml"/>
+      <html outputDirectory="coverage-html"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Integration">
+      <directory>tests/Integration</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>
diff --git a/src/Dotenv/Dotenv.php b/src/Dotenv/Dotenv.php
@@ -26,7 +26,7 @@ function init(string $path): array
  *
  * @param string|null $key
  * @param string|null $default A default when the key do not exists
- * @return string|null|array<string, string>
+ * @return string|null|array<string, string|null>
  */
 function env(?string $key = null, ?string $default = null)
 {
@@ -50,7 +50,7 @@ function int_val(string $key, ?int $default = null): ?int
     }
 
     if (is_numeric($val)) {
-        return intval($val);
+        return (int) $val;
     }
 
     return $default;
@@ -83,7 +83,7 @@ function bool_val(string $key, ?bool $default = null): ?bool
         return false;
     }
 
-    return boolval($val);
+    return (bool) $val;
 }
 
 /**
@@ -94,7 +94,7 @@ function bool_val(string $key, ?bool $default = null): ?bool
  */
 function requires(string $key): bool
 {
-    if (array_key_exists($key, $_ENV)) {
+    if (\array_key_exists($key, $_ENV)) {
         return true;
     }
 

diff --git a/src/Env/Env.php b/src/Env/Env.php
@@ -3,7 +3,6 @@
 namespace Siler\Env;
 
 use UnexpectedValueException;
-use function Siler\Functional\bool;
 
 /**
  * Gets a variable from the environment.
@@ -39,7 +38,7 @@ function env_var(string $key, ?string $default = null): string
  */
 function env_int(string $key, ?int $default = null): int
 {
-    return intval(env_var($key, $default === null ? $default : strval($default)));
+    return (int) env_var($key, $default === null ? $default : (string) $default);
 }
 
 /**
@@ -52,13 +51,13 @@ function env_int(string $key, ?int $default = null): int
  */
 function env_bool(string $key, ?bool $default = null): bool
 {
-    $value = env_var($key, $default === null ? $default : strval($default));
+    $value = env_var($key, $default === null ? $default : (string) $default);
 
-    if (in_array($value, ['false', '0', '{}', '[]', 'null', 'undefined'])) {
+    if (\in_array($value, ['false', '0', '{}', '[]', 'null', 'undefined'])) {
         return false;
     }
 
-    return boolval($value);
+    return (bool) $value;
 }
 
 /**
@@ -69,5 +68,5 @@ function env_bool(string $key, ?bool $default = null): bool
  */
 function env_has(string $key): bool
 {
-    return array_key_exists($key, $_ENV);
+    return \array_key_exists($key, $_ENV);
 }
diff --git a/src/GraphQL/DateScalar.php b/src/GraphQL/DateScalar.php
@@ -1,6 +1,5 @@
 <?php declare(strict_types=1);
 
-
 namespace Siler\GraphQL;
 
 use DateTime;
@@ -25,7 +24,7 @@ class DateScalar extends ScalarType
     public function serialize($value): string
     {
         if ($value instanceof DateTime) {
-            return $value->format((string)static::FORMAT);
+            return $value->format((string) static::FORMAT);
         }
 
         throw new Error('Don\'t know how to serialize non-DateTime');
@@ -37,13 +36,13 @@ public function serialize($value): string
      * @return mixed
      * @throws Error
      */
-    public function parseLiteral($valueNode, ?array $variables = null)
+    public function parseLiteral(Node $valueNode, ?array $variables = null)
     {
         if ($valueNode instanceof StringValueNode) {
             return $this->parseValue($valueNode->value);
         }
 
-        throw new Error(sprintf('Unable to parse non string literal as %', $this->name));
+        throw new Error(sprintf('Unable to parse non string literal as %s', $this->name));
     }
 
     /**
@@ -55,8 +54,8 @@ public function parseValue($value)
     {
         $date_time = false;
 
-        if (is_string($value)) {
-            $date_time = DateTime::createFromFormat((string)static::FORMAT, $value);
+        if (\is_string($value)) {
+            $date_time = DateTime::createFromFormat((string) static::FORMAT, $value);
         }
 
         if ($date_time === false) {