Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
027c0d82
Commit
027c0d82
authored
Jan 05, 2016
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2643570
by gnuget: Correct $lockBackend local variable use
parent
ec963691
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
14 deletions
+14
-14
core/lib/Drupal.php
core/lib/Drupal.php
+2
-2
core/modules/user/src/PrivateTempStore.php
core/modules/user/src/PrivateTempStore.php
+3
-3
core/modules/user/src/PrivateTempStoreFactory.php
core/modules/user/src/PrivateTempStoreFactory.php
+3
-3
core/modules/user/src/SharedTempStore.php
core/modules/user/src/SharedTempStore.php
+3
-3
core/modules/user/src/SharedTempStoreFactory.php
core/modules/user/src/SharedTempStoreFactory.php
+3
-3
No files found.
core/lib/Drupal.php
View file @
027c0d82
...
...
@@ -63,8 +63,8 @@
* class StuffDoingClass implements StuffDoingInterface {
* protected $lockBackend;
*
* public function __construct(LockBackendInterface $lock
B
ackend) {
* $this->lockBackend = $lock
B
ackend;
* public function __construct(LockBackendInterface $lock
_b
ackend) {
* $this->lockBackend = $lock
_b
ackend;
* }
*
* public function doStuff() {
...
...
core/modules/user/src/PrivateTempStore.php
View file @
027c0d82
...
...
@@ -77,16 +77,16 @@ class PrivateTempStore {
* The key/value storage object used for this data. Each storage object
* represents a particular collection of data and will contain any number
* of key/value pairs.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
B
ackend
* @param \Drupal\Core\Lock\LockBackendInterface $lock
_b
ackend
* The lock object used for this data.
* @param mixed $owner
* The owner key to store along with the data (e.g. a user or session ID).
* @param int $expire
* The time to live for items, in seconds.
*/
public
function
__construct
(
KeyValueStoreExpirableInterface
$storage
,
LockBackendInterface
$lock
B
ackend
,
AccountProxyInterface
$current_user
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
public
function
__construct
(
KeyValueStoreExpirableInterface
$storage
,
LockBackendInterface
$lock
_b
ackend
,
AccountProxyInterface
$current_user
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
$this
->
storage
=
$storage
;
$this
->
lockBackend
=
$lock
B
ackend
;
$this
->
lockBackend
=
$lock
_b
ackend
;
$this
->
currentUser
=
$current_user
;
$this
->
requestStack
=
$request_stack
;
$this
->
expire
=
$expire
;
...
...
core/modules/user/src/PrivateTempStoreFactory.php
View file @
027c0d82
...
...
@@ -57,7 +57,7 @@ class PrivateTempStoreFactory {
*
* @param \Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface $storage_factory
* The key/value store factory.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
B
ackend
* @param \Drupal\Core\Lock\LockBackendInterface $lock
_b
ackend
* The lock object used for this data.
* @param \Drupal\Core\Session\AccountProxyInterface $current_user
* The current account.
...
...
@@ -66,9 +66,9 @@ class PrivateTempStoreFactory {
* @param int $expire
* The time to live for items, in seconds.
*/
function
__construct
(
KeyValueExpirableFactoryInterface
$storage_factory
,
LockBackendInterface
$lock
B
ackend
,
AccountProxyInterface
$current_user
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
function
__construct
(
KeyValueExpirableFactoryInterface
$storage_factory
,
LockBackendInterface
$lock
_b
ackend
,
AccountProxyInterface
$current_user
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
$this
->
storageFactory
=
$storage_factory
;
$this
->
lockBackend
=
$lock
B
ackend
;
$this
->
lockBackend
=
$lock
_b
ackend
;
$this
->
currentUser
=
$current_user
;
$this
->
requestStack
=
$request_stack
;
$this
->
expire
=
$expire
;
...
...
core/modules/user/src/SharedTempStore.php
View file @
027c0d82
...
...
@@ -86,7 +86,7 @@ class SharedTempStore {
* The key/value storage object used for this data. Each storage object
* represents a particular collection of data and will contain any number
* of key/value pairs.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
B
ackend
* @param \Drupal\Core\Lock\LockBackendInterface $lock
_b
ackend
* The lock object used for this data.
* @param mixed $owner
* The owner key to store along with the data (e.g. a user or session ID).
...
...
@@ -95,9 +95,9 @@ class SharedTempStore {
* @param int $expire
* The time to live for items, in seconds.
*/
public
function
__construct
(
KeyValueStoreExpirableInterface
$storage
,
LockBackendInterface
$lock
B
ackend
,
$owner
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
public
function
__construct
(
KeyValueStoreExpirableInterface
$storage
,
LockBackendInterface
$lock
_b
ackend
,
$owner
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
$this
->
storage
=
$storage
;
$this
->
lockBackend
=
$lock
B
ackend
;
$this
->
lockBackend
=
$lock
_b
ackend
;
$this
->
owner
=
$owner
;
$this
->
requestStack
=
$request_stack
;
$this
->
expire
=
$expire
;
...
...
core/modules/user/src/SharedTempStoreFactory.php
View file @
027c0d82
...
...
@@ -49,16 +49,16 @@ class SharedTempStoreFactory {
*
* @param \Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface $storage_factory
* The key/value store factory.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
B
ackend
* @param \Drupal\Core\Lock\LockBackendInterface $lock
_b
ackend
* The lock object used for this data.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* The request stack.
* @param int $expire
* The time to live for items, in seconds.
*/
function
__construct
(
KeyValueExpirableFactoryInterface
$storage_factory
,
LockBackendInterface
$lock
B
ackend
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
function
__construct
(
KeyValueExpirableFactoryInterface
$storage_factory
,
LockBackendInterface
$lock
_b
ackend
,
RequestStack
$request_stack
,
$expire
=
604800
)
{
$this
->
storageFactory
=
$storage_factory
;
$this
->
lockBackend
=
$lock
B
ackend
;
$this
->
lockBackend
=
$lock
_b
ackend
;
$this
->
requestStack
=
$request_stack
;
$this
->
expire
=
$expire
;
}
...
...
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