Merge pull request #40852 from owncloud/php-cs-fixer-3.20.0

Apply code-style changes from php-cs-fixer 3.20

apps/files/lib/Command/Scan.php

@@ -221,7 +221,7 @@ protected function scanFiles($user, $path, $verbose, OutputInterface $output, $b
 			$scanner->listen('\OC\Files\Utils\Scanner', 'StorageNotAvailable', function (StorageNotAvailableException $e) use ($output) {
 				$output->writeln("Error while scanning, storage not available (" . $e->getMessage() . ")");
 			});
-		# count only
+			# count only
 		} else {
 			$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function () {
 				$this->filesCounter += 1;

lib/private/App/InfoParser.php

@@ -172,7 +172,7 @@ protected function xmlToArray($xml) {
 				} else {
 					$array[$element] = $data;
 				}
-			// Just a value
+				// Just a value
 			} else {
 				if ($totalElement > 1) {
 					$array[$element][] = $this->xmlToArray($node);

lib/private/AppFramework/Http/Request.php

@@ -427,8 +427,8 @@ protected function decodeContent() {
 				}
 			}
 
-		// Handle application/x-www-form-urlencoded for methods other than GET
-		// or post correctly
+			// Handle application/x-www-form-urlencoded for methods other than GET
+			// or post correctly
 		} elseif ($this->method !== 'GET'
 				&& $this->method !== 'POST'
 				&& \strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {

lib/private/Files/Stream/Encryption.php

@@ -298,7 +298,7 @@ public function stream_read($count) {
 				$result .= \substr($this->cache, $blockPosition, $remainingLength);
 				$this->position += $remainingLength;
 				$count = 0;
-			// otherwise remainder of current block is fetched, the block is flushed and the position updated
+				// otherwise remainder of current block is fetched, the block is flushed and the position updated
 			} else {
 				$result .= \substr($this->cache, $blockPosition);
 				$this->flush();
@@ -359,8 +359,8 @@ public function stream_write($data) {
 					$this->position += $remainingLength;
 					$length += $remainingLength;
 					$data = '';
-				// if $data doesn't fit the current block, the fill the current block and reiterate
-				// after the block is filled, it is flushed and $data is updatedxxx
+					// if $data doesn't fit the current block, the fill the current block and reiterate
+					// after the block is filled, it is flushed and $data is updatedxxx
 				} else {
 					$this->cache = \substr($this->cache, 0, $blockPosition) .
 						\substr($data, 0, $this->unencryptedBlockSize - $blockPosition);

lib/private/Files/View.php

@@ -869,14 +869,14 @@ public function rename($path1, $path2) {
 						} else {
 							$result = false;
 						}
-					// moving a file/folder within the same mount point
+						// moving a file/folder within the same mount point
 					} elseif ($storage1 === $storage2) {
 						if ($storage1) {
 							$result = $storage1->rename($internalPath1, $internalPath2);
 						} else {
 							$result = false;
 						}
-					// moving a file/folder between storages (from $storage1 to $storage2)
+						// moving a file/folder between storages (from $storage1 to $storage2)
 					} else {
 						$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
 					}

lib/private/Share/Share.php

@@ -1108,9 +1108,9 @@ public static function unshare($itemType, $itemSource, $shareType, $shareWith, $
 			// delete the item with the expected share_type and owner
 			if ((int)$item['share_type'] === (int)$shareType && $item['uid_owner'] === $currentUser) {
 				$toDelete = $item;
-			// if there is more then one result we don't have to delete the children
-			// but update their parent. For group shares the new parent should always be
-			// the original group share and not the db entry with the unique name
+				// if there is more then one result we don't have to delete the children
+				// but update their parent. For group shares the new parent should always be
+				// the original group share and not the db entry with the unique name
 			} elseif ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) {
 				$newParent = $item['parent'];
 			} else {

lib/private/legacy/files.php

@@ -80,7 +80,7 @@ private static function sendHeaders($filename, $name, array $rangeArray) {
 				\header('Accept-Ranges: bytes', true);
 				if (\count($rangeArray) > 1) {
 					$type = 'multipart/byteranges; boundary='.self::getBoundary();
-				// no Content-Length header here
+					// no Content-Length header here
 				} else {
 					\header(\sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true);
 					OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1);

vendor-bin/owncloud-codestyle/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-      "owncloud/coding-standard": "^4.1"
+      "owncloud/coding-standard": "^4.2"
     }
   }