Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.
Problem/Motivation
Proposed Solution
In the documentation, change all instances of "url" to "URL". Under '/core/modules/' folder
Proposed resolution
Remaining tasks
Postponed on #2574981: Fix grammar ("an URL" should be "a URL") and consistent use of URL (not "url" / "Url") in documentation only, part 1. See comment [#2574981#125].
User interface changes
API changes
Data model changes
Release notes snippet
Comment | File | Size | Author |
---|---|---|---|
#122 | 2676182-122.patch | 86.86 KB | ravi.shankar |
#118 | change-all-instances-to-url-2676182-118.patch | 86.73 KB | Ramya Balasubramanian |
#115 | change-all-instances-of-url-2676182-115.patch | 80.58 KB | Ramya Balasubramanian |
#112 | change-all-instances-of-url-2676182-112.patch | 81.52 KB | Ramya Balasubramanian |
#110 | 2676182-110.patch | 80.69 KB | mohrerao |
Comments
Comment #2
rakesh.gectcrComment #4
jhodgdonThanks for the patch! Most of it looks fine. A few things to fix:
We should not be modifying anything in /core/assets/vendor or /vendor in this patch.
This should not be changed. This is describing elements of a $variables array and the array key is 'url' here, not 'URL'.
This should not be changed. This is describing elements of a $variables array and the array key is 'url' here.
This should not be changed. This is describing an array element whose key is actually 'url'.
This is describing Twig functions, whose names are url and path, so don't change the caps here.
This is referring to an array element name, no change.
This is referring to the name of a Twig function called "url", so should not be changed.
at the end of this sentence, "urls" should be changed to "URLs".
This is most likely the cause of the test failures? Stray "z" at the end of the line.
Comment #5
mahaveer003 CreditAttribution: mahaveer003 as a volunteer and at Valuebound commented@ jhodgdon
I have updated your comments on the patch. please review it.
Comment #7
mahaveer003 CreditAttribution: mahaveer003 as a volunteer and at Valuebound commented@ jhodgdon
I have updated patch with your comments. please review it.
Comment #8
mahaveer003 CreditAttribution: mahaveer003 as a volunteer and at Valuebound commentedComment #9
jhodgdonThanks! Everything in the patch looks good now.
Also as a note, this patch doesn't apply to Drupal 8.0.x, so tagging for backport after we get 8.1.x. in.
However, I do not think this patch is fixing all instances of "url". After applying the patch, I found the following:
At this point, I stopped looking for more, but there probably are more.
Comment #10
imalabyaThe scope is still big IMO. The patch is making changes in many files, difficult to apply the patch after nearly an hour or two. @Jennifer should we reduce the scope by refining it more?
Comment #11
jhodgdonIf you want to reduce the size of the patch, ... I don't think the scope can be reduced in any way that makes sense, but the way to reduce the size of the patch is to make "sections" like core/lib vs. core/modules or something like that. See
https://www.drupal.org/core/scope
for guidelines on how to properly scope issues.
So, if you want to reduce the patch size, make this a Meta issue and split it into a few parts that are clearly defined as to which files in Core they cover.
Comment #12
rakesh.gectcr@jhodgdon will split into following parts
The current thread will consider as meta.
Comment #13
rakesh.gectcrComment #14
rakesh.gectcrComment #15
rakesh.gectcrComment #16
rakesh.gectcrComment #17
jhodgdonThanks for the rescoping. I've reviewed the child issues with patches and will follow the other.
I don't think we need that one issue to be both related and a child though. ;)
Comment #18
jhodgdonFor anyone following this, you may be interested in this kind-of related issue.
Comment #19
jhodgdonOh, I guess we need a few more child issues, right? core/includes, core/themes, core/profiles, core/misc are not covered by these issues yet. We should not touch core/assets, and I looked and core/scripts is fine.
We need to be careful about core/misc, which is all our core Drupal-project-owned JS files. Just be careful there because local parameters can legally be called "url" and they don't start with $ so you may have lines like
and you don't want to change those.
Comment #20
rakesh.gectcr@jhodgdon
Thanks,
I am working on it.
Comment #21
jhodgdonApparently (see the other related issues), @catch wants all of these combined into one patch. See #2679417: In the documentation, change all instances of "url" to "URL". Under '/core/modules/' folder M to Z for example of his comment. Probably this issue needs to be not a meta any more, and @catch wants one patch for the whole thing.
I am sorry for leading you down the path of multiple patches. Apparently I do not properly understand the Scope document. Good luck.... I will stay out of it. :(
Comment #22
jhodgdonComment #23
jhodgdonAlso crediting malavya who worked on some of the child issues.
Comment #24
xjmThis seems like a good issue scope to me. Thanks @catch and @jhodgdon!
Comment #25
xjmOh, following up, @jhodgdon, I think splitting up into grouping by file is only necessary when a patch is completely unmanageable with the minimum logical scope. For a word diff, the actual diff is much smaller than the line diff in the patch, and the reviewer just needs to scan the same change, so a much larger patch size is manageable. I think this is the key bit of the scope doc:
https://www.drupal.org/core/scope#size
And more generally:
https://www.drupal.org/core/scope#files
Apologies since my discussion of scope is not actually in scope for the issue. ;) Just wanted to explain why I thought this was a good scope.
Comment #26
jhodgdonWell I disagreed, and the people making this patch (see above) were having trouble with needing to reroll it too much. Splitting it up made it way easier to get right, too (there were numerous changes that didn't belong in the patch, it's not "replace everywhere with URL", see reviews on the sub-issues).
But whatever. I'm stepping back from it. Someone else can review the huge patches. I'm not.
Comment #27
xjmAlso, in terms of the patch not applying quickly, it will probably need rerolls occasionally as it is developed:
https://www.drupal.org/contributor-tasks/reroll
When the patch applies, you don't have to throw the whole thing out -- you can just resolve the conflicts using that rebase strategy.
Comment #28
xjmAttached rerolls the earlier patch on the issue. I did this as follows:
There were no merge conflicts to resolve with this; git took care of it automatically.
So it just needs to be updated for @jhodgdon's earlier reviews.
Comment #29
xjmNW to address #9. Also probably anything from @jhodgon's other reviews on other issues. Thanks everyone for working on this!
Comment #32
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedRerolled #28 to apply on 8.2.x.
Comment #33
pguillard CreditAttribution: pguillard commentedPatch #32 slightly rerolled because files have changed with this other patch :
Issue #2553655 by dawehner, Berdir, martin107: Convert ViewKernelTestBase to use KernelTestBaseTNG.
Comment #34
pguillard CreditAttribution: pguillard commentedComment #35
pguillard CreditAttribution: pguillard commentedComment #36
xjmThanks @pguillard for the reroll.
(Removing inapplicable tag.)
Comment #38
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedRerolled #34.
In my opinion this instances of "url" should be fixed in the parent class.
So I will upload these changes in other patch.
Comment #39
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedApply changes mentioned above on #38.
Comment #41
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedRerolled #39.
Some changes in core/includes/theme.inc has been caused this reroll.
See #2710685: inconsistent use of tags in docs for template_preprocess_links()
Comment #42
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedComment #43
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedAttached a new interdiff.
The changes that we see in this interdiff are the changes that are already committed on #2710685: inconsistent use of tags in docs for template_preprocess_links().
(Sorry for so many comments)
Comment #44
urvigala CreditAttribution: urvigala as a volunteer and at Blisstering Solutions commentedComment #45
urvigala CreditAttribution: urvigala as a volunteer and at Blisstering Solutions commentedComment #46
urvigala CreditAttribution: urvigala as a volunteer and at Blisstering Solutions commentedComment #47
urvigala CreditAttribution: urvigala as a volunteer and at Blisstering Solutions commentedComment #49
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedThe latest patch did not apply.
Rerolled #41.
Comment #50
Kevin P Davison CreditAttribution: Kevin P Davison as a volunteer and at Hook 42 commentedLots of attention to detail here, and I've reviewed all lines to agree that this looks good.
Comment #52
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedSimple rebase fixed it.
RTBC maybe?
Comment #53
urvigala CreditAttribution: urvigala as a volunteer and at Blisstering Solutions commentedComment #54
urvigala CreditAttribution: urvigala as a volunteer and at Blisstering Solutions commentedComment #56
rajeshwari10 CreditAttribution: rajeshwari10 as a volunteer and at Blisstering Solutions commentedI was able the patch. So changing status to need's review.
Thanks!!
Comment #57
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedRerolled #52.
Comment #58
Manjit.Singhtest pass and looks good to me :)
Comment #59
Manjit.Singhaccidentally attached a patch file.. so removing it.
Comment #61
imalabyaComment #62
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedI do not understand what happened in these last two comments ...
I upload the patch indicated in #57.
Comment #63
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedAfter 2 weeks, more work is needed on this task?
RTBC maybe?
Comment #64
anavarrePatch in #62 applies successfully against 8.2.x but it seems there's a bit more work before it's ready. Here's what I could spot:
Another 'url' spotted.
This line should be wrapped at 80 cols.
Addressed this in the attached patch. Also tried to address #9 and correct a few cURL strings that I suspect might have been replaced as part of a bulk search/replace.
Comment #65
anavarreOh, I do see some strings have been reverted in the interdiff but those are NOT in my 8.2.x checkout nor in the above patch - Was #62 generated against 8.1.x, maybe?
Comment #66
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedPatch on #62 was generated against 8.2.x.
However I upload another patch. (It appears to be identical to patch indicated on #62)
I upload an interdiff that the only thing amending are the points 1 and 2 explained on #64.
Comment #67
anavarrere: #66 - If you want to ignore non-URL-related changes in #64, please at least incorporate the points raised in #9
Comment #68
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commented@anavarre Thanks for your review.
I upload a new patch to incorporate the points raised in #9.
I also searched other matches and tried to solve them (See interdiff).
On the other hand, I have doubts when I found the following string:
"url object".
What would be more correct? "Url object" or "URL object" (Although the scope of this issue is only to change "url" by "URL")
Comment #69
anavarreShould be wrapped at 80 cols.
I think this might have to stay as is since it's a reference to an actual object, not the URL acronym. But I'd defer to Jennifer for the correct path to follow here.
Also, found a few more it seems:
What about the many 'url' strings in
core/modules/filter/tests/filter.url-output.txt
andcore/modules/filter/tests/filter.url-input.txt
?Comment #70
anavarreTook a stab at incorporating the above changes and other url strings I found. Also went ahead and changed the url object string as well for now since I also changed the url generator strings.
Also noticed the interdiff says I've changed uppercase to lowercase but I don't get why since the patch does not actually do that. In any case, more progress on this issue, hopefully.
Comment #71
anavarreComment #74
Munavijayalakshmi CreditAttribution: Munavijayalakshmi at Valuebound commentedLine exceeding 80 characters
Comment #75
Munavijayalakshmi CreditAttribution: Munavijayalakshmi at Valuebound commentedComment #76
himanshu-dixit CreditAttribution: himanshu-dixit as a volunteer commentedI am not sure weather this should be handled in this issue
Comment #77
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedReroll against 8.4.x
Hope it works!
Comment #78
Munavijayalakshmi CreditAttribution: Munavijayalakshmi at Valuebound commenteduse short array syntax (new coding standard).
Fixed the short array syntax error and attached new patch.
Comment #81
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commentedI'm not sure if we should change to the short array syntax, probably is out of scope?
I think that we have to fix all errors at #77.
Comment #82
Mixologic#77 and #78 have two extraneous functions that are not in scope for this issue, and broke the testbot so bad that it flushed out the queue.
You'll need to reroll #70 again. plz do not use 77 / 78 as a base.
Comment #83
klausithis change is wrong, converts URL to lower case. Why?
Comment #84
pguillard CreditAttribution: pguillard commentedApplied @klausi remark, a few that wre missing, and reverted one that was not a comment.
Comment #85
pguillard CreditAttribution: pguillard commentedComment #87
dimaro CreditAttribution: dimaro at La Drupalera by Emergya commented@pguillard Probably we should make the reroll again based on #70 as @Mixologic said above on #82 because my latest patch could been have a mistake, secondly we have to check that all ocurrences works fine.
Comment #88
pk188 CreditAttribution: pk188 at OpenSense Labs commentedRe rolled #70 according to #87.
Not find all the changes.
Did some extra changes too.
Comment #91
sk33lz CreditAttribution: sk33lz at Zivtech commented#88 fails and needs to be re-rolled against 8.6.x.
Comment #92
yogeshmpawarTaking this issue.
Comment #93
yogeshmpawarRe-rolled the patch against 8.6.x branch.
Comment #94
amietpatial CreditAttribution: amietpatial as a volunteer and at gai Technologies Pvt Ltd for gai Technologies Pvt Ltd commentedYogesh Pawar your patch failed to apply
Comment #95
pguillard CreditAttribution: pguillard commentedPatch rerolled
Comment #96
pguillard CreditAttribution: pguillard commentedComment #100
capysara CreditAttribution: capysara at Bounteous commentedRe-rolled for 8.9.
Comment #102
ruchi-94 CreditAttribution: ruchi-94 as a volunteer and commentedComment #103
ruchi-94 CreditAttribution: ruchi-94 as a volunteer and commentedComment #104
ruchi-94 CreditAttribution: ruchi-94 as a volunteer and commentedComment #105
junglePatch in #100 failed to apply.
Comment #106
Lal_Comment #107
Lal_Comment #108
Lal_Comment #110
mohrerao CreditAttribution: mohrerao as a volunteer and at Srijan | A Material+ Company for Drupal India Association commentedRerolled patch as #107 failed to apply.
Some unrelated test is failing.
Comment #111
Ramya Balasubramanian CreditAttribution: Ramya Balasubramanian at Srijan | A Material+ Company for Drupal India Association commentedComment #112
Ramya Balasubramanian CreditAttribution: Ramya Balasubramanian at Srijan | A Material+ Company for Drupal India Association commentedHi,
Fixing the test case error. Please have a look at this patch.
Comment #114
Ramya Balasubramanian CreditAttribution: Ramya Balasubramanian at Srijan | A Material+ Company for Drupal India Association commentedComment #115
Ramya Balasubramanian CreditAttribution: Ramya Balasubramanian at Srijan | A Material+ Company for Drupal India Association commentedUsually, when there is a change in twig file, the generated hash key gets updated. So we need to update the hash key in the file. Updated the hash key again.
Comment #117
Ramya Balasubramanian CreditAttribution: Ramya Balasubramanian at Srijan | A Material+ Company for Drupal India Association commentedSince in previous patches, we have changed that in few themes also. I have noticed now that the URL is not changed in these files.
1) core/themes/claro/templates/classy/navigation
2) core/themes/bartik/templates/classy/navigation/menu.html.twig
3) core/themes/stable9/templates/navigation/menu.html.twig
4)core/themes/stable9/templates/navigation/menu--toolbar.html.twig
5) core/profiles/demo_umami/
Comment #118
Ramya Balasubramanian CreditAttribution: Ramya Balasubramanian at Srijan | A Material+ Company for Drupal India Association commentedChanged in all files, updated the patch.
Comment #120
jungleUnexpected
z
Comment #121
jungleWould be great to work out a script to check if all are fixed or is there more to do.
Comment #122
ravi.shankar CreditAttribution: ravi.shankar at OpenSense Labs commentedAdded a reroll of patch #118.
Comment #123
samiullah CreditAttribution: samiullah at Salsa Digital commentedWas able to see change in documentation for url to URL
did the git grep for changes after applying patch, some example output is here
This can be moved to RTBC if code review is fine
Comment #125
quietone CreditAttribution: quietone as a volunteer commentedNo longer applies
Comment #126
quietone CreditAttribution: quietone as a volunteer commentedActually no. The patch here is very much the same as in the parent issue. This looks like it is a duplicate of the parent.
On another read, the issue summary says this is for files in core/modules but it is covering all of core. But more importantly there are questions to resolve in the parent. Postponing on the parent, specifically until there is resolution on the points in 2574981#125.
Also not a bug, this is a task.
Comment #131
quietone CreditAttribution: quietone as a volunteer commentedThis was discussed at a documentation triage meeting. I have updated the IS with the standard template and added what this is postponed on.
Comment #132
quietone CreditAttribution: quietone at PreviousNext commentedReviewing this again. This was created after #2574981: Fix grammar ("an URL" should be "a URL") and consistent use of URL (not "url" / "Url") in documentation only, part 1 which is doing the same work and is now fixed. That makes this a duplicate. I am closing this and transferring credit.
Comment #133
quietone CreditAttribution: quietone at PreviousNext commented