diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-01-27 11:23:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-27 11:23:36 +0100 |
| commit | ed59019b0cc4ec61fce65a8eb02f814611b466b4 (patch) | |
| tree | 29b1618a2618b7d4dba8f51626f5e3474e3d8a9c /core/Command | |
| parent | 513f70b1c3d342cd2215b6dab9bb0c6d511549ad (diff) | |
| parent | a661f043e1a8764cb7c795f50df77b830d3e352b (diff) | |
| download | nextcloud-server-ed59019b0cc4ec61fce65a8eb02f814611b466b4.tar.gz nextcloud-server-ed59019b0cc4ec61fce65a8eb02f814611b466b4.zip | |
Merge pull request #8079 from nextcloud/remove-unneeded-semicolon-and-parentheses
Remove unneeded semicolon and parentheses
Diffstat (limited to 'core/Command')
| -rw-r--r-- | core/Command/App/ListApps.php | 2 | ||||
| -rw-r--r-- | core/Command/Base.php | 2 | ||||
| -rw-r--r-- | core/Command/Encryption/ChangeKeyStorageRoot.php | 2 | ||||
| -rw-r--r-- | core/Command/Maintenance/Install.php | 2 | ||||
| -rw-r--r-- | core/Command/User/Info.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php index c933a2519ef..78b7dd40fe3 100644 --- a/core/Command/App/ListApps.php +++ b/core/Command/App/ListApps.php @@ -87,7 +87,7 @@ class ListApps extends Base { sort($enabledApps); foreach ($enabledApps as $app) { - $apps['enabled'][$app] = (isset($versions[$app])) ? $versions[$app] : true; + $apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true; } sort($disabledApps); diff --git a/core/Command/Base.php b/core/Command/Base.php index 15878a807d8..536de20711c 100644 --- a/core/Command/Base.php +++ b/core/Command/Base.php @@ -121,7 +121,7 @@ class Base extends Command implements CompletionAwareInterface { } else if ($value === true) { return 'true'; } else if ($value === null) { - return ($returnNull) ? null : 'null'; + return $returnNull ? null : 'null'; } else { return $value; } diff --git a/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php index 97709d54bdd..7c6ad5d6126 100644 --- a/core/Command/Encryption/ChangeKeyStorageRoot.php +++ b/core/Command/Encryption/ChangeKeyStorageRoot.php @@ -118,7 +118,7 @@ class ChangeKeyStorageRoot extends Command { $output->writeln("Start to move keys:"); - if ($this->rootView->is_dir(($oldRoot)) === false) { + if ($this->rootView->is_dir($oldRoot) === false) { $output->writeln("No old keys found: Nothing needs to be moved"); return false; } diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index be6a2da22c8..262def99c5f 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -90,7 +90,7 @@ class Install extends Command { // ignore the OS X setup warning if(count($errors) !== 1 || - (string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') { + (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') { return 1; } } diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index b23ddd942a0..f1b5579eb94 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -76,7 +76,7 @@ class Info extends Base { $data = [ 'user_id' => $user->getUID(), 'display_name' => $user->getDisplayName(), - 'email' => ($user->getEMailAddress()) ? $user->getEMailAddress() : '', + 'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '', 'cloud_id' => $user->getCloudId(), 'enabled' => $user->isEnabled(), 'groups' => $groups, |