diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php index 1af567a9762c..e35e05ffbf8a 100644 --- a/apps/files/lib/Command/Scan.php +++ b/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; diff --git a/composer.lock b/composer.lock index 5396d7f3282c..3cb42cacd5d1 100644 --- a/composer.lock +++ b/composer.lock @@ -5726,17 +5726,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "237f1821ece806de66072813d8cbe5bdbc8f3117" + "reference": "3b77f2101068074f1c98977cc34ef939bbce3d19" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/Roave/SecurityAdvisories/zipball/237f1821ece806de66072813d8cbe5bdbc8f3117", - "reference": "237f1821ece806de66072813d8cbe5bdbc8f3117", + "url": "https://github.com/gitapi/repos/Roave/SecurityAdvisories/zipball/3b77f2101068074f1c98977cc34ef939bbce3d19", + "reference": "3b77f2101068074f1c98977cc34ef939bbce3d19", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.2.8", + "admidio/admidio": "<4.2.9", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<=2.2.1", "akaunting/akaunting": "<2.1.13", @@ -5770,7 +5770,7 @@ "baserproject/basercms": "<4.7.5", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<=2.6.6", + "billz/raspap-webgui": "<2.8.9", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", @@ -5999,7 +5999,7 @@ "modx/revolution": "<= 2.8.3-pl|<2.8", "mojo42/jirafeau": "<4.4", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.2-rc.2|= 3.11", + "moodle/moodle": "<4.2-rc.2|= 4.2.0|= 3.11", "mustache/mustache": ">=2,<2.14.1", "namshi/jose": "<2.2", "neoan3-apps/template": "<1.1.1", @@ -6334,7 +6334,7 @@ "type": "tidelift" } ], - "time": "2023-06-22T20:04:46+00:00" + "time": "2023-06-28T00:17:41+00:00" }, { "name": "sebastian/cli-parser", diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index e4110f1a7424..6ca1ecc2ca7f 100644 --- a/lib/private/App/InfoParser.php +++ b/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); diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index a698c0f58c92..d220feeccd1a 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/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) { diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php index 9f5318101cb8..7ec3b2d6cccd 100644 --- a/lib/private/Files/Stream/Encryption.php +++ b/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); diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index aa13e58e39b0..cd6b375c2a6b 100644 --- a/lib/private/Files/View.php +++ b/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); } diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index eb9b25b9a8cd..3340519450c3 100644 --- a/lib/private/Share/Share.php +++ b/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 { diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php index ad94112c62cc..1e44f2452557 100644 --- a/lib/private/legacy/files.php +++ b/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); diff --git a/vendor-bin/owncloud-codestyle/composer.json b/vendor-bin/owncloud-codestyle/composer.json index 9785958c6abb..01654042f6d3 100644 --- a/vendor-bin/owncloud-codestyle/composer.json +++ b/vendor-bin/owncloud-codestyle/composer.json @@ -1,5 +1,5 @@ { "require": { - "owncloud/coding-standard": "^4.1" + "owncloud/coding-standard": "^4.2" } }