Skip to content

Commit 472f4ca

Browse files
authored
Merge pull request #33380 from luzpaz/fix/lib-private-typos
Fix typos in lib/private subdirectory
2 parents 97e88f3 + 368f830 commit 472f4ca

37 files changed

Lines changed: 44 additions & 44 deletions

lib/private/App/CompareVersion.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CompareVersion {
4141
* so '13.0.1', '13.0' and '13' are valid.
4242
*
4343
* @param string $actual version as major.minor.patch notation
44-
* @param string $required version where major is requried and minor and patch are optional
44+
* @param string $required version where major is required and minor and patch are optional
4545
* @param string $comparator passed to `version_compare`
4646
* @return bool whether the requirement is fulfilled
4747
* @throws InvalidArgumentException if versions specified in an invalid format

lib/private/AppFramework/Http/Dispatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function dispatch(Controller $controller, string $methodName): array {
118118
$out = [null, [], null];
119119

120120
try {
121-
// prefill reflector with everything thats needed for the
121+
// prefill reflector with everything that's needed for the
122122
// middlewares
123123
$this->reflector->reflect($controller, $methodName);
124124

@@ -156,7 +156,7 @@ public function dispatch(Controller $controller, string $methodName): array {
156156

157157
// if an exception appears, the middleware checks if it can handle the
158158
// exception and creates a response. If no response is created, it is
159-
// assumed that theres no middleware who can handle it and the error is
159+
// assumed that there's no middleware who can handle it and the error is
160160
// thrown again
161161
} catch (\Exception $exception) {
162162
$response = $this->middlewareDispatcher->afterException(

lib/private/AppFramework/Http/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ public function getParam(string $key, $default = null) {
342342

343343
/**
344344
* Returns all params that were received, be it from the request
345-
* (as GET or POST) or throuh the URL by the route
345+
* (as GET or POST) or through the URL by the route
346346
* @return array the array with all parameters
347347
*/
348348
public function getParams(): array {

lib/private/AppFramework/Middleware/MiddlewareDispatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MiddlewareDispatcher {
4646
private $middlewares;
4747

4848
/**
49-
* @var int counter which tells us what middlware was executed once an
49+
* @var int counter which tells us what middleware was executed once an
5050
* exception occurs
5151
*/
5252
private $middlewareCounter;

lib/private/Authentication/Token/IProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function getPassword(IToken $savedToken, string $tokenId): string;
158158
public function setPassword(IToken $token, string $tokenId, string $password);
159159

160160
/**
161-
* Rotate the token. Usefull for for example oauth tokens
161+
* Rotate the token. Useful for for example oauth tokens
162162
*
163163
* @param IToken $token
164164
* @param string $oldTokenId

lib/private/Avatar/Avatar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private function hashToInt(string $hash, int $maximum): int {
236236
}
237237

238238
/**
239-
* @return Color Object containting r g b int in the range [0, 255]
239+
* @return Color Object containing r g b int in the range [0, 255]
240240
*/
241241
public function avatarBackgroundColor(string $hash): Color {
242242
// Normalize hash

lib/private/Contacts/ContactsMenu/ContactsStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function getContacts(IUser $user, ?string $filter, ?int $limit = null, ?i
123123
* 2. if the `shareapi_exclude_groups` config option is enabled and the
124124
* current user is in an excluded group it will filter all local users.
125125
* 3. if the `shareapi_only_share_with_group_members` config option is
126-
* enabled it will filter all users which doens't have a common group
126+
* enabled it will filter all users which doesn't have a common group
127127
* with the current user.
128128
*
129129
* @param IUser $self

lib/private/DB/QueryBuilder/QueryBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ public function set($key, $value) {
852852
* ->from('users', 'u')
853853
* ->where('u.id = ?');
854854
*
855-
* // You can optionally programatically build and/or expressions
855+
* // You can optionally programmatically build and/or expressions
856856
* $qb = $conn->getQueryBuilder();
857857
*
858858
* $or = $qb->expr()->orx();

lib/private/Files/Cache/Cache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
/**
6565
* Metadata cache for a storage
6666
*
67-
* The cache stores the metadata for all files and folders in a storage and is kept up to date trough the following mechanisms:
67+
* The cache stores the metadata for all files and folders in a storage and is kept up to date through the following mechanisms:
6868
*
6969
* - Scanner: scans the storage and updates the cache where needed
7070
* - Watcher: checks for changes made to the filesystem outside of the Nextcloud instance and rescans files and folder when a change is detected
@@ -582,7 +582,7 @@ private function removeChildren(ICacheEntry $entry) {
582582
$parentIds = [$entry->getId()];
583583
$queue = [$entry->getId()];
584584

585-
// we walk depth first trough the file tree, removing all filecache_extended attributes while we walk
585+
// we walk depth first through the file tree, removing all filecache_extended attributes while we walk
586586
// and collecting all folder ids to later use to delete the filecache entries
587587
while ($entryId = array_pop($queue)) {
588588
$children = $this->getFolderContentsById($entryId);

lib/private/Files/Cache/Propagator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $c
6666
* @param int $sizeDifference number of bytes the file has grown
6767
*/
6868
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
69-
// Do not propogate changes in ignored paths
69+
// Do not propagate changes in ignored paths
7070
foreach ($this->ignore as $ignore) {
7171
if (strpos($internalPath, $ignore) === 0) {
7272
return;

0 commit comments

Comments
 (0)