From 3ecd38eeef47a2abe5d09bb13f4055b84ea34849 Mon Sep 17 00:00:00 2001 From: xjm <xjm@65776.no-reply.drupal.org> Date: Fri, 29 May 2020 12:47:45 -0500 Subject: [PATCH] Issue #3138774 by sja112, mohrerao, shalinigaur: Fix "DoesNot" relevant typos in core (cherry picked from commit 40b0e163ea30c0276a962bf83e33e3fcbe24a52b) --- .../jsonapi/src/Exception/EntityAccessDeniedHttpException.php | 2 +- .../jsonapi/tests/src/Functional/JsonApiFunctionalTest.php | 4 ++-- .../modules/jsonapi/tests/src/Functional/ResourceTestBase.php | 2 +- core/tests/Drupal/KernelTests/Core/Database/SelectTest.php | 4 ++-- .../Tests/Component/Annotation/Doctrine/DocParserTest.php | 2 +- core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php b/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php index 6b067ebe6fbc..3365326aac52 100644 --- a/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php +++ b/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php @@ -30,7 +30,7 @@ class EntityAccessDeniedHttpException extends CacheableAccessDeniedHttpException * The error which caused the 403. * * The error contains: - * - entity: The entity which the current user doens't have access to. + * - entity: The entity which the current user does not have access to. * - pointer: A path in the JSON:API response structure pointing to the * entity. * - reason: (Optional) An optional reason for this failure. diff --git a/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php b/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php index f206bc91fe80..6cc88ad4e387 100644 --- a/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php +++ b/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php @@ -862,7 +862,7 @@ public function testWrite() { 'id' => $uuid, 'type' => 'node--article', 'attributes' => [ - 'field_that_doesnt_exist' => 'foobar', + 'field_that_does_not_exist' => 'foobar', ], ], ]; @@ -876,7 +876,7 @@ public function testWrite() { ]); $updated_response = Json::decode($response->getBody()->__toString()); $this->assertEquals(422, $response->getStatusCode()); - $this->assertEquals("The attribute field_that_doesnt_exist does not exist on the node--article resource type.", + $this->assertEquals("The attribute field_that_does_not_exist does not exist on the node--article resource type.", $updated_response['errors']['0']['detail']); // 14. Successful DELETE. $response = $this->request('DELETE', $individual_url, [ diff --git a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php index 983c4a731551..c38211d813b1 100644 --- a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php +++ b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php @@ -1118,7 +1118,7 @@ public function testCollection() { 'related_author_id' => [ 'operator' => '<>', 'path' => 'field_jsonapi_test_entity_ref.status', - 'value' => 'doesnt@matter.com', + 'value' => 'does_not@matter.com', ], ], ]); diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php index 5ebb53022919..f551e43f41cd 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php @@ -559,7 +559,7 @@ public function testInvalidSelectCount() { // Normally it would throw an exception but we are suppressing // it with the throw_exception option. $options['throw_exception'] = FALSE; - $this->connection->select('some_table_that_doesnt_exist', 't', $options) + $this->connection->select('some_table_that_does_not_exist', 't', $options) ->fields('t') ->countQuery() ->execute(); @@ -573,7 +573,7 @@ public function testInvalidSelectCount() { try { // This query will fail because the table does not exist. - $this->connection->select('some_table_that_doesnt_exist', 't') + $this->connection->select('some_table_that_does_not_exist', 't') ->fields('t') ->countQuery() ->execute(); diff --git a/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php b/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php index 4c2c430802c1..8c7fc2d2532c 100644 --- a/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php +++ b/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php @@ -1027,7 +1027,7 @@ public function testAnnotationDontAcceptSingleQuotes() /** * @group DCOM-41 */ - public function testAnnotationDoesntThrowExceptionWhenAtSignIsNotFollowedByIdentifier() + public function testAnnotationDoesNotThrowExceptionWhenAtSignIsNotFollowedByIdentifier() { $parser = new DocParser(); $result = $parser->parse("'@'"); diff --git a/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php b/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php index 51f02eb25373..8f203b0f1659 100644 --- a/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php @@ -36,7 +36,7 @@ class ChainedFastBackendTest extends UnitTestCase { /** * Tests a get() on the fast backend, with no hit on the consistent backend. */ - public function testGetDoesntHitConsistentBackend() { + public function testGetDoesNotHitConsistentBackend() { $consistent_cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $timestamp_cid = ChainedFastBackend::LAST_WRITE_TIMESTAMP_PREFIX . 'cache_foo'; // Use the request time because that is what we will be comparing against. -- GitLab