Merge pull request #22304 from nextcloud/techdebt/noid/matching-param-names

Use matching parameter names form interfaces and implementations

1 files changed, 38 insertions, 15 deletions

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index be5769de7ae..65f4c994d28 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.13.1@afd8874a9e4562eac42a02de90e42e430c3a1db1">
+<files psalm-version="3.14.1@9822043ca46d6682b76097bfa97d7c450eef9e90">
   <file src="3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php">
     <ImplementedReturnTypeMismatch occurrences="1">
       <code>string|null</code>
@@ -196,6 +196,9 @@
     <MoreSpecificImplementedParamType occurrences="1">
       <code>$calendarData</code>
     </MoreSpecificImplementedParamType>
+    <ParamNameMismatch occurrences="1">
+      <code>$calendarData</code>
+    </ParamNameMismatch>
   </file>
   <file src="apps/dav/lib/CalDAV/CachedSubscriptionObject.php">
     <ImplementedReturnTypeMismatch occurrences="1">
@@ -677,6 +680,9 @@
       <code>null</code>
       <code>null</code>
     </NullArgument>
+    <ParamNameMismatch occurrences="1">
+      <code>$fullSourcePath</code>
+    </ParamNameMismatch>
     <UndefinedFunction occurrences="1">
       <code>\Sabre\Uri\split($sourceNode-&gt;getPath())</code>
     </UndefinedFunction>
@@ -749,8 +755,8 @@
   <file src="apps/dav/lib/Connector/Sabre/ObjectTree.php">
     <UndefinedFunction occurrences="3">
       <code>\Sabre\Uri\split($path)</code>
-      <code>\Sabre\Uri\split($destination)</code>
-      <code>\Sabre\Uri\split($destination)</code>
+      <code>\Sabre\Uri\split($destinationPath)</code>
+      <code>\Sabre\Uri\split($destinationPath)</code>
     </UndefinedFunction>
   </file>
   <file src="apps/dav/lib/Connector/Sabre/Principal.php">
@@ -1537,6 +1543,10 @@
     <InternalMethod occurrences="1">
       <code>put</code>
     </InternalMethod>
+    <ParamNameMismatch occurrences="2">
+      <code>$source</code>
+      <code>$target</code>
+    </ParamNameMismatch>
   </file>
   <file src="apps/files_external/lib/Lib/Storage/SFTPReadStream.php">
     <FalsableReturnStatement occurrences="2">
@@ -1611,6 +1621,10 @@
     <NullableReturnStatement occurrences="1">
       <code>null</code>
     </NullableReturnStatement>
+    <ParamNameMismatch occurrences="2">
+      <code>$source</code>
+      <code>$target</code>
+    </ParamNameMismatch>
     <TooManyArguments occurrences="2">
       <code>rename</code>
       <code>rename</code>
@@ -1848,9 +1862,6 @@
     <InvalidReturnType occurrences="1">
       <code>isSharable</code>
     </InvalidReturnType>
-    <NullArgument occurrences="1">
-      <code>$response['{http://open-collaboration-services.org/ns}share-permissions']</code>
-    </NullArgument>
   </file>
   <file src="apps/files_sharing/lib/Listener/LegacyBeforeTemplateRenderedListener.php">
     <InvalidArgument occurrences="1">
@@ -2562,12 +2573,6 @@
       <code>is_array($members)</code>
     </TypeDoesNotContainType>
   </file>
-  <file src="apps/user_ldap/lib/Group_Proxy.php">
-    <InvalidDocblock occurrences="2">
-      <code>protected function walkBackends($gid, $method, $parameters) {</code>
-      <code>protected function callOnLastSeenOn($gid, $method, $parameters, $passOnWhen) {</code>
-    </InvalidDocblock>
-  </file>
   <file src="apps/user_ldap/lib/Helper.php">
     <InvalidScalarArgument occurrences="1">
       <code>$lastNumber + 1</code>
@@ -3777,6 +3782,9 @@
     <InvalidScalarArgument occurrences="1">
       <code>$e-&gt;getCode()</code>
     </InvalidScalarArgument>
+    <ParamNameMismatch occurrences="1">
+      <code>$statement</code>
+    </ParamNameMismatch>
   </file>
   <file src="lib/private/DB/ConnectionFactory.php">
     <InternalClass occurrences="1">
@@ -3968,6 +3976,9 @@
     <InvalidArgument occurrences="1">
       <code>$eventName</code>
     </InvalidArgument>
+    <ParamNameMismatch occurrences="1">
+      <code>$eventName</code>
+    </ParamNameMismatch>
     <TooManyArguments occurrences="1">
       <code>dispatch</code>
     </TooManyArguments>
@@ -4410,14 +4421,15 @@
     </ImplementedReturnTypeMismatch>
   </file>
   <file src="lib/private/Files/ObjectStore/NoopScanner.php">
-    <ImplementedParamTypeMismatch occurrences="1">
-      <code>$folderData</code>
-    </ImplementedParamTypeMismatch>
     <MoreSpecificImplementedParamType occurrences="1">
       <code>$cacheData</code>
     </MoreSpecificImplementedParamType>
   </file>
   <file src="lib/private/Files/ObjectStore/ObjectStoreStorage.php">
+    <ParamNameMismatch occurrences="2">
+      <code>$source</code>
+      <code>$target</code>
+    </ParamNameMismatch>
     <UndefinedInterfaceMethod occurrences="4">
       <code>$child</code>
       <code>$child</code>
@@ -4590,6 +4602,12 @@
     <InvalidReturnType occurrences="1">
       <code>filemtime</code>
     </InvalidReturnType>
+    <ParamNameMismatch occurrences="4">
+      <code>$source</code>
+      <code>$target</code>
+      <code>$source</code>
+      <code>$target</code>
+    </ParamNameMismatch>
   </file>
   <file src="lib/private/Files/Storage/Local.php">
     <ImplicitToStringCast occurrences="1">
@@ -4794,6 +4812,10 @@
     <InvalidScalarArgument occurrences="1">
       <code>'ext'</code>
     </InvalidScalarArgument>
+    <ParamNameMismatch occurrences="2">
+      <code>$source</code>
+      <code>$target</code>
+    </ParamNameMismatch>
     <UndefinedInterfaceMethod occurrences="1">
       <code>$data</code>
     </UndefinedInterfaceMethod>
@@ -5980,6 +6002,7 @@
     </UndefinedDocblockClass>
   </file>
   <file src="lib/private/legacy/OC_Files.php">
+    <EmptyArrayAccess occurrences="2"/>
     <InvalidArgument occurrences="3">
       <code>$fileInfos</code>
       <code>[$fileInfo]</code>