bump phpstan/psalm and fix token issues found

Author: DavidGoodwin

composer.json

@@ -13,8 +13,8 @@
     "friendsofphp/php-cs-fixer": "^2.7",
     "psr/cache": "^1.0",
     "tedivm/stash": "^0.14",
-    "vimeo/psalm": "^1.0",
-    "phpstan/phpstan": "^0.9"
+    "vimeo/psalm": "^2.0",
+    "phpstan/phpstan": "^0.10"
   },
   "suggest": {
     "ext-redis": "^2.2",

psalm.xml

@@ -6,7 +6,10 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config file:///home/david/src/RateLimit/vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src/" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
     </projectFiles>
 
     <issueHandlers>
@@ -17,7 +20,9 @@
         <DeprecatedMethod errorLevel="info" />
         <DeprecatedProperty errorLevel="info" />
         <DeprecatedClass errorLevel="info" />
+        <DeprecatedConstant errorLevel="info" />
         <DeprecatedInterface errorLevel="info" />
+        <DeprecatedTrait errorLevel="info" />
 
         <MissingClosureReturnType errorLevel="info" />
         <MissingReturnType errorLevel="info" />
@@ -38,71 +43,5 @@
         <UnresolvableInclude errorLevel="info" />
 
         <RawObjectIteration errorLevel="info" />
-
-        <!-- level 4 issues - points to possible deficiencies in logic, higher false-positives -->
-
-        <MoreSpecificReturnType errorLevel="info" />
-        <LessSpecificReturnStatement errorLevel="info" />
-        <TypeCoercion errorLevel="info" />
-
-        <PossiblyFalseArgument errorLevel="info" />
-        <PossiblyFalseIterator errorLevel="info" />
-        <PossiblyFalseOperand errorLevel="info" />
-        <PossiblyFalsePropertyAssignmentValue errorLevel="info" />
-        <PossiblyFalseReference errorLevel="info" />
-        <PossiblyInvalidArgument errorLevel="info" />
-        <PossiblyInvalidArrayAccess errorLevel="info" />
-        <PossiblyInvalidArrayAssignment errorLevel="info" />
-        <PossiblyInvalidArrayOffset errorLevel="info" />
-        <PossiblyInvalidFunctionCall errorLevel="info" />
-        <PossiblyInvalidIterator errorLevel="info" />
-        <PossiblyInvalidMethodCall errorLevel="info" />
-        <PossiblyInvalidOperand errorLevel="info" />
-        <PossiblyInvalidPropertyAssignment errorLevel="info" />
-        <PossiblyInvalidPropertyAssignmentValue errorLevel="info" />
-        <PossiblyInvalidPropertyFetch errorLevel="info" />
-        <PossiblyNullArgument errorLevel="info" />
-        <PossiblyNullArrayAccess errorLevel="info" />
-        <PossiblyNullArrayAssignment errorLevel="info" />
-        <PossiblyNullArrayOffset errorLevel="info" />
-        <PossiblyNullFunctionCall errorLevel="info" />
-        <PossiblyNullIterator errorLevel="info" />
-        <PossiblyNullOperand errorLevel="info" />
-        <PossiblyNullPropertyAssignment errorLevel="info" />
-        <PossiblyNullPropertyAssignmentValue errorLevel="info" />
-        <PossiblyNullPropertyFetch errorLevel="info" />
-        <PossiblyNullReference errorLevel="info" />
-        <PossiblyUndefinedGlobalVariable errorLevel="info" />
-        <PossiblyUndefinedVariable errorLevel="info" />
-        <PossiblyUndefinedMethod errorLevel="info" />
-
-        <!-- level 5 issues - should be avoided at mosts costs... -->
-
-        <ForbiddenCode errorLevel="info" />
-        <ImplicitToStringCast errorLevel="info" />
-        <InvalidScalarArgument errorLevel="info" />
-        <InvalidToString errorLevel="info" />
-        <InvalidOperand errorLevel="info" />
-        <NoInterfaceProperties errorLevel="info" />
-        <TooManyArguments errorLevel="info" />
-        <TypeDoesNotContainType errorLevel="info" />
-        <TypeDoesNotContainNull errorLevel="info" />
-        <MissingDocblockType errorLevel="info" />
-        <ImplementedReturnTypeMismatch errorLevel="info" />
-
-        <!-- level 6 issues - really bad things -->
-
-        <InvalidNullableReturnType errorLevel="info" />
-        <NullableReturnStatement errorLevel="info" />
-        <InvalidFalsableReturnType errorLevel="info" />
-        <FalsableReturnStatement errorLevel="info" />
-
-        <MoreSpecificImplementedParamType errorLevel="info" />
-        <MoreSpecificImplementedReturnType errorLevel="info" />
-
-        <InvalidReturnStatement errorLevel="info" />
-        <InvalidReturnType errorLevel="info" />
-        <UndefinedThisPropertyAssignment errorLevel="info" />
-
     </issueHandlers>
 </psalm>

src/Adapter/Predis.php

@@ -21,7 +21,7 @@ public function __construct(\Predis\ClientInterface $client)
 
     public function set($key, $value, $ttl)
     {
-        return $this->redis->set($key, $value, "ex", $ttl);
+        return $this->redis->set($key, (string) $value, "ex", $ttl);
     }
 
     /**
@@ -39,6 +39,6 @@ public function exists($key)
 
     public function del($key)
     {
-        return (bool)$this->redis->del($key);
+        return (bool)$this->redis->del([$key]);
     }
 }

src/Adapter/Redis.php

@@ -25,24 +25,24 @@ public function __construct(\Redis $redis)
 
     public function set($key, $value, $ttl)
     {
-        return $this->redis->set($key, $value, $ttl);
+        return $this->redis->set($key, (string)$value, $ttl);
     }
 
     /**
      * @return float
      */
     public function get($key)
     {
-        return (float) $this->redis->get($key);
+        return (float)$this->redis->get($key);
     }
 
     public function exists($key)
     {
-        return $this->redis->exists($key);
+        return $this->redis->exists($key) == true;
     }
 
     public function del($key)
     {
-        return $this->redis->del($key);
+        return $this->redis->del($key) > 0;
     }
 }