diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php index 6fe6c17a59..d73fe0b4e1 100644 --- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php +++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php @@ -146,7 +146,7 @@ public function testSerializerResponses() { $this->assertIdentical($actual_json, (string) drupal_render_root($output), 'The expected JSON preview output was found.'); // Test a 403 callback. - $this->drupalGet('test/serialize/denied'); + $this->drupalGetJSON('test/serialize/denied'); $this->assertResponse(403); // Test the entity rows. diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index 986410d197..c357ec1639 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -948,7 +948,7 @@ protected function drupalGetJSON($path, array $options = [], array $headers = [] * The result of the request. */ protected function drupalGetWithFormat($path, $format, array $options = [], array $headers = []) { - $options += ['query' => ['_format' => $format]]; + $options = array_merge_recursive(['query' => ['_format' => $format]], $options); return $this->drupalGet($path, $options, $headers); } diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php index c6e3ef3179..fe947b1e9a 100644 --- a/core/modules/views_ui/src/ViewListBuilder.php +++ b/core/modules/views_ui/src/ViewListBuilder.php @@ -9,7 +9,6 @@ use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; /** * Defines a class to build a listing of view entities.