Update static testing, and fix newly found issues.

BGSU-LITS · Aug 4, 2021 · db412ff · db412ff
1 parent 494c0fb
commit db412ff
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -4,17 +4,22 @@
     <rule ref="PSR12"/>
 
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Classes.DuplicateClassName"/>
+    <rule ref="Generic.CodeAnalysis.AssignmentInCondition"/>
     <rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
-    <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
+    <rule ref="Generic.CodeAnalysis.EmptyStatement">
+        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCatch"/>
+    </rule>
     <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
     <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
     <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
     <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
     <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
     <rule ref="Generic.Commenting.Fixme"/>
-    <rule ref="Generic.Formatting.SpaceAfterCast"/>
     <rule ref="Generic.Commenting.Todo"/>
+    <rule ref="Generic.Files.InlineHTML"/>
+    <rule ref="Generic.Formatting.SpaceAfterCast"/>
     <rule ref="Generic.Functions.CallTimePassByReference"/>
     <rule ref="Generic.Metrics.CyclomaticComplexity"/>
     <rule ref="Generic.Metrics.NestingLevel"/>
@@ -24,9 +29,18 @@
     <rule ref="Generic.PHP.DiscourageGoto"/>
     <rule ref="Generic.PHP.ForbiddenFunctions"/>
     <rule ref="Generic.PHP.NoSilencedErrors"/>
+    <rule ref="Generic.PHP.SAPIUsage"/>
+    <rule ref="Generic.Strings.UnnecessaryStringConcat">
+        <properties>
+            <property name="allowMultiline" value="true"/>
+        </properties>
+    </rule>
+
+    <rule ref="PEAR.Commenting.InlineComment"/>
 
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
-    <rule ref="Squiz.Classes.LowercaseClassKeywords"/>
+    <rule ref="Squiz.Classes.ClassFileName"/>
+    <rule ref="Squiz.Classes.SelfMemberReference"/>
     <rule ref="Squiz.Commenting.DocCommentAlignment"/>
     <rule ref="Squiz.Operators.ValidLogicalOperators"/>
     <rule ref="Squiz.PHP.LowercasePHPFunctions"/>
@@ -97,7 +111,6 @@
     <rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
     <rule ref="SlevomatCodingStandard.Commenting.UselessFunctionDocComment"/>
     <rule ref="SlevomatCodingStandard.Commenting.UselessInheritDocComment"/>
-    <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.BlockControlStructureSpacing"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowContinueWithoutIntegerOperandInSwitch"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEmpty"/>

diff --git a/psalm.xml b/psalm.xml
@@ -10,6 +10,7 @@
     ignoreInternalFunctionNullReturn="false"
     resolveFromConfigFile="false"
     sealAllMethods="true"
+    strictBinaryOperands="true"
 >
     <issueHandlers>
         <PropertyNotSetInConstructor>

diff --git a/src/Client.php b/src/Client.php
@@ -320,7 +320,8 @@ private function send(HttpRequest $request): string
         }
 
         if ($response->getStatusCode() !== self::HTTP_OK) {
-            $message = 'HTTP ' . $response->getStatusCode() . ' response';
+            $message = 'HTTP ' . (string) $response->getStatusCode() .
+                ' response';
 
             try {
                 $message .= self::parseJsonError(
@@ -408,7 +409,10 @@ private static function parseJsonError(object $json): string
     {
         if (isset($json->errors)) {
             if (\is_array($json->errors)) {
-                return ': ' . \implode('; ', $json->errors);
+                /** @var string[] */
+                $errors = $json->errors;
+
+                return ': ' . \implode('; ', $errors);
             }
 
             if (\is_string($json->errors)) {

diff --git a/src/Data.php b/src/Data.php
@@ -131,7 +131,7 @@ protected static function decodeJson(string $data)
             return \json_decode(
                 $data,
                 false,
-                Data::JSON_DEPTH,
+                self::JSON_DEPTH,
                 \JSON_THROW_ON_ERROR
             );
         } catch (\Throwable $exception) {

diff --git a/src/Data/Space/Reserve/PayloadReserveSpaceData.php b/src/Data/Space/Reserve/PayloadReserveSpaceData.php
@@ -66,7 +66,9 @@ public function json(): string
                 continue;
             }
 
-            $data[$key] = \implode(', ', $data[$key]);
+            /** @var string[] */
+            $strings = $data[$key];
+            $data[$key] = \implode(', ', $strings);
         }
 
         try {