Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
229
Merge Requests
229
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
9cf1459a
Commit
9cf1459a
authored
Sep 18, 2014
by
jhodgdon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2329703
by maximpodorov: Fix spelling in varous files
parent
c1442c5a
Changes
51
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
74 additions
and
74 deletions
+74
-74
core/lib/Drupal/Component/Datetime/DateTimePlus.php
core/lib/Drupal/Component/Datetime/DateTimePlus.php
+1
-1
core/lib/Drupal/Component/Gettext/PoStreamReader.php
core/lib/Drupal/Component/Gettext/PoStreamReader.php
+1
-1
core/lib/Drupal/Component/Plugin/Discovery/CachedDiscoveryInterface.php
...l/Component/Plugin/Discovery/CachedDiscoveryInterface.php
+1
-1
core/lib/Drupal/Component/Transliteration/PHPTransliteration.php
...b/Drupal/Component/Transliteration/PHPTransliteration.php
+1
-1
core/lib/Drupal/Component/Utility/OpCodeCache.php
core/lib/Drupal/Component/Utility/OpCodeCache.php
+1
-1
core/lib/Drupal/Core/Ajax/DataCommand.php
core/lib/Drupal/Core/Ajax/DataCommand.php
+1
-1
core/lib/Drupal/Core/Archiver/ArchiveTar.php
core/lib/Drupal/Core/Archiver/ArchiveTar.php
+3
-3
core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+2
-2
core/lib/Drupal/Core/Authentication/AuthenticationManager.php
.../lib/Drupal/Core/Authentication/AuthenticationManager.php
+1
-1
core/lib/Drupal/Core/Block/BlockBase.php
core/lib/Drupal/Core/Block/BlockBase.php
+1
-1
core/lib/Drupal/Core/Block/BlockPluginInterface.php
core/lib/Drupal/Core/Block/BlockPluginInterface.php
+1
-1
core/lib/Drupal/Core/Cache/CacheCollector.php
core/lib/Drupal/Core/Cache/CacheCollector.php
+2
-2
core/lib/Drupal/Core/Cache/CacheContexts.php
core/lib/Drupal/Core/Cache/CacheContexts.php
+2
-2
core/lib/Drupal/Core/Cache/ChainedFastBackend.php
core/lib/Drupal/Core/Cache/ChainedFastBackend.php
+1
-1
core/lib/Drupal/Core/Cache/DatabaseBackend.php
core/lib/Drupal/Core/Cache/DatabaseBackend.php
+2
-2
core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
+1
-1
core/lib/Drupal/Core/Config/FileStorage.php
core/lib/Drupal/Core/Config/FileStorage.php
+1
-1
core/lib/Drupal/Core/Config/StorageComparer.php
core/lib/Drupal/Core/Config/StorageComparer.php
+1
-1
core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
+1
-1
core/lib/Drupal/Core/Controller/HtmlFormController.php
core/lib/Drupal/Core/Controller/HtmlFormController.php
+1
-1
core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+6
-6
core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
+1
-1
core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
+3
-3
core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+4
-4
core/lib/Drupal/Core/Database/InvalidQueryException.php
core/lib/Drupal/Core/Database/InvalidQueryException.php
+1
-1
core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php
...lib/Drupal/Core/Database/Query/FieldsOverlapException.php
+1
-1
core/lib/Drupal/Core/Database/Query/Merge.php
core/lib/Drupal/Core/Database/Query/Merge.php
+1
-1
core/lib/Drupal/Core/Database/Schema.php
core/lib/Drupal/Core/Database/Schema.php
+2
-2
core/lib/Drupal/Core/DependencyInjection/ClassResolverInterface.php
...rupal/Core/DependencyInjection/ClassResolverInterface.php
+1
-1
core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
...endencyInjection/Compiler/RegisterKernelListenersPass.php
+1
-1
core/lib/Drupal/Core/DrupalKernel.php
core/lib/Drupal/Core/DrupalKernel.php
+1
-1
core/lib/Drupal/Core/Entity/ContentEntityBase.php
core/lib/Drupal/Core/Entity/ContentEntityBase.php
+4
-4
core/lib/Drupal/Core/Entity/EntityResolverManager.php
core/lib/Drupal/Core/Entity/EntityResolverManager.php
+1
-1
core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+3
-3
core/lib/Drupal/Core/EventSubscriber/AjaxSubscriber.php
core/lib/Drupal/Core/EventSubscriber/AjaxSubscriber.php
+1
-1
core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php
.../Core/EventSubscriber/ContentFormControllerSubscriber.php
+1
-1
core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
.../Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+1
-1
core/lib/Drupal/Core/Field/WidgetBase.php
core/lib/Drupal/Core/Field/WidgetBase.php
+1
-1
core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+1
-1
core/lib/Drupal/Core/Form/FormBuilder.php
core/lib/Drupal/Core/Form/FormBuilder.php
+1
-1
core/lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php
core/lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php
+1
-1
core/lib/Drupal/Core/Path/AliasManagerInterface.php
core/lib/Drupal/Core/Path/AliasManagerInterface.php
+1
-1
core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
+1
-1
core/lib/Drupal/Core/Render/Element/MachineName.php
core/lib/Drupal/Core/Render/Element/MachineName.php
+1
-1
core/lib/Drupal/Core/Render/Element/Table.php
core/lib/Drupal/Core/Render/Element/Table.php
+2
-2
core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php
core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php
+1
-1
core/lib/Drupal/Core/Routing/UrlGenerator.php
core/lib/Drupal/Core/Routing/UrlGenerator.php
+1
-1
core/lib/Drupal/Core/Session/AccountProxy.php
core/lib/Drupal/Core/Session/AccountProxy.php
+1
-1
core/lib/Drupal/Core/StringTranslation/TranslationManager.php
.../lib/Drupal/Core/StringTranslation/TranslationManager.php
+1
-1
core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
+1
-1
core/lib/Drupal/Core/TypedData/TranslatableInterface.php
core/lib/Drupal/Core/TypedData/TranslatableInterface.php
+1
-1
No files found.
core/lib/Drupal/Component/Datetime/DateTimePlus.php
View file @
9cf1459a
...
@@ -287,7 +287,7 @@ protected function prepareTime($time) {
...
@@ -287,7 +287,7 @@ protected function prepareTime($time) {
* Prepares the input timezone value.
* Prepares the input timezone value.
*
*
* Changes the timezone before trying to use it, if necessary.
* Changes the timezone before trying to use it, if necessary.
* Most imporantly, makes sure there is a valid timezone
* Most impor
t
antly, makes sure there is a valid timezone
* object before moving further.
* object before moving further.
*
*
* @param mixed $timezone
* @param mixed $timezone
...
...
core/lib/Drupal/Component/Gettext/PoStreamReader.php
View file @
9cf1459a
...
@@ -438,7 +438,7 @@ private function readLine() {
...
@@ -438,7 +438,7 @@ private function readLine() {
return
;
return
;
}
}
elseif
(
!
strncmp
(
"msgstr"
,
$line
,
6
))
{
elseif
(
!
strncmp
(
"msgstr"
,
$line
,
6
))
{
// A string pair for an msgid
id
(with optional context).
// A string pair for an msgid (with optional context).
if
((
$this
->
_context
!=
'MSGID'
)
&&
(
$this
->
_context
!=
'MSGCTXT'
))
{
if
((
$this
->
_context
!=
'MSGID'
)
&&
(
$this
->
_context
!=
'MSGCTXT'
))
{
// Strings are only valid within an id or context scope.
// Strings are only valid within an id or context scope.
...
...
core/lib/Drupal/Component/Plugin/Discovery/CachedDiscoveryInterface.php
View file @
9cf1459a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
namespace
Drupal\Component\Plugin\Discovery
;
namespace
Drupal\Component\Plugin\Discovery
;
/**
/**
* Interface for discovery comp
e
nents holding a cache of plugin definitions.
* Interface for discovery comp
o
nents holding a cache of plugin definitions.
*/
*/
interface
CachedDiscoveryInterface
extends
DiscoveryInterface
{
interface
CachedDiscoveryInterface
extends
DiscoveryInterface
{
...
...
core/lib/Drupal/Component/Transliteration/PHPTransliteration.php
View file @
9cf1459a
...
@@ -210,7 +210,7 @@ protected function readLanguageOverrides($langcode) {
...
@@ -210,7 +210,7 @@ protected function readLanguageOverrides($langcode) {
* Reads in generic transliteration data for a bank of characters.
* Reads in generic transliteration data for a bank of characters.
*
*
* The data is read in from a file named "x$bank.php" (with $bank in
* The data is read in from a file named "x$bank.php" (with $bank in
* hex
i
decimal notation) in PHPTransliteration::$dataDirectory. These files
* hex
a
decimal notation) in PHPTransliteration::$dataDirectory. These files
* should set up a variable $bank containing an array whose numerical indices
* should set up a variable $bank containing an array whose numerical indices
* are the remaining two bytes of the character code, and whose values are the
* are the remaining two bytes of the character code, and whose values are the
* transliterations of these characters into US-ASCII. Note that the maximum
* transliterations of these characters into US-ASCII. Note that the maximum
...
...
core/lib/Drupal/Component/Utility/OpCodeCache.php
View file @
9cf1459a
...
@@ -29,7 +29,7 @@ public static function invalidate($pathname) {
...
@@ -29,7 +29,7 @@ public static function invalidate($pathname) {
if
(
extension_loaded
(
'Zend OPcache'
))
{
if
(
extension_loaded
(
'Zend OPcache'
))
{
opcache_invalidate
(
$pathname
,
TRUE
);
opcache_invalidate
(
$pathname
,
TRUE
);
}
}
// If apcu extens
t
ion is enabled in PHP 5.5 or greater it emulates apc.
// If apcu extension is enabled in PHP 5.5 or greater it emulates apc.
// This is to provide an easy upgrade path if you are using apc's user
// This is to provide an easy upgrade path if you are using apc's user
// caching however the emulation does not extend to opcode caching.
// caching however the emulation does not extend to opcode caching.
// Therefore we need to check if the function exists as well.
// Therefore we need to check if the function exists as well.
...
...
core/lib/Drupal/Core/Ajax/DataCommand.php
View file @
9cf1459a
...
@@ -40,7 +40,7 @@ class DataCommand implements CommandInterface {
...
@@ -40,7 +40,7 @@ class DataCommand implements CommandInterface {
protected
$name
;
protected
$name
;
/**
/**
* The value of the data to be atached to elements matched by the selector.
* The value of the data to be at
t
ached to elements matched by the selector.
*
*
* The data is not limited to strings; it can be any format.
* The data is not limited to strings; it can be any format.
*
*
...
...
core/lib/Drupal/Core/Archiver/ArchiveTar.php
View file @
9cf1459a
...
@@ -118,7 +118,7 @@ function __construct($p_tarname, $p_compress = null)
...
@@ -118,7 +118,7 @@ function __construct($p_tarname, $p_compress = null)
if
(
$data
==
"
\37\213
"
)
{
if
(
$data
==
"
\37\213
"
)
{
$this
->
_compress
=
true
;
$this
->
_compress
=
true
;
$this
->
_compress_type
=
'gz'
;
$this
->
_compress_type
=
'gz'
;
// No sure it's enough
t
for a magic code ....
// No sure it's enough for a magic code ....
}
elseif
(
$data
==
"BZ"
)
{
}
elseif
(
$data
==
"BZ"
)
{
$this
->
_compress
=
true
;
$this
->
_compress
=
true
;
$this
->
_compress_type
=
'bz2'
;
$this
->
_compress_type
=
'bz2'
;
...
@@ -617,7 +617,7 @@ function setAttribute()
...
@@ -617,7 +617,7 @@ function setAttribute()
break
;
break
;
default
:
default
:
$this
->
_error
(
'Unknow attribute code '
.
$v_att_list
[
$i
]
.
''
);
$this
->
_error
(
'Unknow
n
attribute code '
.
$v_att_list
[
$i
]
.
''
);
return
false
;
return
false
;
}
}
...
@@ -1826,7 +1826,7 @@ function _dirCheck($p_dir)
...
@@ -1826,7 +1826,7 @@ function _dirCheck($p_dir)
/**
/**
* Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
* Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
* rand emove double slashes.
* rand
r
emove double slashes.
*
*
* @param string $p_dir path to reduce
* @param string $p_dir path to reduce
*
*
...
...
core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
View file @
9cf1459a
...
@@ -68,11 +68,11 @@ public function render(array $css_assets) {
...
@@ -68,11 +68,11 @@ public function render(array $css_assets) {
for
(
$i
=
0
;
$i
<
count
(
$css_assets_keys
);
$i
++
)
{
for
(
$i
=
0
;
$i
<
count
(
$css_assets_keys
);
$i
++
)
{
$css_asset
=
$css_assets
[
$css_assets_keys
[
$i
]];
$css_asset
=
$css_assets
[
$css_assets_keys
[
$i
]];
switch
(
$css_asset
[
'type'
])
{
switch
(
$css_asset
[
'type'
])
{
// For file items, there are three possibilites.
// For file items, there are three possibilit
i
es.
// - There are up to 31 CSS assets on the page (some of which may be
// - There are up to 31 CSS assets on the page (some of which may be
// aggregated). In this case, output a LINK tag for file CSS assets.
// aggregated). In this case, output a LINK tag for file CSS assets.
// - There are more than 31 CSS assets on the page, yet we must stay
// - There are more than 31 CSS assets on the page, yet we must stay
// below IE<10's limit of 31 total CSS inclus
s
ion tags, we handle this
// below IE<10's limit of 31 total CSS inclusion tags, we handle this
// in two ways:
// in two ways:
// - file CSS assets that are not eligible for aggregation (their
// - file CSS assets that are not eligible for aggregation (their
// 'preprocess' flag has been set to FALSE): in this case, output a
// 'preprocess' flag has been set to FALSE): in this case, output a
...
...
core/lib/Drupal/Core/Authentication/AuthenticationManager.php
View file @
9cf1459a
...
@@ -89,7 +89,7 @@ public function authenticate(Request $request) {
...
@@ -89,7 +89,7 @@ public function authenticate(Request $request) {
$account
=
NULL
;
$account
=
NULL
;
// Iterate the avail
l
able providers.
// Iterate the available providers.
foreach
(
$this
->
getSortedProviders
()
as
$provider_id
=>
$provider
)
{
foreach
(
$this
->
getSortedProviders
()
as
$provider_id
=>
$provider
)
{
if
(
$provider
->
applies
(
$request
))
{
if
(
$provider
->
applies
(
$request
))
{
// Try to authenticate with this provider, skipping all others.
// Try to authenticate with this provider, skipping all others.
...
...
core/lib/Drupal/Core/Block/BlockBase.php
View file @
9cf1459a
...
@@ -355,7 +355,7 @@ public function blockForm($form, FormStateInterface $form_state) {
...
@@ -355,7 +355,7 @@ public function blockForm($form, FormStateInterface $form_state) {
* {@inheritdoc}
* {@inheritdoc}
*
*
* Most block plugins should not override this method. To add validation
* Most block plugins should not override this method. To add validation
* for a specific block type, override BlockBase::blockVal
di
ate().
* for a specific block type, override BlockBase::blockVal
id
ate().
*
*
* @see \Drupal\Core\Block\BlockBase::blockValidate()
* @see \Drupal\Core\Block\BlockBase::blockValidate()
*/
*/
...
...
core/lib/Drupal/Core/Block/BlockPluginInterface.php
View file @
9cf1459a
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
*
*
* @todo Add detailed documentation here explaining the block system's
* @todo Add detailed documentation here explaining the block system's
* architecture and the relationships between the various objects, including
* architecture and the relationships between the various objects, including
* brif references to the important components that are not coupled to the
* bri
e
f references to the important components that are not coupled to the
* interface.
* interface.
*
*
* @ingroup block_api
* @ingroup block_api
...
...
core/lib/Drupal/Core/Cache/CacheCollector.php
View file @
9cf1459a
...
@@ -200,10 +200,10 @@ protected function persist($key, $persist = TRUE) {
...
@@ -200,10 +200,10 @@ protected function persist($key, $persist = TRUE) {
* Resolves a cache miss.
* Resolves a cache miss.
*
*
* When an offset is not found in the object, this is treated as a cache
* When an offset is not found in the object, this is treated as a cache
* miss. This method allows classes using this implementatio to look up the
* miss. This method allows classes using this implementatio
n
to look up the
* actual value and allow it to be cached.
* actual value and allow it to be cached.
*
*
* @param sring $key
* @param s
t
ring $key
* The offset that was requested.
* The offset that was requested.
*
*
* @return mixed
* @return mixed
...
...
core/lib/Drupal/Core/Cache/CacheContexts.php
View file @
9cf1459a
...
@@ -99,13 +99,13 @@ public function convertTokensToKeys(array $keys) {
...
@@ -99,13 +99,13 @@ public function convertTokensToKeys(array $keys) {
}
}
/**
/**
* Provides the string representaton of a cache context.
* Provides the string representat
i
on of a cache context.
*
*
* @param string $context
* @param string $context
* A cache context token of an available cache context service.
* A cache context token of an available cache context service.
*
*
* @return string
* @return string
* The string representaton of a cache context.
* The string representat
i
on of a cache context.
*/
*/
protected
function
getContext
(
$context
)
{
protected
function
getContext
(
$context
)
{
return
$this
->
getService
(
$context
)
->
getContext
();
return
$this
->
getService
(
$context
)
->
getContext
();
...
...
core/lib/Drupal/Core/Cache/ChainedFastBackend.php
View file @
9cf1459a
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
* single web node, and will not require a network round trip to fetch a cache
* single web node, and will not require a network round trip to fetch a cache
* item. The fast backend will also typically be inconsistent (will only see
* item. The fast backend will also typically be inconsistent (will only see
* changes from one web node). The slower backend will be something like Mysql,
* changes from one web node). The slower backend will be something like Mysql,
* Mecached or Redis, and will be used by all web nodes, thus making it
* Me
m
cached or Redis, and will be used by all web nodes, thus making it
* consistent, but also require a network round trip for each cache get.
* consistent, but also require a network round trip for each cache get.
*
*
* In addition to being useful for sites running on multiple web nodes, this
* In addition to being useful for sites running on multiple web nodes, this
...
...
core/lib/Drupal/Core/Cache/DatabaseBackend.php
View file @
9cf1459a
...
@@ -220,7 +220,7 @@ public function setMultiple(array $items) {
...
@@ -220,7 +220,7 @@ public function setMultiple(array $items) {
$transaction
=
$this
->
connection
->
startTransaction
();
$transaction
=
$this
->
connection
->
startTransaction
();
try
{
try
{
// Delete all items first so we can do one insert. Rather than mul
it
ple
// Delete all items first so we can do one insert. Rather than mul
ti
ple
// merge queries.
// merge queries.
$this
->
deleteMultiple
(
array_keys
(
$items
));
$this
->
deleteMultiple
(
array_keys
(
$items
));
...
@@ -361,7 +361,7 @@ public function invalidate($cid) {
...
@@ -361,7 +361,7 @@ public function invalidate($cid) {
}
}
/**
/**
* Implements Drupal\Core\Cache\CacheBackendInterface::invalideMultiple().
* Implements Drupal\Core\Cache\CacheBackendInterface::invalid
at
eMultiple().
*/
*/
public
function
invalidateMultiple
(
array
$cids
)
{
public
function
invalidateMultiple
(
array
$cids
)
{
$cids
=
array_values
(
array_map
(
array
(
$this
,
'normalizeCid'
),
$cids
));
$cids
=
array_values
(
array_map
(
array
(
$this
,
'normalizeCid'
),
$cids
));
...
...
core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
View file @
9cf1459a
...
@@ -59,7 +59,7 @@ public function setSyncing($status);
...
@@ -59,7 +59,7 @@ public function setSyncing($status);
* - Status does not affect the loading of entities. I.e. Disabling
* - Status does not affect the loading of entities. I.e. Disabling
* configuration entities should only have UI/access implications.
* configuration entities should only have UI/access implications.
* - It should only take effect when a 'status' key is explicitly declared
* - It should only take effect when a 'status' key is explicitly declared
* in the entity_keys info of a configuration entitys annotation data.
* in the entity_keys info of a configuration entity
'
s annotation data.
* - Each entity implementation (entity/controller) is responsible for
* - Each entity implementation (entity/controller) is responsible for
* checking and managing the status.
* checking and managing the status.
*
*
...
...
core/lib/Drupal/Core/Config/FileStorage.php
View file @
9cf1459a
...
@@ -139,7 +139,7 @@ public function write($name, array $data) {
...
@@ -139,7 +139,7 @@ public function write($name, array $data) {
$target
=
$this
->
getFilePath
(
$name
);
$target
=
$this
->
getFilePath
(
$name
);
$status
=
@
file_put_contents
(
$target
,
$data
);
$status
=
@
file_put_contents
(
$target
,
$data
);
if
(
$status
===
FALSE
)
{
if
(
$status
===
FALSE
)
{
// Try to make sure the directory exists and try witing again.
// Try to make sure the directory exists and try w
r
iting again.
$this
->
ensureStorage
();
$this
->
ensureStorage
();
$status
=
@
file_put_contents
(
$target
,
$data
);
$status
=
@
file_put_contents
(
$target
,
$data
);
}
}
...
...
core/lib/Drupal/Core/Config/StorageComparer.php
View file @
9cf1459a
...
@@ -185,7 +185,7 @@ protected function addChangeList($collection, $op, array $changes, array $sort_o
...
@@ -185,7 +185,7 @@ protected function addChangeList($collection, $op, array $changes, array $sort_o
$this
->
changelist
[
$collection
][
$op
]
=
array_merge
(
$this
->
changelist
[
$collection
][
$op
],
$changes
);
$this
->
changelist
[
$collection
][
$op
]
=
array_merge
(
$this
->
changelist
[
$collection
][
$op
],
$changes
);
if
(
isset
(
$sort_order
))
{
if
(
isset
(
$sort_order
))
{
$count
=
count
(
$this
->
changelist
[
$collection
][
$op
]);
$count
=
count
(
$this
->
changelist
[
$collection
][
$op
]);
// Sort the changlist in the same order as the $sort_order array and
// Sort the chang
e
list in the same order as the $sort_order array and
// ensure the array is keyed from 0.
// ensure the array is keyed from 0.
$this
->
changelist
[
$collection
][
$op
]
=
array_values
(
array_intersect
(
$sort_order
,
$this
->
changelist
[
$collection
][
$op
]));
$this
->
changelist
[
$collection
][
$op
]
=
array_values
(
array_intersect
(
$sort_order
,
$this
->
changelist
[
$collection
][
$op
]));
if
(
$count
!=
count
(
$this
->
changelist
[
$collection
][
$op
]))
{
if
(
$count
!=
count
(
$this
->
changelist
[
$collection
][
$op
]))
{
...
...
core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
View file @
9cf1459a
...
@@ -80,7 +80,7 @@ public function create(DataDefinitionInterface $definition, $value, $name = NULL
...
@@ -80,7 +80,7 @@ public function create(DataDefinitionInterface $definition, $value, $name = NULL
* The base type definition array, for which a data definition should be
* The base type definition array, for which a data definition should be
* created.
* created.
* @param $value
* @param $value
* Optional value of the configura
it
on element.
* Optional value of the configura
ti
on element.
* @param string $name
* @param string $name
* Optional name of the configuration element.
* Optional name of the configuration element.
* @param object $parent
* @param object $parent
...
...
core/lib/Drupal/Core/Controller/HtmlFormController.php
View file @
9cf1459a
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
/**
/**
* @file
* @file
* Contains \Drupal\Core\Controler\HtmlFormController.
* Contains \Drupal\Core\Control
l
er\HtmlFormController.
*/
*/
namespace
Drupal\Core\Controller
;
namespace
Drupal\Core\Controller
;
...
...
core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
View file @
9cf1459a
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
class
Connection
extends
DatabaseConnection
{
class
Connection
extends
DatabaseConnection
{
/**
/**
* The name by which to obtain a lock for retrive the next insert id.
* The name by which to obtain a lock for retri
e
ve the next insert id.
*/
*/
const
POSTGRESQL_NEXTID_LOCK
=
1000
;
const
POSTGRESQL_NEXTID_LOCK
=
1000
;
...
@@ -88,7 +88,7 @@ public static function open(array &$connection_options = array()) {
...
@@ -88,7 +88,7 @@ public static function open(array &$connection_options = array()) {
\
PDO
::
ATTR_ERRMODE
=>
\
PDO
::
ERRMODE_EXCEPTION
,
\
PDO
::
ATTR_ERRMODE
=>
\
PDO
::
ERRMODE_EXCEPTION
,
// Prepared statements are most effective for performance when queries
// Prepared statements are most effective for performance when queries
// are recycled (used several times). However, if they are not re-used,
// are recycled (used several times). However, if they are not re-used,
// prepared statements become ineff
e
cient. Since most of Drupal's
// prepared statements become ineff
i
cient. Since most of Drupal's
// prepared queries are not re-used, it should be faster to emulate
// prepared queries are not re-used, it should be faster to emulate
// the preparation than to actually ready statements for re-use. If in
// the preparation than to actually ready statements for re-use. If in
// doubt, reset to FALSE and measure performance.
// doubt, reset to FALSE and measure performance.
...
@@ -233,14 +233,14 @@ public function mapConditionOperator($operator) {
...
@@ -233,14 +233,14 @@ public function mapConditionOperator($operator) {
}
}
/**
/**
* Retrive a the next id in a sequence.
* Retri
e
ve a the next id in a sequence.
*
*
* PostgreSQL has built in sequences. We'll use these instead of inserting
* PostgreSQL has built in sequences. We'll use these instead of inserting
* and updating a sequences table.
* and updating a sequences table.
*/
*/
public
function
nextId
(
$existing
=
0
)
{
public
function
nextId
(
$existing
=
0
)
{
// Retrive the name of the sequence. This information cannot be cached
// Retri
e
ve the name of the sequence. This information cannot be cached
// because the prefix may change, for example, like it does in simpletests.
// because the prefix may change, for example, like it does in simpletests.
$sequence_name
=
$this
->
makeSequenceName
(
'sequences'
,
'value'
);
$sequence_name
=
$this
->
makeSequenceName
(
'sequences'
,
'value'
);
...
@@ -252,7 +252,7 @@ public function nextId($existing = 0) {
...
@@ -252,7 +252,7 @@ public function nextId($existing = 0) {
}
}
// PostgreSQL advisory locks are simply locks to be used by an
// PostgreSQL advisory locks are simply locks to be used by an
// application such as Drupal. This will prevent other Drupal proc
c
esses
// application such as Drupal. This will prevent other Drupal processes
// from altering the sequence while we are.
// from altering the sequence while we are.
$this
->
query
(
"SELECT pg_advisory_lock("
.
self
::
POSTGRESQL_NEXTID_LOCK
.
")"
);
$this
->
query
(
"SELECT pg_advisory_lock("
.
self
::
POSTGRESQL_NEXTID_LOCK
.
")"
);
...
@@ -267,7 +267,7 @@ public function nextId($existing = 0) {
...
@@ -267,7 +267,7 @@ public function nextId($existing = 0) {
// Reset the sequence to a higher value than the existing id.
// Reset the sequence to a higher value than the existing id.
$this
->
query
(
"ALTER SEQUENCE "
.
$sequence_name
.
" RESTART WITH "
.
(
$existing
+
1
));
$this
->
query
(
"ALTER SEQUENCE "
.
$sequence_name
.
" RESTART WITH "
.
(
$existing
+
1
));
// Retrive the next id. We know this will be as high as we want it.
// Retri
e
ve the next id. We know this will be as high as we want it.
$id
=
$this
->
query
(
"SELECT nextval('"
.
$sequence_name
.
"')"
)
->
fetchField
();
$id
=
$this
->
query
(
"SELECT nextval('"
.
$sequence_name
.
"')"
)
->
fetchField
();
$this
->
query
(
"SELECT pg_advisory_unlock("
.
self
::
POSTGRESQL_NEXTID_LOCK
.
")"
);
$this
->
query
(
"SELECT pg_advisory_unlock("
.
self
::
POSTGRESQL_NEXTID_LOCK
.
")"
);
...
...
core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
View file @
9cf1459a
...
@@ -216,7 +216,7 @@ function initializeDatabase() {
...
@@ -216,7 +216,7 @@ function initializeDatabase() {
LANGUAGE \'sql\''
LANGUAGE \'sql\''
);
);
// Using || to concatenate in Drupal is not recommen
e
ded because there are
// Using || to concatenate in Drupal is not recommended because there are
// database drivers for Drupal that do not support the syntax, however
// database drivers for Drupal that do not support the syntax, however
// they do support CONCAT(item1, item2) which we can replicate in
// they do support CONCAT(item1, item2) which we can replicate in
// PostgreSQL. PostgreSQL requires the function to be defined for each
// PostgreSQL. PostgreSQL requires the function to be defined for each
...
...
core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
View file @
9cf1459a
...
@@ -54,7 +54,7 @@ public function orderRandom() {
...
@@ -54,7 +54,7 @@ public function orderRandom() {
public
function
orderBy
(
$field
,
$direction
=
'ASC'
)
{
public
function
orderBy
(
$field
,
$direction
=
'ASC'
)
{
// Call parent function to order on this.
// Call parent function to order on this.
$return
=
parent
::
orderBy
(
$field
,
$direction
);
$return
=
parent
::
orderBy
(
$field
,
$direction
);
if
(
$this
->
hasTag
(
'entity_query'
))
{
if
(
$this
->
hasTag
(
'entity_query'
))
{
return
$return
;
return
$return
;
}
}
...
@@ -88,7 +88,7 @@ public function orderBy($field, $direction = 'ASC') {
...
@@ -88,7 +88,7 @@ public function orderBy($field, $direction = 'ASC') {
}
}
// If a table loads all fields, it can not be added again. It would
// If a table loads all fields, it can not be added again. It would
// result in an ambig
i
ous alias error because that field would be loaded
// result in an ambig
u
ous alias error because that field would be loaded
// twice: Once through table_alias.* and once directly. If the field
// twice: Once through table_alias.* and once directly. If the field
// actually belongs to a different table, it must be added manually.
// actually belongs to a different table, it must be added manually.
foreach
(
$this
->
tables
as
$table
)
{
foreach
(
$this
->
tables
as
$table
)
{
...
@@ -98,7 +98,7 @@ public function orderBy($field, $direction = 'ASC') {
...
@@ -98,7 +98,7 @@ public function orderBy($field, $direction = 'ASC') {
}
}
// If $field contains an characters which are not allowed in a field name
// If $field contains an characters which are not allowed in a field name
// it is considered an expression, these can't be hand
el
d automatically
// it is considered an expression, these can't be hand
le
d automatically
// either.
// either.
if
(
$this
->
connection
->
escapeField
(
$field
)
!=
$field
)
{
if
(
$this
->
connection
->
escapeField
(
$field
)
!=
$field
)
{
return
$return
;
return
$return
;
...
...
core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
View file @
9cf1459a
...
@@ -48,7 +48,7 @@ public function fieldExists($table, $column) {
...
@@ -48,7 +48,7 @@ public function fieldExists($table, $column) {
*/
*/
public
function
createTableSql
(
$name
,
$table
)
{
public
function
createTableSql
(
$name
,
$table
)
{
$sql
=
array
();
$sql
=
array
();
$sql
[]
=
"CREATE TABLE {"
.
$name
.
"} (
\n
"
.
$this
->
createColumsSql
(
$name
,
$table
)
.
"
\n
);
\n
"
;
$sql
[]
=
"CREATE TABLE {"
.
$name
.
"} (
\n
"
.
$this
->
createColum
n
sSql
(
$name
,
$table
)
.
"
\n
);
\n
"
;
return
array_merge
(
$sql
,
$this
->
createIndexSql
(
$name
,
$table
));
return
array_merge
(
$sql
,
$this
->
createIndexSql
(
$name
,
$table
));
}
}
...
@@ -74,7 +74,7 @@ protected function createIndexSql($tablename, $schema) {
...
@@ -74,7 +74,7 @@ protected function createIndexSql($tablename, $schema) {
/**
/**
* Build the SQL expression for creating columns.
* Build the SQL expression for creating columns.
*/
*/
protected
function
createColumsSql
(
$tablename
,
$schema
)
{
protected
function
createColum
n
sSql
(
$tablename
,
$schema
)
{
$sql_array
=
array
();
$sql_array
=
array
();
// Add the SQL statement for each field.
// Add the SQL statement for each field.
...
@@ -249,8 +249,8 @@ public function renameTable($table, $new_name) {
...
@@ -249,8 +249,8 @@ public function renameTable($table, $new_name) {
// SQLite doesn't allow you to rename tables outside of the current
// SQLite doesn't allow you to rename tables outside of the current
// database. So the syntax '...RENAME TO database.table' would fail.
// database. So the syntax '...RENAME TO database.table' would fail.
// So we must determine the full table name here rather than surrounding
// So we must determine the full table name here rather than surrounding
// the table with curly braces incase the db_prefix contains a reference
// the table with curly braces in
case the db_prefix contains a reference
// to a database outside of our exist
s
ing database.
// to a database outside of our existing database.
$info
=
$this
->
getPrefixInfo
(
$new_name
);
$info
=
$this
->
getPrefixInfo
(
$new_name
);
$this
->
connection
->
query
(
'ALTER TABLE {'
.
$table
.
'} RENAME TO '
.
$info
[
'table'
]);
$this
->
connection
->
query
(
'ALTER TABLE {'
.
$table
.
'} RENAME TO '
.
$info
[
'table'
]);
...
...
core/lib/Drupal/Core/Database/InvalidQueryException.php
View file @
9cf1459a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
namespace
Drupal\Core\Database
;
namespace
Drupal\Core\Database
;
/**
/**
* Exception thrown if a query would be invalid
t
.
* Exception thrown if a query would be invalid.
*
*
* This exception is thrown e.g. when trying to have an IN condition with an
* This exception is thrown e.g. when trying to have an IN condition with an
* empty array.
* empty array.
...
...
core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php
View file @
9cf1459a
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
/**
/**
* @file
* @file
* Definition of Drupal\Core\Database\Query\FieldsOverlapExcept
oi
n
* Definition of Drupal\Core\Database\Query\FieldsOverlapExcept
io
n
*/
*/
namespace
Drupal\Core\Database\Query
;
namespace
Drupal\Core\Database\Query
;
...
...
core/lib/Drupal/Core/Database/Query/Merge.php
View file @
9cf1459a
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
* MergeQuery::updateFields() and MergeQuery::insertFields() needs to be called
* MergeQuery::updateFields() and MergeQuery::insertFields() needs to be called
* instead. MergeQuery::fields() can also be called which calls both of these
* instead. MergeQuery::fields() can also be called which calls both of these
* methods as the common case is to use the same column-value pairs for both
* methods as the common case is to use the same column-value pairs for both
* INSERT and UPDATE. However, this is not mandatory. Another conv
i
nient
* INSERT and UPDATE. However, this is not mandatory. Another conv
e
nient
* wrapper is MergeQuery::key() which adds the same column-value pairs to the
* wrapper is MergeQuery::key() which adds the same column-value pairs to the
* condition and the INSERT query part.
* condition and the INSERT query part.
*
*
...
...
core/lib/Drupal/Core/Database/Schema.php
View file @
9cf1459a
...
@@ -218,7 +218,7 @@ public function nextPlaceholder() {
...
@@ -218,7 +218,7 @@ public function nextPlaceholder() {
* Get information about the table name and schema from the prefix.
* Get information about the table name and schema from the prefix.
*
*
* @param
* @param
* Name of table to look prefix up for. Defaults to 'default' because thats
* Name of table to look prefix up for. Defaults to 'default' because that
'
s
* default key for prefix.
* default key for prefix.
* @param $add_prefix
* @param $add_prefix
* Boolean that indicates whether the given table name should be prefixed.
* Boolean that indicates whether the given table name should be prefixed.
...
@@ -291,7 +291,7 @@ function prefixNonTable($table) {
...
@@ -291,7 +291,7 @@ function prefixNonTable($table) {
protected
function
buildTableNameCondition
(
$table_name
,
$operator
=
'='
,
$add_prefix
=
TRUE
)
{
protected
function
buildTableNameCondition
(
$table_name
,
$operator
=
'='
,
$add_prefix
=
TRUE
)
{
$info
=
$this
->
connection
->
getConnectionOptions
();
$info
=
$this
->
connection
->
getConnectionOptions
();
// Retrive the table name and schema
// Retri
e
ve the table name and schema
$table_info
=
$this
->
getPrefixInfo
(
$table_name
,
$add_prefix
);
$table_info
=
$this
->
getPrefixInfo
(
$table_name
,
$add_prefix
);
$condition
=
new
Condition
(
'AND'
);
$condition
=