mirror of
https://github.com/nextcloud/server.git
synced 2026-04-15 22:11:17 -04:00
refactor: Use the elvis operator
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst
parent
5a8d0a2721
commit
614f9ec0a2
8 changed files with 22 additions and 23 deletions
|
|
@ -329,8 +329,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $row['uri'],
|
||||
'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
|
||||
|
|
@ -411,8 +411,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $uri,
|
||||
'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
|
|
@ -461,8 +461,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $row['uri'],
|
||||
'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
|
||||
];
|
||||
|
|
@ -513,8 +513,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $row['publicuri'],
|
||||
'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
|
||||
|
|
@ -578,8 +578,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $row['publicuri'],
|
||||
'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
|
||||
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
|
|
@ -632,8 +632,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $row['uri'],
|
||||
'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
|
||||
];
|
||||
|
|
@ -680,7 +680,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'id' => $row['id'],
|
||||
'uri' => $row['uri'],
|
||||
'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
|
||||
'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ?: '0'),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?? 0,
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
|
||||
'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
|
||||
|
|
@ -726,7 +726,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'source' => $row['source'],
|
||||
'lastmodified' => $row['lastmodified'],
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
];
|
||||
|
||||
return $this->rowToSubscription($row, $subscription);
|
||||
|
|
@ -2560,7 +2560,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
|||
'lastmodified' => $row['lastmodified'],
|
||||
|
||||
'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
|
||||
'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
|
||||
];
|
||||
|
||||
$subscriptions[] = $this->rowToSubscription($row, $subscription);
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ abstract class StoragesController extends Controller {
|
|||
)
|
||||
);
|
||||
} catch (InsufficientDataForMeaningfulAnswerException $e) {
|
||||
$status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
|
||||
$status = $e->getCode() ?: StorageNotAvailableException::STATUS_INDETERMINATE;
|
||||
$storage->setStatus(
|
||||
(int)$status,
|
||||
$this->l10n->t('Insufficient data: %s', [$e->getMessage()])
|
||||
|
|
|
|||
2
apps/files_sharing/lib/External/Manager.php
vendored
2
apps/files_sharing/lib/External/Manager.php
vendored
|
|
@ -119,7 +119,7 @@ class Manager {
|
|||
* @throws \Doctrine\DBAL\Exception
|
||||
*/
|
||||
public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted = false, $user = null, $remoteId = '', $parent = -1) {
|
||||
$user = $user ? $user : $this->uid;
|
||||
$user = $user ?: $this->uid;
|
||||
$accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING;
|
||||
$name = Filesystem::normalizePath('/' . $name);
|
||||
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ class UpdateAvailableNotificationsTest extends TestCase {
|
|||
$this->appConfig->expects($this->once())
|
||||
->method('getAppValueString')
|
||||
->with($app, '')
|
||||
->willReturn($lastNotification ? $lastNotification : '');
|
||||
->willReturn($lastNotification ?: '');
|
||||
|
||||
if ($lastNotification !== $version) {
|
||||
$this->appConfig->expects($this->once())
|
||||
|
|
|
|||
|
|
@ -646,8 +646,7 @@ class User {
|
|||
try {
|
||||
$accountProperty = $account->getProperty($property);
|
||||
$currentValue = $accountProperty->getValue();
|
||||
$scope = ($accountProperty->getScope() ? $accountProperty->getScope()
|
||||
: $defaultScopes[$property]);
|
||||
$scope = ($accountProperty->getScope() ?: $defaultScopes[$property]);
|
||||
} catch (PropertyDoesNotExistException $e) { // thrown at getProperty
|
||||
$this->logger->error('property does not exist: '.$property
|
||||
.' for uid='.$this->uid.'', ['app' => 'user_ldap', 'exception' => $e]);
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ class WeatherStatusService {
|
|||
$this->config->setUserValue($this->userId, Application::APP_ID, 'lon', strval($lon));
|
||||
// resolve and store formatted address
|
||||
$address = $this->resolveLocation($lat, $lon);
|
||||
$address = $address ? $address : $this->l10n->t('Unknown address');
|
||||
$address = $address ?: $this->l10n->t('Unknown address');
|
||||
$this->config->setUserValue($this->userId, Application::APP_ID, 'address', $address);
|
||||
// get and store altitude
|
||||
$altitude = $this->getAltitude($lat, $lon);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ abstract class LogDetails {
|
|||
$url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
|
||||
$method = is_string($request->getMethod()) ? $request->getMethod() : '--';
|
||||
if ($this->config->getValue('installed', false)) {
|
||||
$user = \OC_User::getUser() ? \OC_User::getUser() : '--';
|
||||
$user = \OC_User::getUser() ?: '--';
|
||||
} else {
|
||||
$user = '--';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class Database extends ABackend implements
|
|||
public function __construct($eventDispatcher = null, $table = 'users') {
|
||||
$this->cache = new CappedMemoryCache();
|
||||
$this->table = $table;
|
||||
$this->eventDispatcher = $eventDispatcher ? $eventDispatcher : \OCP\Server::get(IEventDispatcher::class);
|
||||
$this->eventDispatcher = $eventDispatcher ?: \OCP\Server::get(IEventDispatcher::class);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue