Merge pull request #787 from cakephp/fix-psalm

othercorey · web-flow · commit 45c2b582729c · 2020-10-25T21:32:43.000-05:00
Fix psalm
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -123,6 +123,9 @@
     <UndefinedInterfaceMethod occurrences="1">
       <code>genericInstances</code>
     </UndefinedInterfaceMethod>
+    <TypeDoesNotContainType occurrences="1">
+      <code>!$connection instanceof ConnectionInterface</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="src/Panel/VariablesPanel.php">
     <InvalidArgument occurrences="1">
@@ -152,8 +155,9 @@
     <DeprecatedMethod occurrences="1">
       <code>makeNeatArray</code>
     </DeprecatedMethod>
-    <InvalidArgument occurrences="1">
+    <InvalidArgument occurrences="2">
       <code>$value</code>
+      <code>$values</code>
     </InvalidArgument>
   </file>
 </files>
diff --git a/tests/TestCase/DebugIncludeTest.php b/tests/TestCase/DebugIncludeTest.php
@@ -27,7 +27,7 @@ public function testIncludePaths()
         $include = new DebugInclude();
         $result = $include->includePaths();
         $this->assertIsArray($result);
-        $this->assertFileExists($result[0]);
+        $this->assertStringContainsString($result[0], get_include_path());
     }
 
     public function testIsCakeFile()

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function testIncludePaths()`
`27`	`27`	`$include = new DebugInclude();`
`28`	`28`	`$result = $include->includePaths();`
`29`	`29`	`$this->assertIsArray($result);`
`30`		`- $this->assertFileExists($result[0]);`
	`30`	`+ $this->assertStringContainsString($result[0], get_include_path());`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function testIsCakeFile()`