diff options
Diffstat (limited to 'lib/private/AppFramework')
| -rw-r--r-- | lib/private/AppFramework/App.php | 4 | ||||
| -rw-r--r-- | lib/private/AppFramework/DependencyInjection/DIContainer.php | 4 | ||||
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 2 | ||||
| -rw-r--r-- | lib/private/AppFramework/OCS/V2Response.php | 6 | ||||
| -rw-r--r-- | lib/private/AppFramework/Routing/RouteConfig.php | 2 | ||||
| -rw-r--r-- | lib/private/AppFramework/Utility/SimpleContainer.php | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index f7defda487e..382425ad046 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -99,7 +99,7 @@ class App { public static function main(string $controllerName, string $methodName, DIContainer $container, array $urlParams = null) { if (!is_null($urlParams)) { $container->query(IRequest::class)->setUrlParameters($urlParams); - } else if (isset($container['urlParams']) && !is_null($container['urlParams'])) { + } elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) { $container->query(IRequest::class)->setUrlParameters($container['urlParams']); } $appName = $container['AppName']; @@ -178,7 +178,7 @@ class App { if (!$emptyResponse) { if ($response instanceof ICallbackResponse) { $response->callback($io); - } else if (!is_null($output)) { + } elseif (!is_null($output)) { $io->setHeader('Content-Length: ' . strlen($output)); $io->setOutput($output); } diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 14898fadf95..2ce504304dc 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -409,9 +409,9 @@ class DIContainer extends SimpleContainer implements IAppContainer { } else { if ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) { return parent::query($name); - } else if ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) { + } elseif ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) { return parent::query($name); - } else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) { + } elseif (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) { return parent::query($name); } } diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 9b8c0690ba6..5430d1ae922 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -874,7 +874,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { } else { if (isset($this->server['HTTP_HOST'])) { $host = $this->server['HTTP_HOST']; - } else if (isset($this->server['SERVER_NAME'])) { + } elseif (isset($this->server['SERVER_NAME'])) { $host = $this->server['SERVER_NAME']; } } diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php index 0859fecb1d9..693d58a4d43 100644 --- a/lib/private/AppFramework/OCS/V2Response.php +++ b/lib/private/AppFramework/OCS/V2Response.php @@ -39,11 +39,11 @@ class V2Response extends BaseResponse { $status = parent::getStatus(); if ($status === API::RESPOND_UNAUTHORISED) { return Http::STATUS_UNAUTHORIZED; - } else if ($status === API::RESPOND_NOT_FOUND) { + } elseif ($status === API::RESPOND_NOT_FOUND) { return Http::STATUS_NOT_FOUND; - } else if ($status === API::RESPOND_SERVER_ERROR || $status === API::RESPOND_UNKNOWN_ERROR) { + } elseif ($status === API::RESPOND_SERVER_ERROR || $status === API::RESPOND_UNKNOWN_ERROR) { return Http::STATUS_INTERNAL_SERVER_ERROR; - } else if ($status < 200 || $status > 600) { + } elseif ($status < 200 || $status > 600) { return Http::STATUS_BAD_REQUEST; } diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index ec6c3971552..999412979b0 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -167,7 +167,7 @@ class RouteConfig { $controllerName = str_replace('controllerController', 'Controller', $controllerName); if ($controllerName === 'PublicpreviewController') { $controllerName = 'PublicPreviewController'; - } else if ($controllerName === 'RequesthandlerController') { + } elseif ($controllerName === 'RequesthandlerController') { $controllerName = 'RequestHandlerController'; } $controllerName = App::buildAppNamespace($appName) . '\\Controller\\' . $controllerName; diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index f2ac4f2d6f2..1703df3ea73 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -72,7 +72,7 @@ class SimpleContainer extends Container implements IContainer { // Service not found, use the default value when available if ($parameter->isDefaultValueAvailable()) { $parameters[] = $parameter->getDefaultValue(); - } else if ($parameterClass !== null) { + } elseif ($parameterClass !== null) { $resolveName = $parameter->getName(); $parameters[] = $this->query($resolveName); } else { @@ -111,7 +111,7 @@ class SimpleContainer extends Container implements IContainer { $name = $this->sanitizeName($name); if ($this->offsetExists($name)) { return $this->offsetGet($name); - } else if ($autoload) { + } elseif ($autoload) { $object = $this->resolve($name); $this->registerService($name, function () use ($object) { return $object; |