summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-02-13 21:48:24 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-02-13 21:48:24 +0100
commit954da26e26a6f0011efa1432e9de4264e5f5e033 (patch)
tree4ec1aecaaf672bd8fc362f59261abbf1a1ea7bcf
parent3fc6d6234e39914d8e6e7d4b9ffe0b5420d3aa2d (diff)
downloadnextcloud-server-954da26e26a6f0011efa1432e9de4264e5f5e033.tar.gz
nextcloud-server-954da26e26a6f0011efa1432e9de4264e5f5e033.zip
Use non aliased method instead
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--apps/workflowengine/lib/Check/RequestRemoteAddress.php2
-rw-r--r--core/Command/Config/System/DeleteConfig.php2
-rw-r--r--core/Command/Config/System/SetConfig.php2
-rw-r--r--core/Command/L10n/CreateJs.php4
-rw-r--r--lib/private/App/Platform.php2
-rw-r--r--lib/private/Collaboration/Collaborators/GroupPlugin.php2
-rw-r--r--lib/private/Collaboration/Collaborators/UserPlugin.php2
-rw-r--r--lib/private/Share/Share.php6
8 files changed, 11 insertions, 11 deletions
diff --git a/apps/workflowengine/lib/Check/RequestRemoteAddress.php b/apps/workflowengine/lib/Check/RequestRemoteAddress.php
index de9738fb631..6fa4cfc8800 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 216cf4eb640..429dd806b71 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 992fca8d084..92c503907bd 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 9c14490b97f..d060f166b85 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 fe4d7ff48f7..efe01d291d7 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 b147d2d7b58..7eee042076e 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 d2639249d56..62f76876031 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 9507eaf5c1f..1798969ca53 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);
}