Merge pull request #923 from UN-OCHA/update/patch-abb0e03

Automatic Composer Update
UN-OCHA · Apr 25, 2024 · f9e14b1 · f9e14b1
2 parents abb0e03 + 06f2854
commit f9e14b1
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 54 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/html/modules/custom/iasc_content/src/Commands/IascContentCommands.php b/html/modules/custom/iasc_content/src/Commands/IascContentCommands.php
@@ -23,8 +23,8 @@ class IascContentCommands extends DrushCommands {
    * {@inheritdoc}
    */
   public function __construct(
-      EntityTypeManagerInterface $entity_type_manager,
-    ) {
+    EntityTypeManagerInterface $entity_type_manager,
+  ) {
     $this->entityTypeManager = $entity_type_manager;
   }
 

diff --git a/html/modules/custom/sfp_private/src/EventSubscriber/StageFileProxyPrivateSubscriber.php b/html/modules/custom/sfp_private/src/EventSubscriber/StageFileProxyPrivateSubscriber.php
@@ -78,12 +78,10 @@ public function __construct(DownloadManagerInterface $manager, LoggerInterface $
   /**
    * Fetch the file from it's origin.
    *
-   * @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
    *   The event to process.
-   *
-   * @todo Drop GetRequestEvent typehint when dropping Drupal 9 support.
    */
-  public function checkFileOrigin(RequestEvent|GetRequestEvent $event) {
+  public function checkFileOrigin(RequestEvent $event) {
     $config = $this->configFactory->get('stage_file_proxy.settings');
 
     // Get the origin server.

diff --git a/local/docker-compose.yml b/local/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "2.2"
 name: $PROJECT_NAME
 
 networks: