diff --git a/apps/workflowengine/lib/Check/RequestRemoteAddress.php b/apps/workflowengine/lib/Check/RequestRemoteAddress.php index de9738fb631276cfd3bad0557b6ba04d6740e8bb..6fa4cfc880055393264ab7f0b00d32510674ca39 100644 --- a/apps/workflowengine/lib/Check/RequestRemoteAddress.php +++ b/apps/workflowengine/lib/Check/RequestRemoteAddress.php @@ -83,7 +83,7 @@ class RequestRemoteAddress implements ICheck { } $decodedValue = explode('/', $value); - if (sizeof($decodedValue) !== 2) { + if (count($decodedValue) !== 2) { throw new \UnexpectedValueException($this->l->t('The given IP range is invalid'), 2); } diff --git a/core/Command/Config/System/DeleteConfig.php b/core/Command/Config/System/DeleteConfig.php index 216cf4eb6401e4fc5853bc342cf51497e3f33e43..429dd806b713c173ae0aacdf1dd90ef8706041fd 100644 --- a/core/Command/Config/System/DeleteConfig.php +++ b/core/Command/Config/System/DeleteConfig.php @@ -64,7 +64,7 @@ class DeleteConfig extends Base { $configNames = $input->getArgument('name'); $configName = $configNames[0]; - if (sizeof($configNames) > 1) { + if (count($configNames) > 1) { if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); return 1; diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index 992fca8d084c24ad222766735b647f58eb928a03..92c503907bd5528c1398c4e09a76119f5c60070d 100644 --- a/core/Command/Config/System/SetConfig.php +++ b/core/Command/Config/System/SetConfig.php @@ -81,7 +81,7 @@ class SetConfig extends Base { $configValue = $this->castValue($input->getOption('value'), $input->getOption('type')); $updateOnly = $input->getOption('update-only'); - if (sizeof($configNames) > 1) { + if (count($configNames) > 1) { $existingValue = $this->systemConfig->getValue($configName); $newValue = $this->mergeArrayValue( diff --git a/core/Command/L10n/CreateJs.php b/core/Command/L10n/CreateJs.php index 9c14490b97f3a9752d1930c60aa2205be0b16fb0..d060f166b8536951a6e86451fdbc29739bf74d17 100644 --- a/core/Command/L10n/CreateJs.php +++ b/core/Command/L10n/CreateJs.php @@ -105,11 +105,11 @@ class CreateJs extends Command implements CompletionAwareInterface { $jsTrans = array(); foreach ($translations as $id => $val) { if (is_array($val)) { - $val = '[ ' . join(',', $val) . ']'; + $val = '[ ' . implode(',', $val) . ']'; } $jsTrans[] = "\"$id\" : \"$val\""; } - $content .= join(",\n ", $jsTrans); + $content .= implode(",\n ", $jsTrans); $content .= "\n},\n\"$plurals\");\n"; file_put_contents($jsFile, $content); diff --git a/lib/private/App/Platform.php b/lib/private/App/Platform.php index fe4d7ff48f790e8892d31c31e8f0fa38f84de42c..efe01d291d780c744c2dda39e7cc3e21f77226a5 100644 --- a/lib/private/App/Platform.php +++ b/lib/private/App/Platform.php @@ -61,7 +61,7 @@ class Platform { */ public function getOcVersion() { $v = \OCP\Util::getVersion(); - return join('.', $v); + return implode('.', $v); } /** diff --git a/lib/private/Collaboration/Collaborators/GroupPlugin.php b/lib/private/Collaboration/Collaborators/GroupPlugin.php index b147d2d7b5858f9a9211469609ace35528a987de..7eee042076eb09bbe9017c7599d7c7309830b214 100644 --- a/lib/private/Collaboration/Collaborators/GroupPlugin.php +++ b/lib/private/Collaboration/Collaborators/GroupPlugin.php @@ -59,7 +59,7 @@ class GroupPlugin implements ISearchPlugin { $groups = $this->groupManager->search($search, $limit, $offset); $groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups); - if (!$this->shareeEnumeration || sizeof($groups) < $limit) { + if (!$this->shareeEnumeration || count($groups) < $limit) { $hasMoreResults = true; } diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index d2639249d56b630fca8b6d30ca8e9c17685a1fef..62f76876031632188884392bdb0087e6805a198e 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -85,7 +85,7 @@ class UserPlugin implements ISearchPlugin { $this->takeOutCurrentUser($users); - if (!$this->shareeEnumeration || sizeof($users) < $limit) { + if (!$this->shareeEnumeration || count($users) < $limit) { $hasMoreResults = true; } diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 9507eaf5c1fb1e4efe189146bd4ec0f063f4c900..1798969ca534500340ba5fbc38e9ab6a374dfe96 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -1038,7 +1038,7 @@ class Share extends Constants { } else { $itemTypes = $collectionTypes; } - $placeholders = join(',', array_fill(0, count($itemTypes), '?')); + $placeholders = implode(',', array_fill(0, count($itemTypes), '?')); $where = ' WHERE `item_type` IN ('.$placeholders.'))'; $queryArgs = $itemTypes; } else { @@ -1064,7 +1064,7 @@ class Share extends Constants { $groups = \OC::$server->getGroupManager()->getUserGroupIds($user); } if (!empty($groups)) { - $placeholders = join(',', array_fill(0, count($groups), '?')); + $placeholders = implode(',', array_fill(0, count($groups), '?')); $where .= ' OR (`share_type` = ? AND `share_with` IN ('.$placeholders.')) '; $queryArgs[] = self::SHARE_TYPE_GROUP; $queryArgs = array_merge($queryArgs, $groups); @@ -1129,7 +1129,7 @@ class Share extends Constants { } $queryArgs[] = $item; if ($includeCollections && $collectionTypes && !in_array('folder', $collectionTypes)) { - $placeholders = join(',', array_fill(0, count($collectionTypes), '?')); + $placeholders = implode(',', array_fill(0, count($collectionTypes), '?')); $where .= ' OR `item_type` IN ('.$placeholders.'))'; $queryArgs = array_merge($queryArgs, $collectionTypes); }