Verified Commit 1d23af4c authored by Dave Long's avatar Dave Long
Browse files

fix: #3569458 Replace http with https for jsonapi.org 

By: quietone
By: sujal kshatri
By: dcam
By: stefan lehmann
parent 7c733647

core/modules/jsonapi/jsonapi.api.php

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 * reconciled with the specification, the module will always choose the

 * implementation most faithful to the specification.

 *

 * @see http://jsonapi.org/

 * @see https://jsonapi.org/

 *

 * @section resources Resources

 * Every unit of data in the specification is a "resource". The specification
@@ -201,7 +201,7 @@ 
 * versions *will* remain backwards-compatible as only additions may be

 * released.

 *

 * @see http://jsonapi.org/faq/#what-is-the-meaning-of-json-apis-version

 * @see https://jsonapi.org/faq/#what-is-the-meaning-of-json-apis-version

 *

 * Tests: subclasses of base test classes may contain BC breaks between minor

 * releases, to allow minor releases to A) comply better with the JSON:API spec,

core/modules/jsonapi/src/Context/FieldResolver.php

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public static function resolveInternalIncludePath(ResourceType $resource_type, a 
   * any aliases and/or abbreviations into a field expression that will be

   * compatible with the entity query system.

   *

   * @link http://jsonapi.org/recommendations/#urls-reference-document

   * @link https://jsonapi.org/recommendations/#urls-reference-document

   *

   * Example:

   *   'uid.field_first_name' -> 'uid.entity.field_first_name'.

core/modules/jsonapi/src/Controller/EntityResource.php

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ public function createIndividual(ResourceType $resource_type, Request $request) 
    static::validate($parsed_entity);



    // Return a 409 Conflict response in accordance with the JSON:API spec. See

    // http://jsonapi.org/format/#crud-creating-responses-409.

    // https://jsonapi.org/format/#crud-creating-responses-409.

    if ($this->entityExists($parsed_entity)) {

      throw new ConflictHttpException('Conflict: Entity already exists.');

    }

core/modules/jsonapi/src/EventSubscriber/JsonApiRequestValidator.php

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public function onResponse(ResponseEvent $event) { 
   * @return \Drupal\jsonapi\ResourceResponse|null

   *   A JSON:API resource response.

   *

   * @see http://jsonapi.org/format/#query-parameters

   * @see https://jsonapi.org/format/#query-parameters

   */

  protected function validateQueryParams(Request $request) {

    $invalid_query_params = [];
@@ -100,7 +100,7 @@ protected function validateQueryParams(Request $request) { 


    $message = sprintf('The following query parameters violate the JSON:API spec: \'%s\'.', implode("', '", $invalid_query_params));

    $exception = new CacheableBadRequestHttpException((new CacheableMetadata())->addCacheContexts(['url.query_args']), $message);

    $exception->setHeaders(['Link' => 'http://jsonapi.org/format/#query-parameters']);

    $exception->setHeaders(['Link' => 'https://jsonapi.org/format/#query-parameters']);

    throw $exception;

  }

core/modules/jsonapi/src/JsonApiResource/ErrorCollection.php

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
 * @see jsonapi.api.php

 *

 * (The spec says the top-level `data` and `errors` members MUST NOT coexist.)

 * @see http://jsonapi.org/format/#document-top-level

 * @see https://jsonapi.org/format/#document-top-level

 *

 * @see http://jsonapi.org/format/#error-objects

 * @see https://jsonapi.org/format/#error-objects

 */

class ErrorCollection implements \IteratorAggregate {