Merge pull request #20172 from nextcloud/techdebt/phpunit-short-return

Use the shorter phpunit syntax for mocked return values

diff --cc tests/lib/Avatar/UserAvatarTest.php
index ed0a32dab6fd4f9d44f7b39a39bd785730ce10e3,11bb33a9741842400530da3abc70194733447860..b93c4112af50c95b9bdb80a03672aaa16de526fa
--- 1/tests/lib/Avatar/UserAvatarTest.php
--- 2/tests/lib/Avatar/UserAvatarTest.php
+++ b/tests/lib/Avatar/UserAvatarTest.php
@@@ -68,9 -68,9 +68,9 @@@ class UserAvatarTest extends \Test\Test
                                        return true;
                                }
                                return false;
-                       }));
+                       });
  
 -              $data = NULL;
 +              $data = null;
                $file->method('putContent')
                        ->with($this->callback(function ($d) use (&$data) {
                                $data = $d;

diff --cc tests/lib/Files/Stream/EncryptionTest.php
Simple merge

diff --cc tests/lib/Mail/MessageTest.php
Simple merge

diff --cc tests/lib/TagsTest.php
Simple merge