diff --git a/.cspell-project-words.txt b/.cspell-project-words.txt index 0f8f72f46ca11381726a61ff91198b26138e42e9..b5e1def93e789f211e4e2a17bb0bbc23c0cfb48e 100644 --- a/.cspell-project-words.txt +++ b/.cspell-project-words.txt @@ -4,10 +4,22 @@ Drupallers DTBNG Farbtastic farbtastic + # @todo Remove when https://www.drupal.org/project/examples/issues/2986435 is # fixed foof + haljson interdiff + +# @todo Remove when the phpcs.xml.dist file is removed. +Kernighan + Kint MAMP +Potenti + +# @todo Remove when the phpcs.xml.dist file is removed. +Ritchie + +Werther diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3709e0a6ccb18eee78f809ebf444430bd9639eaf..30c906dc09d8e132c157c35ba9d5242264c025e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,10 +14,10 @@ include: - project: $_GITLAB_TEMPLATES_REPO ref: $_GITLAB_TEMPLATES_REF file: - - "/includes/include.drupalci.main.yml" - - "/includes/include.drupalci.variables.yml" - - "/includes/include.drupalci.workflows.yml" - + - '/includes/include.drupalci.main.yml' + - '/includes/include.drupalci.variables.yml' + - '/includes/include.drupalci.workflows.yml' +# ################ # Pipeline configuration variables are defined with default values and descriptions in the file # https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml @@ -27,28 +27,6 @@ include: # SKIP_ESLINT: '1' # OPT_IN_TEST_NEXT_MAJOR: '1' # _CURL_TEMPLATES_REF: 'main' + variables: - SKIP_PHPUNIT: '1' _PHPUNIT_CONCURRENT: '1' - _CSPELL_IGNORE_PATHS: 'modules/js_example/templates/accordion.html.twig, **/*.svg' - OPT_IN_TEST_NEXT_MINOR: 1 - OPT_IN_TEST_NEXT_MAJOR: 1 - RUN_JOB_UPGRADE_STATUS: 1 -cspell: - allow_failure: false -phpcs: - allow_failure: false -phpstan: - allow_failure: false -phpstan (next minor): - allow_failure: false -phpstan (next major): - allow_failure: false -phpunit: - allow_failure: false -phpunit (next minor): - allow_failure: false -phpunit (next major): - allow_failure: false -upgrade status: - allow_failure: false diff --git a/modules/rest_example/src/RestExampleClientCalls.php b/modules/rest_example/src/RestExampleClientCalls.php index c08bddd8ee26acf8d14e46afdf319a2aa1525505..774cf70a874d5914b211e10c518f02e4aa7a7900 100644 --- a/modules/rest_example/src/RestExampleClientCalls.php +++ b/modules/rest_example/src/RestExampleClientCalls.php @@ -31,7 +31,6 @@ class RestExampleClientCalls { * @var array */ protected $clientHeaders = [ - 'Accept' => 'application/haljson', 'Content-Type' => 'application/haljson', ]; @@ -100,7 +99,7 @@ public function index($node_id = NULL) { $response = $this->client->request( 'GET', - $this->remoteUrl . '/rest/node' . $id, + $this->remoteUrl . "/rest/node$id?_format=hal_json", ['headers' => $this->clientHeaders] );