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.
Comment | File | Size | Author |
---|---|---|---|
#23 | update_drupal_org_and-2491155-23.patch | 310.24 KB | mikeburrelljr |
#23 | interdiff-update_drupal_org_and-2491155-20-23-do-not-test.diff | 3.18 KB | mikeburrelljr |
#20 | update_drupal_org_and-2491155-20.patch | 310.36 KB | mikeburrelljr |
#14 | update_drupal_org_and-2491155-14.patch | 309.37 KB | mikeburrelljr |
#6 | update_drupal_org_url-2491155-6.patch | 323.25 KB | Mac_Weber |
Comments
Comment #1
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedInitial pass. Uploading patch for code review and testing.
Comment #2
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedComment #3
opdaviesComment #4
opdaviesThe 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.
Comment #5
opdaviesComment #6
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedI 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
atREADME.txt
, but https do not work well there and there is no redirect if usingwww.
or not. Then, I did not modify this one.Comment #7
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedI 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
And
./core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
Comment #9
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedPatch #6 looks good. Thanks!
Patch #7 is modifying tests which don't need changed, imo.
Comment #11
jhodgdontest failed. Also this is not changing just documentation.
Comment #12
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commented@jhodgdon See my comment above. Patch #6 looks good.
Comment #13
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedNote: We need to pull the latest changes from master (and re-grep).
Comment #14
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedRe-rolled patch.
Comment #15
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedComment #19
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedLooks like we need to re-roll this patch again... Was passing tests, now is not.
Comment #20
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commentedRe-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!
Comment #21
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedComment #22
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedSee https://www.drupal.org/coding-standards/docs#link
There are more tags like this one that need to be fixed.
Comment #23
mikeburrelljr CreditAttribution: mikeburrelljr as a volunteer commented@Mac_Weber Thanks for the heads-up on the @link standard.
Please see the updated patch - along with an interdiff from the previous. Thanks!
Comment #24
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedComment #25
xjmThanks @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 toMAINTAINERS.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.Comment #27
nod_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.
Comment #28
Mac_Weber CreditAttribution: Mac_Weber as a volunteer commentedAll right @nod_. I will keep an eye on JS changes for the Link module.