Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
93088f87
Commit
93088f87
authored
Oct 15, 2015
by
alexpott
Browse files
Issue
#2590059
by Sagar Ramgade, GoZ, sdstyles, jhodgdon: Fix double occurrence of prepositions
parent
b2198399
Changes
23
Hide whitespace changes
Inline
Side-by-side
core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
View file @
93088f87
...
...
@@ -19,7 +19,7 @@
* More ideas are taken from:
* http://www.ics.uci.edu/~eppstein/161/960229.html
*
* Some ideas
are
(and a bit of code) are from
from
analyze.c, from GNU
* Some ideas (and a bit of code) are from analyze.c, from GNU
* diffutils-2.7, which can be found at:
* ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
*
...
...
core/lib/Drupal/Core/Config/StorageComparerInterface.php
View file @
93088f87
...
...
@@ -109,7 +109,7 @@ public function moveRenameToUpdate($rename, $collection = StorageInterface::DEFA
*
* @return array
* An associative array of configuration names. The array keys are
* 'old_name' and
and
'new_name' representing the old and n
am
e configuration
* 'old_name' and 'new_name' representing the old and ne
w
configuration
* object names during a rename operation.
*
* @see \Drupal\Core\Config\StorageComparer::createRenameNames()
...
...
core/lib/Drupal/Core/Menu/MenuLinkInterface.php
View file @
93088f87
...
...
@@ -131,7 +131,7 @@ public function getRouteParameters();
* the description is not empty.
*
* @return \Drupal\Core\Url
* A
a
URL object containing either the external path or route.
* A URL object containing either the external path or route.
*/
public
function
getUrlObject
(
$title_attribute
=
TRUE
);
...
...
core/lib/Drupal/Core/Menu/menu.api.php
View file @
93088f87
...
...
@@ -297,7 +297,7 @@ function hook_menu_links_discovered_alter(&$links) {
*
* @param array $data
* An associative array containing list of (up to 2) tab levels that contain a
* list of
of
tabs keyed by their href, each one being an associative array
* list of tabs keyed by their href, each one being an associative array
* as described above.
* @param string $route_name
* The route name of the page.
...
...
core/lib/Drupal/Core/Render/Element/Details.php
View file @
93088f87
...
...
@@ -13,7 +13,7 @@
* Provides a render element for a details element, similar to a fieldset.
*
* Fieldsets can only be used in forms, while details elements can be used
* outside of forms.
Users click on the
the
title to open or close the details
* outside of forms. Users click on the title to open or close the details
* element, showing or hiding the contained elements.
*
* Properties:
...
...
core/modules/comment/src/Tests/CommentFieldAccessTest.php
View file @
93088f87
...
...
@@ -243,7 +243,7 @@ public function testAccessToAdministrativeFields() {
foreach
(
$permutations
as
$set
)
{
$may_view
=
$set
[
'comment'
]
->
{
$field
}
->
access
(
'view'
,
$set
[
'user'
]);
$may_update
=
$set
[
'comment'
]
->
{
$field
}
->
access
(
'edit'
,
$set
[
'user'
]);
// Nobody has access to
to
view the hostname field.
// Nobody has access to view the hostname field.
if
(
$field
===
'hostname'
)
{
$view_access
=
FALSE
;
$state
=
'cannot'
;
...
...
core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
View file @
93088f87
...
...
@@ -502,7 +502,7 @@ public function testHasSchema(array $mock_return_values, $expected) {
}
/**
* Provides data for
for
ConfigMapperTest::testHasSchema().
* Provides data for ConfigMapperTest::testHasSchema().
*
* @return array
* An array of arrays, where each inner array has an array of values that
...
...
core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
View file @
93088f87
...
...
@@ -455,7 +455,7 @@ protected function getValue(EntityInterface $translation, $property, $langcode)
* The entity being tested.
*
* @return string
* The
the
field name.
* The field name.
*/
protected
function
getChangedFieldName
(
$entity
)
{
return
$entity
->
hasField
(
'content_translation_changed'
)
?
'content_translation_changed'
:
'changed'
;
...
...
core/modules/field/src/Entity/FieldConfig.php
View file @
93088f87
...
...
@@ -184,7 +184,7 @@ public function preSave(EntityStorageInterface $storage) {
*/
public
function
calculateDependencies
()
{
parent
::
calculateDependencies
();
// Mark the field_storage_config as a
a
dependency.
// Mark the field_storage_config as a dependency.
$this
->
addDependency
(
'config'
,
$this
->
getFieldStorageDefinition
()
->
getConfigDependencyName
());
return
$this
;
}
...
...
core/modules/image/src/Form/ImageStyleEditForm.php
View file @
93088f87
...
...
@@ -273,7 +273,7 @@ public function actions(array $form, FormStateInterface $form_state) {
* Updates image effect weights.
*
* @param array $effects
* Associative array with effects having effect uuid as keys and
and
array
* Associative array with effects having effect uuid as keys and array
* with effect data as values.
*/
protected
function
updateEffectWeights
(
array
$effects
)
{
...
...
core/modules/node/src/Plugin/Search/NodeSearch.php
View file @
93088f87
...
...
@@ -97,7 +97,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
/**
* The list of options and info for advanced search filters.
*
* Each entry in the array has the option as the key and
and
for its value, an
* Each entry in the array has the option as the key and for its value, an
* array that determines how the value is matched in the database query. The
* possible keys in that array are:
* - column: (required) Name of the database column to match against.
...
...
core/modules/simpletest/simpletest.js
View file @
93088f87
...
...
@@ -83,7 +83,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
* Attaches the filter behavior t
he
the text input element.
* Attaches the filter behavior t
o
the text input element.
*/
Drupal
.
behaviors
.
simpletestTableFilterByText
=
{
attach
:
function
(
context
)
{
...
...
core/modules/simpletest/src/BrowserTestBase.php
View file @
93088f87
...
...
@@ -1194,7 +1194,7 @@ protected function prepareRequestForGenerator($clean_urls = TRUE, $override_serv
$server
=
array_merge
(
$server
,
$override_server_vars
);
$request
=
Request
::
create
(
$request_path
,
'GET'
,
array
(),
array
(),
array
(),
$server
);
// Ensure the
the
request time is REQUEST_TIME to ensure that API calls
// Ensure the request time is REQUEST_TIME to ensure that API calls
// in the test use the right timestamp.
$request
->
server
->
set
(
'REQUEST_TIME'
,
REQUEST_TIME
);
$this
->
container
->
get
(
'request_stack'
)
->
push
(
$request
);
...
...
core/modules/simpletest/src/WebTestBase.php
View file @
93088f87
...
...
@@ -2921,7 +2921,7 @@ protected function prepareRequestForGenerator($clean_urls = TRUE, $override_serv
$server
=
array_merge
(
$server
,
$override_server_vars
);
$request
=
Request
::
create
(
$request_path
,
'GET'
,
array
(),
array
(),
array
(),
$server
);
// Ensure the
the
request time is REQUEST_TIME to ensure that API calls
// Ensure the request time is REQUEST_TIME to ensure that API calls
// in the test use the right timestamp.
$request
->
server
->
set
(
'REQUEST_TIME'
,
REQUEST_TIME
);
$this
->
container
->
get
(
'request_stack'
)
->
push
(
$request
);
...
...
core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
View file @
93088f87
...
...
@@ -295,7 +295,7 @@ public function testConfigLevelDepth() {
* Converts the result of MenuLinkTree::build() in a "menu link ID tree".
*
* @param array $build
* The return value of
of
MenuLinkTree::build()
* The return value of MenuLinkTree::build()
*
* @return array
* The "menu link ID tree" representation of the given render array.
...
...
core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php
View file @
93088f87
...
...
@@ -569,7 +569,7 @@ public function testDotted() {
->
condition
(
'array.level1.level2'
,
3
)
->
execute
();
$this
->
assertResults
(
array
(
'5'
));
// Make sure that values on the wildcard level do not match if
if
there are
// Make sure that values on the wildcard level do not match if there are
// sub-keys defined. This must not find anything even if entity 2 has a
// top-level key number with value 41.
$this
->
queryResults
=
$this
->
factory
->
get
(
'config_query_test'
)
...
...
core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php
View file @
93088f87
...
...
@@ -390,7 +390,7 @@ public function testRevisionChanged() {
$this
->
assertFalse
(
$this
->
getRevisionTranslationAffectedFlag
(
$german
),
'Changed flag of
of
the German translation is not set for new revision without changes.'
'Changed flag of the German translation is not set for new revision without changes.'
);
$entity
->
setNewRevision
();
...
...
core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
View file @
93088f87
...
...
@@ -70,7 +70,7 @@ public function testClear() {
// Non-existing token.
$source
.
=
'[bogus:token]'
;
// Replace with
with
the clear parameter, only the valid token should remain.
// Replace with the clear parameter, only the valid token should remain.
$target
=
Html
::
escape
(
$this
->
config
(
'system.site'
)
->
get
(
'name'
));
$result
=
$this
->
tokenService
->
replace
(
$source
,
array
(),
array
(
'langcode'
=>
$this
->
interfaceLanguage
->
getId
(),
'clear'
=>
TRUE
));
$this
->
assertEqual
(
$target
,
$result
,
'Valid tokens replaced while invalid tokens ignored.'
);
...
...
core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
View file @
93088f87
...
...
@@ -153,7 +153,7 @@ public function providerTestCases() {
// Referenceables containing '_', limited to 3. Expecting 3 limited items
// ('Xyz_', 'xyabz_', 'foo_') and 5 total.
[
'_'
,
'CONTAINS'
,
3
,
3
,
[
'Xyz_'
,
'xyabz_'
,
'foo_'
],
6
],
// Referenceables ending with
with
'z_', limited to 3. Expecting 3 limited
// Referenceables ending with 'z_', limited to 3. Expecting 3 limited
// items ('Xyz_', 'xyabz_', 'baz_') and 4 total.
[
'z_'
,
'ENDS_WITH'
,
3
,
3
,
[
'Xyz_'
,
'xyabz_'
,
'baz_'
],
4
],
// Referenceables identical with 'xyabz_', no limit. Expecting 1 item
...
...
core/modules/user/src/Tests/UserTokenReplaceTest.php
View file @
93088f87
...
...
@@ -157,7 +157,7 @@ function testUserTokenReplacement() {
foreach
(
$tests
as
$input
=>
$expected
)
{
foreach
(
array
(
$user1
,
$user2
)
as
$account
)
{
$output
=
$token_service
->
replace
(
$input
,
[
'user'
=>
$account
],
[
'langcode'
=>
'de'
,
'callback'
=>
'user_mail_tokens'
,
'clear'
=>
TRUE
]);
$this
->
assertTrue
(
strpos
(
$output
,
$link
)
===
0
,
"Generated URL in
in
the requested language."
);
$this
->
assertTrue
(
strpos
(
$output
,
$link
)
===
0
,
"Generated URL in the requested language."
);
}
}
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment