Simplified null check

diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php
index 0f0837c784042ed0d523452147ff734c93f17b94..7b13b170180913fc423cbb791be086b2ead21308 100644 (file)
--- a/src/Module/Api/Mastodon/Apps.php
+++ b/src/Module/Api/Mastodon/Apps.php
@@ -37,10 +37,10 @@ class Apps extends BaseApi
         */
        public static function post(array $parameters = [])
        {
-               $name     = !isset($_REQUEST['client_name']) ? '' : $_REQUEST['client_name'];
-               $redirect = !isset($_REQUEST['redirect_uris']) ? '' : $_REQUEST['redirect_uris'];
-               $scopes   = !isset($_REQUEST['scopes']) ? '' : $_REQUEST['scopes'];
-               $website  = !isset($_REQUEST['website']) ? '' : $_REQUEST['website'];
+               $name     = $_REQUEST['client_name'] ?? '';
+               $redirect = $_REQUEST['redirect_uris'] ?? '';
+               $scopes   = $_REQUEST['scopes'] ?? '';
+               $website  = $_REQUEST['website'] ?? '';
 
                if (empty($name) || empty($redirect)) {
                        DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Missing parameters'));

diff --git a/src/Module/Api/Mastodon/Directory.php b/src/Module/Api/Mastodon/Directory.php
index 70046642cfaf429e82986a0903247970ab990dc6..f2849f7f85bf761bf9d8f2235d41b925fedf662f 100644 (file)
--- a/src/Module/Api/Mastodon/Directory.php
+++ b/src/Module/Api/Mastodon/Directory.php
@@ -44,7 +44,7 @@ class Directory extends BaseApi
        {
                $offset = (int)!isset($_REQUEST['offset']) ? 0 : $_REQUEST['offset'];
                $limit = (int)!isset($_REQUEST['limit']) ? 40 : $_REQUEST['limit'];
-               $order = !isset($_REQUEST['order']) ? 'active' : $_REQUEST['order'];
+               $order = $_REQUEST['order'] ?? 'active';
                $local = (bool)!isset($_REQUEST['local']) ? false : ($_REQUEST['local'] == 'true');
 
                Logger::info('directory', ['offset' => $offset, 'limit' => $limit, 'order' => $order, 'local' => $local]);

diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index a10ebf5d507087fed3aa5ab8ad030c8a837836a0..8252de7c2ad45afc7054caf3c86212eb23c80ccc 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -63,7 +63,7 @@ class Notifications extends BaseApi
                $limit = (int)!isset($_REQUEST['limit']) ? 20 : $_REQUEST['limit'];
 
                // Array of types to exclude (follow, favourite, reblog, mention, poll, follow_request)
-               $exclude_types = !isset($_REQUEST['exclude_types']) ? [] : $_REQUEST['exclude_types'];
+               $exclude_types = $_REQUEST['exclude_types'] ?? [];
 
                // Return only notifications received from this account
                $account_id = (int)!isset($_REQUEST['account_id']) ? 0 : $_REQUEST['account_id'];

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 27c4fee10060282bc7cb3c23794bb875bd6c5b30..b4f228a6ee8aa8c895233cf6d8a0971e5b0ee9ea 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -210,9 +210,9 @@ class BaseApi extends BaseModule
         */
        public static function getApplication()
        {
-               $redirect_uri  = !isset($_REQUEST['redirect_uri']) ? '' : $_REQUEST['redirect_uri'];
-               $client_id     = !isset($_REQUEST['client_id']) ? '' : $_REQUEST['client_id'];
-               $client_secret = !isset($_REQUEST['client_secret']) ? '' : $_REQUEST['client_secret'];
+               $redirect_uri  = $_REQUEST['redirect_uri'] ?? '';
+               $client_id     = $_REQUEST['client_id'] ?? '';
+               $client_secret = $_REQUEST['client_secret'] ?? '';
 
                if ((empty($redirect_uri) && empty($client_secret)) || empty($client_id)) {
                        Logger::warning('Incomplete request', ['request' => $_REQUEST]);

diff --git a/src/Module/OAuth/Authorize.php b/src/Module/OAuth/Authorize.php
index a93fc0038df9bc8a6518aa42f1952938554dcbec..c9bf7b687ef36278932aaa04f4a4de9ddd823c87 100644 (file)
--- a/src/Module/OAuth/Authorize.php
+++ b/src/Module/OAuth/Authorize.php
@@ -36,7 +36,7 @@ class Authorize extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               $response_type = !isset($_REQUEST['response_type']) ? '' : $_REQUEST['response_type'];
+               $response_type = $_REQUEST['response_type'] ?? '';
                if ($response_type != 'code') {
                        Logger::warning('Wrong or missing response type', ['response_type' => $response_type]);
                        DI::mstdnError()->RecordNotFound();

diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index 164623482c7d1f19891ea3b2e6589dc2762995be..17f2e2b8200aa3f24843818f2f68b717a048c6e1 100644 (file)
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -34,9 +34,9 @@ class Token extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               $client_secret = !isset($_REQUEST['client_secret']) ? '' : $_REQUEST['client_secret'];
-               $code          = !isset($_REQUEST['code']) ? '' : $_REQUEST['code'];
-               $grant_type    = !isset($_REQUEST['grant_type']) ? '' : $_REQUEST['grant_type'];
+               $client_secret = $_REQUEST['client_secret'] ?? '';
+               $code          = $_REQUEST['code'] ?? '';
+               $grant_type    = $_REQUEST['grant_type'] ?? '';
 
                if ($grant_type != 'authorization_code') {
                        Logger::warning('Unsupported or missing grant type', ['request' => $_REQUEST]);

diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 80a9662204fed8ee6fce6bf83c22560a568cd13e..1d45b6c9dd38aef65d76036477c8f2fc88cbac2d 100644 (file)
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -36,7 +36,7 @@ class Login extends BaseModule
 {
        public static function content(array $parameters = [])
        {
-               $return_path = !isset($_REQUEST['return_path']) ? '' : $_REQUEST['return_path'];
+               $return_path = $_REQUEST['return_path'] ?? '' ;
 
                if (local_user()) {
                        DI::baseUrl()->redirect($return_path);