From b60be729b9c36ebaec11810f4f3dfd49840d16a3 Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Thu, 7 Nov 2024 23:06:02 +0100 Subject: [PATCH] Issue #43: NULL, TRUE and FALSE in uppercase. --- collabora_online.module | 4 ++-- src/Controller/ViewerController.php | 2 +- src/Controller/WopiController.php | 6 +++--- src/Cool/CoolRequest.php | 12 ++++++------ src/Cool/CoolUtils.php | 18 +++++++++--------- .../Field/FieldFormatter/CoolPreview.php | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/collabora_online.module b/collabora_online.module index c6e8d975..b5bbecf8 100644 --- a/collabora_online.module +++ b/collabora_online.module @@ -102,7 +102,7 @@ function collabora_online_entity_operation(EntityInterface $entity) { 'collabora_online_view' => [ 'title' => t("View in Collabora Online"), 'weight' => 50, - 'url' => CoolUtils::getEditorUrl($media, false), + 'url' => CoolUtils::getEditorUrl($media, FALSE), ], ]; @@ -110,7 +110,7 @@ function collabora_online_entity_operation(EntityInterface $entity) { $entries['collabora_online_edit'] = [ 'title' => t("Edit in Collabora Online"), 'weight' => 50, - 'url' => CoolUtils::getEditorUrl($media, true), + 'url' => CoolUtils::getEditorUrl($media, TRUE), ]; } diff --git a/src/Controller/ViewerController.php b/src/Controller/ViewerController.php index df1686b8..5835bb3f 100644 --- a/src/Controller/ViewerController.php +++ b/src/Controller/ViewerController.php @@ -49,7 +49,7 @@ public static function create(ContainerInterface $container): self { * * @return Response */ - public function editor(Media $media, $edit = false) { + public function editor(Media $media, $edit = FALSE) { $options = [ 'closebutton' => 'true', ]; diff --git a/src/Controller/WopiController.php b/src/Controller/WopiController.php index 05cddde5..9ca7d088 100644 --- a/src/Controller/WopiController.php +++ b/src/Controller/WopiController.php @@ -44,7 +44,7 @@ public function wopiCheckFileInfo(string $id, Request $request) { $token = $request->query->get('access_token'); $jwt_payload = CoolUtils::verifyTokenForId($token, $id); - if ($jwt_payload == null) { + if ($jwt_payload == NULL) { return static::permissionDenied(); } @@ -101,7 +101,7 @@ public function wopiGetFile(string $id, Request $request) { $token = $request->query->get('access_token'); $jwt_payload = CoolUtils::verifyTokenForId($token, $id); - if ($jwt_payload == null) { + if ($jwt_payload == NULL) { return static::permissionDenied(); } @@ -129,7 +129,7 @@ public function wopiPutFile(string $id, Request $request) { $exitsave = $request->headers->get('x-cool-wopi-isexitsave') == 'true'; $jwt_payload = CoolUtils::verifyTokenForId($token, $id); - if ($jwt_payload == null || !$jwt_payload->wri) { + if ($jwt_payload == NULL || !$jwt_payload->wri) { return static::permissionDenied(); } diff --git a/src/Cool/CoolRequest.php b/src/Cool/CoolRequest.php index 7e7d41b3..d4da6363 100644 --- a/src/Cool/CoolRequest.php +++ b/src/Cool/CoolRequest.php @@ -21,8 +21,8 @@ function getDiscovery($server) { $discovery_url = $server . '/hosting/discovery'; $default_config = \Drupal::config('collabora_online.settings'); - if ($default_config === null) { - return false; + if ($default_config === NULL) { + return FALSE; } $disable_checks = (bool) $default_config->get('cool')['disable_cert_check']; @@ -36,14 +36,14 @@ function getDiscovery($server) { } function getWopiSrcUrl($discovery_parsed, $mimetype) { - if ($discovery_parsed === null || $discovery_parsed == false) { - return null; + if ($discovery_parsed === NULL || $discovery_parsed == FALSE) { + return NULL; } $result = $discovery_parsed->xpath(sprintf('/wopi-discovery/net-zone/app[@name=\'%s\']/action', $mimetype)); if ($result && count($result) > 0) { return $result[0]['urlsrc']; } - return null; + return NULL; } function strStartsWith($s, $ss) { @@ -99,7 +99,7 @@ public function getWopiClientURL() { } $discovery = getDiscovery($wopi_client_server); - if ($discovery === false) { + if ($discovery === FALSE) { $this->error_code = 203; return NULL; } diff --git a/src/Cool/CoolUtils.php b/src/Cool/CoolUtils.php index d0c66edd..196cfe78 100644 --- a/src/Cool/CoolUtils.php +++ b/src/Cool/CoolUtils.php @@ -64,14 +64,14 @@ public static function verifyTokenForId( try { $payload = JWT::decode($token, new Key($key, 'HS256')); - if ($payload && ($payload->fid == $id) && ($payload->exp >= gettimeofday(true))) { + if ($payload && ($payload->fid == $id) && ($payload->exp >= gettimeofday(TRUE))) { return $payload; } } catch (\Exception $e) { \Drupal::logger('cool')->error($e->getMessage()); } - return null; + return NULL; } /** @@ -81,7 +81,7 @@ public static function getAccessTokenTtl() { $default_config = \Drupal::config('collabora_online.settings'); $ttl = $default_config->get('cool')['access_token_ttl']; - return gettimeofday(true) + $ttl; + return gettimeofday(TRUE) + $ttl; } /** @@ -116,9 +116,9 @@ public static function tokenForFileId($id, $ttl, $can_write = FALSE) { * accept. */ const READ_ONLY = [ - 'application/x-iwork-keynote-sffkey' => true, - 'application/x-iwork-pages-sffpages' => true, - 'application/x-iwork-numbers-sffnumbers' => true, + 'application/x-iwork-keynote-sffkey' => TRUE, + 'application/x-iwork-pages-sffpages' => TRUE, + 'application/x-iwork-numbers-sffnumbers' => TRUE, ]; /** @@ -140,7 +140,7 @@ public static function getDocumentType(File $file) { } /** Return the editor / viewer Drupal URL from the routes configured. */ - public static function getEditorUrl(Media $media, $can_write = false) { + public static function getEditorUrl(Media $media, $can_write = FALSE) { if ($can_write) { return Url::fromRoute('collabora-online.edit', ['media' => $media->id()]); } @@ -163,14 +163,14 @@ public static function getEditorUrl(Media $media, $can_write = false) { * Options for the renderer. Current values: * - "closebutton" if "true" will add a close box. (see COOL SDK) */ - public static function getViewerRender(Media $media, bool $can_write, $options = null) { + public static function getViewerRender(Media $media, bool $can_write, $options = NULL) { $default_config = \Drupal::config('collabora_online.settings'); $wopi_base = $default_config->get('cool')['wopi_base']; $allowfullscreen = $default_config->get('cool')['allowfullscreen'] ?? FALSE; $req = new CoolRequest(); $wopi_client = $req->getWopiClientURL(); - if ($wopi_client === null) { + if ($wopi_client === NULL) { return [ 'error' => t('The Collabora Online server is not available: ') . $req->errorString(), ]; diff --git a/src/Plugin/Field/FieldFormatter/CoolPreview.php b/src/Plugin/Field/FieldFormatter/CoolPreview.php index c6a22c00..bbdf382b 100644 --- a/src/Plugin/Field/FieldFormatter/CoolPreview.php +++ b/src/Plugin/Field/FieldFormatter/CoolPreview.php @@ -62,7 +62,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) { } foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) { - $url = CoolUtils::getEditorUrl($media, false); + $url = CoolUtils::getEditorUrl($media, FALSE); $render_array = [ '#editorUrl' => $url,