Problem/Motivation

All URLs in core modules still point to the old http://drupal.org URL. This now should be https://www.drupal.org.

URLs to change include:

Note: This is a follow-up to https://www.drupal.org/node/2489912.

Proposed resolution

Find and replace all instances of the old URL and replace it with the new URL.

Note that there are entries that shall not be modified, as they are used to create and test http/https links:
./core/modules/link/tests/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php

  public function providerValidate() {
    $data = [];

    // Test allowed protocols.
    $data[] = ['http://www.drupal.org', TRUE];
    $data[] = ['https://www.drupal.org', TRUE];

And ./core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php

    $data[] = [new Uri(DataDefinition::create('uri')), 'http://www.drupal.org', TRUE];
    $data[] = [new Uri(DataDefinition::create('uri')), 'https://www.drupal.org', TRUE];

Note: Pay special attention to comment blocks that break the 80 character limit do the additional characters added through this change.

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

mikeburrelljr’s picture

Status: Active » Needs review
FileSize
308.67 KB

Initial pass. Uploading patch for code review and testing.

mikeburrelljr’s picture

Assigned: mikeburrelljr » Unassigned
opdavies’s picture

opdavies’s picture

Issue summary: View changes
Status: Needs review » Reviewed & tested by the community
FileSize
150.53 KB

The patch looks good and applies cleanly.

The particular instance that I saw originally on the installer pages has been fixed, so I think that it's good to go.

opdavies’s picture

Issue summary: View changes
Mac_Weber’s picture

Title: Update Drupal.org URL in core modules (Follow-up to 2489912) » Update drupal.org and kernel.org URLs in core modules (Follow-up to 2489912)
Status: Reviewed & tested by the community » Needs review
FileSize
323.25 KB
554 bytes

I got 1 more file which was not included at the first patch: .gitattributes
I'm also adding kernel.org to the changes. It is just one line in this same file.

I also found one http://drupal.com/trademark at README.txt, but https do not work well there and there is no redirect if using www. or not. Then, I did not modify this one.

Mac_Weber’s picture

Issue summary: View changes
FileSize
324.4 KB
1.64 KB

I just found more entries at test files.

Note that there are entries that shall not be modified, as they are used to create and test http/https links:
./core/modules/link/tests/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php

  public function providerValidate() {
    $data = [];

    // Test allowed protocols.
    $data[] = ['http://www.drupal.org', TRUE];
    $data[] = ['https://www.drupal.org', TRUE];

And ./core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php

    $data[] = [new Uri(DataDefinition::create('uri')), 'http://www.drupal.org', TRUE];
    $data[] = [new Uri(DataDefinition::create('uri')), 'https://www.drupal.org', TRUE];

Status: Needs review » Needs work

The last submitted patch, 7: update_drupal_org_url-2491155-7.patch, failed testing.

mikeburrelljr’s picture

Status: Needs work » Needs review

Patch #6 looks good. Thanks!

Patch #7 is modifying tests which don't need changed, imo.

jhodgdon’s picture

Component: documentation » other
Status: Needs review » Needs work

test failed. Also this is not changing just documentation.

mikeburrelljr’s picture

@jhodgdon See my comment above. Patch #6 looks good.

mikeburrelljr’s picture

Note: We need to pull the latest changes from master (and re-grep).

mikeburrelljr’s picture

Status: Needs work » Needs review
FileSize
309.37 KB

Re-rolled patch.

Mac_Weber’s picture

Status: Needs review » Reviewed & tested by the community

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 14: update_drupal_org_and-2491155-14.patch, failed testing.

Status: Needs work » Needs review

Status: Needs review » Needs work

The last submitted patch, 14: update_drupal_org_and-2491155-14.patch, failed testing.

mikeburrelljr’s picture

Looks like we need to re-roll this patch again... Was passing tests, now is not.

mikeburrelljr’s picture

Status: Needs work » Needs review
FileSize
310.36 KB

Re-rolled. Previous patch no longer applies (due to many changes in the MAINTAINERS.txt file), so I'm having issues creating interdiff.

Here is the complete new patch file for review. Thanks!

Mac_Weber’s picture

Status: Needs review » Reviewed & tested by the community
Mac_Weber’s picture

Status: Reviewed & tested by the community » Needs work
+++ b/sites/example.sites.php
@@ -21,18 +21,19 @@
+ * @link https://www.drupal.org/documentation/install online Drupal installation
+ * guide @endlink for more information on setting up domains, subdomains, and

See https://www.drupal.org/coding-standards/docs#link

The entire @link ... @endlink must be on the same line

There are more tags like this one that need to be fixed.

mikeburrelljr’s picture

@Mac_Weber Thanks for the heads-up on the @link standard.

Please see the updated patch - along with an interdiff from the previous. Thanks!

Mac_Weber’s picture

Status: Needs review » Reviewed & tested by the community
xjm’s picture

Status: Reviewed & tested by the community » Fixed

Thanks @opdavies et al. I reviewed this locally with:
git diff --staged --color-words=[,\.:]+|[^[:space:]]

Phew!

@jhodgdon is correct that, while this patch mostly changes only documentation, it also includes changes to links in user-facing strings as well as a couple tests. I looked over the test changes carefully to ensure the intent of the tests wasn't being changed (especially for the URL tests). Thanks for documenting the instances that should not be changed in the summary.

All of documentation, user facing strings, and tests are unfrozen, so this patch is okay to go in during the beta. It might require rerolls in a few other patches, but since it's mostly in @todo and such I think the disruption is limited enough to be acceptable, and better to get this disruption out of the way now so that other improvements to MAINTAINERS.txt and so on don't conflict with it. (Plus it's somewhat embarrassing to have non-canonical links to our own website.) ;) So, committed and pushed to 8.0.x.

  • xjm committed 088f8b3 on 8.0.x
    Issue #2491155 by mikeburrelljr, Mac_Weber, opdavies: Update drupal.org...
nod_’s picture

Issue tags: +JavaScript

This changes JS files, please tag it with "JavaScript".

It's hard to keep chasing head with #2182153: [Meta] Document Drupal JavaScript using JSDoc, I'd prefer to know about all JS issues to get ready to reroll when necessary.

Mac_Weber’s picture

All right @nod_. I will keep an eye on JS changes for the Link module.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.