[#393] Drupal 9 readiness: fixing tests.

apigee · Apr 26, 2020 · 542c48a · 542c48a
1 parent 9513bca
commit 542c48a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php b/tests/src/Unit/Command/CreateEdgeRoleCommandTest.php
@@ -99,7 +99,7 @@ class CreateEdgeRoleCommandTest extends UnitTestCase {
     protected function setUp() {
       if (!class_exists('Drupal\Console\Core\Command\Command')) {
         $this->markTestSkipped('Skipping because Drupal Console is not installed.');
-    }
+      }
 
       parent::setUp();
       $this->cliService = $this->prophesize(CliServiceInterface::class);

diff --git a/tests/src/Unit/EventSubscriber/EdgeExceptionSubscriberTest.php b/tests/src/Unit/EventSubscriber/EdgeExceptionSubscriberTest.php
@@ -125,10 +125,14 @@ protected function setUp() {
       ->willReturn(new Request());
     $this->getResponseForExceptionEvent->getException()
       ->willReturn($this->exception);
-    $this->getResponseForExceptionEvent->getThrowable()
-      ->willReturn($this->exception);
     $this->getResponseForExceptionEvent->setResponse(Argument::any())
       ->willReturn();
+
+    // Compatibility with Symfony 4.x and up.
+    if ((new \ReflectionClass(GetResponseForExceptionEvent::class))->hasMethod('getThrowable')) {
+      $this->getResponseForExceptionEvent->getThrowable()
+        ->willReturn($this->exception);
+    }
   }
 
   /**