summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2018-02-14 10:09:09 +0100
committerGitHub <noreply@github.com>2018-02-14 10:09:09 +0100
commitc32a94b78d36aace3237d5b0c6c4069976ff06ad (patch)
tree58cb876586b61cf22d8a2cb7443316c6f1332103 /core
parentd1fb939e863a6f476d3a0a49d6d9717ff0d713a0 (diff)
parent954da26e26a6f0011efa1432e9de4264e5f5e033 (diff)
downloadnextcloud-server-c32a94b78d36aace3237d5b0c6c4069976ff06ad.tar.gz
nextcloud-server-c32a94b78d36aace3237d5b0c6c4069976ff06ad.zip
Merge pull request #8337 from nextcloud/use-non-alias-method
Use non aliased method instead
Diffstat (limited to 'core')
-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
3 files changed, 4 insertions, 4 deletions
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);