Issue CollaboraOnline#56: Rename CoolRequest to CollaboraDiscovery.

donquixote · Nov 21, 2024 · beaf9d9 · beaf9d9
1 parent 864188d
commit beaf9d9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/collabora_online.services.yml b/collabora_online.services.yml
@@ -5,4 +5,4 @@ services:
     parent: logger.channel_base
     arguments: ['cool']
   Drupal\collabora_online\Cool\CoolDiscoveryXmlEndpoint: { }
-  Drupal\collabora_online\Cool\CoolRequest: { }
+  Drupal\collabora_online\Cool\CollaboraDiscovery: { }
diff --git a/src/Controller/ViewerController.php b/src/Controller/ViewerController.php
@@ -12,7 +12,7 @@
 
 namespace Drupal\collabora_online\Controller;
 
-use Drupal\collabora_online\Cool\CoolRequest;
+use Drupal\collabora_online\Cool\CollaboraDiscovery;
 use Drupal\collabora_online\Cool\CoolUtils;
 use Drupal\collabora_online\Exception\CoolRequestException;
 use Drupal\Core\Controller\ControllerBase;
@@ -29,13 +29,13 @@ class ViewerController extends ControllerBase {
     /**
      * The controller constructor.
      *
-     * @param \Drupal\collabora_online\Cool\CoolRequest $coolRequest
+     * @param \Drupal\collabora_online\Cool\CollaboraDiscovery $discovery
      *   Service to fetch a WOPI client url.
      * @param \Drupal\Core\Render\RendererInterface $renderer
      *   The renderer service.
      */
     public function __construct(
-        protected readonly CoolRequest $coolRequest,
+        protected readonly CollaboraDiscovery $discovery,
         protected readonly RendererInterface $renderer,
     ) {}
 
@@ -59,7 +59,7 @@ public function editor(Media $media, Request $request, $edit = FALSE) {
         ];
 
         try {
-            $wopi_client_url = $this->coolRequest->getWopiClientURL();
+            $wopi_client_url = $this->discovery->getWopiClientURL();
         }
         catch (CoolRequestException $e) {
             $error_msg = $this->t('The Collabora Online server is not available: @message', [

diff --git a/src/Cool/CoolRequest.php → src/Cool/CollaboraDiscovery.php b/src/Cool/CoolRequest.php → src/Cool/CollaboraDiscovery.php
@@ -17,7 +17,7 @@
 /**
  * Service to fetch a WOPI client url.
  */
-class CoolRequest {
+class CollaboraDiscovery {
 
     /**
      * Constructor.

diff --git a/tests/src/ExistingSite/FetchClientUrlTest.php b/tests/src/ExistingSite/FetchClientUrlTest.php
@@ -4,7 +4,7 @@
 
 namespace Drupal\Tests\collabora_online\ExistingSite;
 
-use Drupal\collabora_online\Cool\CoolRequest;
+use Drupal\collabora_online\Cool\CollaboraDiscovery;
 use Drupal\collabora_online\Exception\CoolRequestException;
 use weitzman\DrupalTestTraits\ExistingSiteBase;
 
@@ -17,9 +17,9 @@ class FetchClientUrlTest extends ExistingSiteBase {
      * Tests fetching the client url.
      */
     public function testFetchClientUrl(): void {
-        /** @var \Drupal\collabora_online\Cool\CoolRequest $cool_request */
-        $cool_request = \Drupal::service(CoolRequest::class);
-        $client_url = $cool_request->getWopiClientURL();
+        /** @var \Drupal\collabora_online\Cool\CollaboraDiscovery $discovery */
+        $discovery = \Drupal::service(CollaboraDiscovery::class);
+        $client_url = $discovery->getWopiClientURL();
         // The protocol, domain and port are known when this test runs in the
         // docker-compose setup.
         $this->assertMatchesRegularExpression('@^http://collabora\.test:9980/browser/[0-9a-f]+/cool\.html\?$@', $client_url);
@@ -36,13 +36,13 @@ public function testFetchClientUrlWithMisconfiguration(): void {
                     'server' => 'httx://example.com',
                 ],
             ]);
-        /** @var \Drupal\collabora_online\Cool\CoolRequest $cool_request */
-        $cool_request = \Drupal::service(CoolRequest::class);
+        /** @var \Drupal\collabora_online\Cool\CollaboraDiscovery $discovery */
+        $discovery = \Drupal::service(CollaboraDiscovery::class);
 
         $this->expectException(CoolRequestException::class);
         $this->expectExceptionMessage("The configured Collabora Online server address must begin with 'http://' or 'https://'. Found 'httx://example.com'.");
 
-        $cool_request->getWopiClientURL();
+        $discovery->getWopiClientURL();
     }
 
 }