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
09d4037a
Commit
09d4037a
authored
Jan 27, 2014
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2171655
by dawehner: Drupal should not typehint the EventDispatcher directly.
parent
8bc36db1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
core/lib/Drupal/Core/Config/Config.php
core/lib/Drupal/Core/Config/Config.php
+4
-4
core/lib/Drupal/Core/Config/ConfigFactory.php
core/lib/Drupal/Core/Config/ConfigFactory.php
+4
-3
core/lib/Drupal/Core/Config/ConfigImporter.php
core/lib/Drupal/Core/Config/ConfigImporter.php
+1
-1
No files found.
core/lib/Drupal/Core/Config/Config.php
View file @
09d4037a
...
...
@@ -15,7 +15,7 @@
use
Drupal\Core\TypedData\Type\FloatInterface
;
use
Drupal\Core\TypedData\Type\IntegerInterface
;
use
Drupal\Core\Language\Language
;
use
Symfony\Component\EventDispatcher\EventDispatcher
;
use
Symfony\Component\EventDispatcher\EventDispatcher
Interface
;
/**
* Defines the default configuration object.
...
...
@@ -37,7 +37,7 @@ class Config {
/**
* An event dispatcher instance to use for configuration events.
*
* @var \Symfony\Component\EventDispatcher\EventDispatcher
* @var \Symfony\Component\EventDispatcher\EventDispatcher
Interface
*/
protected
$eventDispatcher
;
...
...
@@ -136,14 +136,14 @@ class Config {
* @param \Drupal\Core\Config\StorageInterface $storage
* A storage controller object to use for reading and writing the
* configuration data.
* @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
* @param \Symfony\Component\EventDispatcher\EventDispatcher
Interface
$event_dispatcher
* An event dispatcher instance to use for configuration events.
* @param \Drupal\Core\Config\TypedConfigManager $typed_config
* The typed configuration manager service.
* @param \Drupal\Core\Language\Language $language
* The language object used to override configuration data.
*/
public
function
__construct
(
$name
,
StorageInterface
$storage
,
EventDispatcher
$event_dispatcher
,
TypedConfigManager
$typed_config
,
Language
$language
=
NULL
)
{
public
function
__construct
(
$name
,
StorageInterface
$storage
,
EventDispatcher
Interface
$event_dispatcher
,
TypedConfigManager
$typed_config
,
Language
$language
=
NULL
)
{
$this
->
name
=
$name
;
$this
->
storage
=
$storage
;
$this
->
eventDispatcher
=
$event_dispatcher
;
...
...
core/lib/Drupal/Core/Config/ConfigFactory.php
View file @
09d4037a
...
...
@@ -10,6 +10,7 @@
use
Drupal\Core\Language\Language
;
use
Drupal\Core\Language\LanguageDefault
;
use
Symfony\Component\EventDispatcher\EventDispatcher
;
use
Symfony\Component\EventDispatcher\EventDispatcherInterface
;
use
Symfony\Component\EventDispatcher\EventSubscriberInterface
;
/**
...
...
@@ -42,7 +43,7 @@ class ConfigFactory implements EventSubscriberInterface {
/**
* An event dispatcher instance to use for configuration events.
*
* @var \Symfony\Component\EventDispatcher\EventDispatcher
* @var \Symfony\Component\EventDispatcher\EventDispatcher
Interface
*/
protected
$eventDispatcher
;
...
...
@@ -79,12 +80,12 @@ class ConfigFactory implements EventSubscriberInterface {
*
* @param \Drupal\Core\Config\StorageInterface $storage
* The configuration storage engine.
* @param \Symfony\Component\EventDispatcher\EventDispatcher $event_dispatcher
* @param \Symfony\Component\EventDispatcher\EventDispatcher
Interface
$event_dispatcher
* An event dispatcher instance to use for configuration events.
* @param \Drupal\Core\Config\TypedConfigManager $typed_config
* The typed configuration manager.
*/
public
function
__construct
(
StorageInterface
$storage
,
EventDispatcher
$event_dispatcher
,
TypedConfigManager
$typed_config
)
{
public
function
__construct
(
StorageInterface
$storage
,
EventDispatcher
Interface
$event_dispatcher
,
TypedConfigManager
$typed_config
)
{
$this
->
storage
=
$storage
;
$this
->
eventDispatcher
=
$event_dispatcher
;
$this
->
typedConfigManager
=
$typed_config
;
...
...
core/lib/Drupal/Core/Config/ConfigImporter.php
View file @
09d4037a
...
...
@@ -49,7 +49,7 @@ class ConfigImporter {
/**
* The event dispatcher used to notify subscribers.
*
* @var \Symfony\Component\EventDispatcher\EventDispatcher
* @var \Symfony\Component\EventDispatcher\EventDispatcher
Interface
*/
protected
$eventDispatcher
;
...
...
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