From 954da26e26a6f0011efa1432e9de4264e5f5e033 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 13 Feb 2018 21:48:24 +0100 Subject: [PATCH] Use non aliased method instead Signed-off-by: Morris Jobke --- apps/workflowengine/lib/Check/RequestRemoteAddress.php | 2 +- core/Command/Config/System/DeleteConfig.php | 2 +- core/Command/Config/System/SetConfig.php | 2 +- core/Command/L10n/CreateJs.php | 4 ++-- lib/private/App/Platform.php | 2 +- lib/private/Collaboration/Collaborators/GroupPlugin.php | 2 +- lib/private/Collaboration/Collaborators/UserPlugin.php | 2 +- lib/private/Share/Share.php | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/workflowengine/lib/Check/RequestRemoteAddress.php b/apps/workflowengine/lib/Check/RequestRemoteAddress.php index de9738fb63..6fa4cfc880 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 216cf4eb64..429dd806b7 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('System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist'); return 1; diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index 992fca8d08..92c503907b 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 9c14490b97..d060f166b8 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 fe4d7ff48f..efe01d291d 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 b147d2d7b5..7eee042076 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 d2639249d5..62f7687603 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 9507eaf5c1..1798969ca5 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); }