Merge pull request #30814 from nextcloud/backport/30508/stable23

nextcloud · Jan 27, 2022 · 3ee9bcc · 3ee9bcc
2 parents 8de4709 + d69531a
commit 3ee9bcc
Show file tree

Hide file tree

Showing 65 changed files with 990 additions and 705 deletions.
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-require_once './lib/composer/autoload.php';
+require_once './vendor-bin/cs-fixer/vendor/autoload.php';
 
 use Nextcloud\CodingStandard\Config;
 
 $config = new Config();
 $config
 	->getFinder()
+	->ignoreVCSIgnored(true)
 	->exclude('config')
 	->exclude('data')
 	->notPath('3rdparty')

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
@@ -1753,7 +1753,7 @@ private function detectUuidAttribute($dn, $isUser = true, $force = false, array
 			}
 
 			$attribute = $this->connection->getFromCache($uuidAttr);
-			if (!$attribute === null) {
+			if ($attribute !== null) {
 				$this->connection->$uuidAttr = $attribute;
 				return true;
 			}

diff --git a/apps/user_status/lib/Db/UserStatusMapper.php b/apps/user_status/lib/Db/UserStatusMapper.php
@@ -35,6 +35,8 @@
  *
  * @package OCA\UserStatus\Db
  *
+ * @psalm-suppress MoreSpecificImplementedParamType
+ *
  * @method UserStatus insert(UserStatus $entity)
  * @method UserStatus update(UserStatus $entity)
  * @method UserStatus insertOrUpdate(UserStatus $entity)

diff --git a/build/files-checker.php b/build/files-checker.php
@@ -38,7 +38,7 @@
 	'.jshintrc',
 	'.mailmap',
 	'.npmignore',
-	'.php_cs.dist',
+	'.php-cs-fixer.dist.php',
 	'.scrutinizer.yml',
 	'.tag',
 	'.tx',

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
@@ -623,7 +623,7 @@ public function userUploadsBulkedFiles($user, $name1, $content1, $name2, $conten
 		$body .= $content3."\r\n";
 		$body .= '--'.$boundary."--\r\n";
 
-		$stream = fopen('php://temp','r+');
+		$stream = fopen('php://temp', 'r+');
 		fwrite($stream, $body);
 		rewind($stream);