diff --git a/core/core.services.yml b/core/core.services.yml index 5e2c9e3781..4bd0472b17 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -673,7 +673,7 @@ services: class: Drupal\Core\Routing\CurrentRouteMatch arguments: ['@request_stack'] event_dispatcher: - class: Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher + class: Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher arguments: ['@service_container'] app.root: class: SplString diff --git a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php deleted file mode 100644 index 1fd808c17f..0000000000 --- a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php +++ /dev/null @@ -1,290 +0,0 @@ - - *
Faster instantiation of the event dispatcher service
- *
- * Instead of calling addSubscriberService once for each - * subscriber, a precompiled array of listener definitions is passed - * directly to the constructor. This is faster by roughly an order of - * magnitude. The listeners are collected and prepared using a compiler - * pass. - *
- *
Lazy instantiation of listeners
- *
- * Services are only retrieved from the container just before invocation. - * Especially when dispatching the KernelEvents::REQUEST event, this leads - * to a more timely invocation of the first listener. Overall dispatch - * runtime is not affected by this change though. - *
- * - */ -class ContainerAwareEventDispatcher implements EventDispatcherInterface { - - /** - * The service container. - * - * @var \Symfony\Component\DependencyInjection\ContainerInterface; - */ - protected $container; - - /** - * Listener definitions. - * - * A nested array of listener definitions keyed by event name and priority. - * A listener definition is an associative array with one of the following key - * value pairs: - * - callable: A callable listener - * - service: An array of the form [service id, method] - * - * A service entry will be resolved to a callable only just before its - * invocation. - * - * @var array - */ - protected $listeners; - - /** - * Whether listeners need to be sorted prior to dispatch, keyed by event name. - * - * @var TRUE[] - */ - protected $unsorted; - - /** - * Constructs a container aware event dispatcher. - * - * @param \Symfony\Component\DependencyInjection\ContainerInterface $container - * The service container. - * @param array $listeners - * A nested array of listener definitions keyed by event name and priority. - * The array is expected to be ordered by priority. A listener definition is - * an associative array with one of the following key value pairs: - * - callable: A callable listener - * - service: An array of the form [service id, method] - * A service entry will be resolved to a callable only just before its - * invocation. - */ - public function __construct(ContainerInterface $container, array $listeners = []) { - $this->container = $container; - $this->listeners = $listeners; - $this->unsorted = []; - } - - /** - * {@inheritdoc} - */ - public function dispatch($event_name, Event $event = NULL) { - if ($event === NULL) { - $event = new Event(); - } - - if (isset($this->listeners[$event_name])) { - // Sort listeners if necessary. - if (isset($this->unsorted[$event_name])) { - krsort($this->listeners[$event_name]); - unset($this->unsorted[$event_name]); - } - - // Invoke listeners and resolve callables if necessary. - foreach ($this->listeners[$event_name] as $priority => &$definitions) { - foreach ($definitions as $key => &$definition) { - if (!isset($definition['callable'])) { - $definition['callable'] = [$this->container->get($definition['service'][0]), $definition['service'][1]]; - } - if (is_array($definition['callable']) && isset($definition['callable'][0]) && $definition['callable'][0] instanceof \Closure) { - $definition['callable'][0] = $definition['callable'][0](); - } - - call_user_func($definition['callable'], $event, $event_name, $this); - if ($event->isPropagationStopped()) { - return $event; - } - } - } - } - - return $event; - } - - /** - * {@inheritdoc} - */ - public function getListeners($event_name = NULL) { - $result = []; - - if ($event_name === NULL) { - // If event name was omitted, collect all listeners of all events. - foreach (array_keys($this->listeners) as $event_name) { - $listeners = $this->getListeners($event_name); - if (!empty($listeners)) { - $result[$event_name] = $listeners; - } - } - } - elseif (isset($this->listeners[$event_name])) { - // Sort listeners if necessary. - if (isset($this->unsorted[$event_name])) { - krsort($this->listeners[$event_name]); - unset($this->unsorted[$event_name]); - } - - // Collect listeners and resolve callables if necessary. - foreach ($this->listeners[$event_name] as $priority => &$definitions) { - foreach ($definitions as $key => &$definition) { - if (!isset($definition['callable'])) { - $definition['callable'] = [$this->container->get($definition['service'][0]), $definition['service'][1]]; - } - if (is_array($definition['callable']) && isset($definition['callable'][0]) && $definition['callable'][0] instanceof \Closure) { - $definition['callable'][0] = $definition['callable'][0](); - } - - $result[] = $definition['callable']; - } - } - } - - return $result; - } - - /** - * {@inheritdoc} - */ - public function getListenerPriority($event_name, $listener) { - if (!isset($this->listeners[$event_name])) { - return; - } - if (is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) { - $listener[0] = $listener[0](); - } - // Resolve service definitions if the listener has not been found so far. - foreach ($this->listeners[$event_name] as $priority => &$definitions) { - foreach ($definitions as $key => &$definition) { - if (!isset($definition['callable'])) { - // Once the callable is retrieved we keep it for subsequent method - // invocations on this class. - $definition['callable'] = [ - $this->container->get($definition['service'][0]), - $definition['service'][1], - ]; - } - if (is_array($definition['callable']) && isset($definition['callable'][0]) && $definition['callable'][0] instanceof \Closure) { - $definition['callable'][0] = $definition['callable'][0](); - } - if ($definition['callable'] === $listener) { - return $priority; - } - } - } - } - - /** - * {@inheritdoc} - */ - public function hasListeners($event_name = NULL) { - if ($event_name !== NULL) { - return !empty($this->listeners[$event_name]); - } - - foreach ($this->listeners as $event_listeners) { - if ($event_listeners) { - return TRUE; - } - } - - return FALSE; - } - - /** - * {@inheritdoc} - */ - public function addListener($event_name, $listener, $priority = 0) { - $this->listeners[$event_name][$priority][] = ['callable' => $listener]; - $this->unsorted[$event_name] = TRUE; - } - - /** - * {@inheritdoc} - */ - public function removeListener($event_name, $listener) { - if (!isset($this->listeners[$event_name])) { - return; - } - - foreach ($this->listeners[$event_name] as $priority => $definitions) { - foreach ($definitions as $key => $definition) { - if (!isset($definition['callable'])) { - if (!$this->container->initialized($definition['service'][0])) { - continue; - } - $definition['callable'] = [$this->container->get($definition['service'][0]), $definition['service'][1]]; - } - - if (is_array($definition['callable']) && isset($definition['callable'][0]) && $definition['callable'][0] instanceof \Closure && !$listener instanceof \Closure) { - $definition['callable'][0] = $definition['callable'][0](); - } - - if (is_array($definition['callable']) && isset($definition['callable'][0]) && !$definition['callable'][0] instanceof \Closure && is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) { - $listener[0] = $listener[0](); - } - if ($definition['callable'] === $listener) { - unset($definitions[$key]); - } - } - if ($definitions) { - $this->listeners[$event_name][$priority] = $definitions; - } - else { - unset($this->listeners[$event_name][$priority]); - } - } - } - - /** - * {@inheritdoc} - */ - public function addSubscriber(EventSubscriberInterface $subscriber) { - foreach ($subscriber->getSubscribedEvents() as $event_name => $params) { - if (is_string($params)) { - $this->addListener($event_name, [$subscriber, $params]); - } - elseif (is_string($params[0])) { - $this->addListener($event_name, [$subscriber, $params[0]], isset($params[1]) ? $params[1] : 0); - } - else { - foreach ($params as $listener) { - $this->addListener($event_name, [$subscriber, $listener[0]], isset($listener[1]) ? $listener[1] : 0); - } - } - } - } - - /** - * {@inheritdoc} - */ - public function removeSubscriber(EventSubscriberInterface $subscriber) { - foreach ($subscriber->getSubscribedEvents() as $event_name => $params) { - if (is_array($params) && is_array($params[0])) { - foreach ($params as $listener) { - $this->removeListener($event_name, [$subscriber, $listener[0]]); - } - } - else { - $this->removeListener($event_name, [$subscriber, is_string($params) ? $params : $params[0]]); - } - } - } - -} diff --git a/core/lib/Drupal/Component/EventDispatcher/LICENSE.txt b/core/lib/Drupal/Component/EventDispatcher/LICENSE.txt deleted file mode 100644 index 94fb84639c..0000000000 --- a/core/lib/Drupal/Component/EventDispatcher/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/core/lib/Drupal/Component/EventDispatcher/README.txt b/core/lib/Drupal/Component/EventDispatcher/README.txt deleted file mode 100644 index 27a049bffd..0000000000 --- a/core/lib/Drupal/Component/EventDispatcher/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -The Drupal EventDispatcher Component - -Thanks for using this Drupal component. - -You can participate in its development on Drupal.org, through our issue system: -https://www.drupal.org/project/issues/drupal - -You can get the full Drupal repo here: -https://www.drupal.org/project/drupal/git-instructions - -You can browse the full Drupal repo here: -http://cgit.drupalcode.org/drupal diff --git a/core/lib/Drupal/Component/EventDispatcher/TESTING.txt b/core/lib/Drupal/Component/EventDispatcher/TESTING.txt deleted file mode 100644 index 6ea7b34627..0000000000 --- a/core/lib/Drupal/Component/EventDispatcher/TESTING.txt +++ /dev/null @@ -1,18 +0,0 @@ -HOW-TO: Test this Drupal component - -In order to test this component, you'll need to get the entire Drupal repo and -run the tests there. - -You'll find the tests under core/tests/Drupal/Tests/Component. - -You can get the full Drupal repo here: -https://www.drupal.org/project/drupal/git-instructions - -You can find more information about running PHPUnit tests with Drupal here: -https://www.drupal.org/node/2116263 - -Each component in the Drupal\Component namespace has its own annotated test -group. You can use this group to run only the tests for this component. Like -this: - -$ ./vendor/bin/phpunit -c core --group EventDispatcher diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json deleted file mode 100644 index a4db6fafa4..0000000000 --- a/core/lib/Drupal/Component/EventDispatcher/composer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "drupal/core-event-dispatcher", - "description": "EventDispatcher.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0+", - "require": { - "php": ">=5.5.9", - "symfony/dependency-injection": "^2.8", - "symfony/event-dispatcher": "^2.7" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\EventDispatcher\\": "" - } - } -} diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php index 5f3a4a92ab..794bf29f61 100644 --- a/core/lib/Drupal/Core/Composer/Composer.php +++ b/core/lib/Drupal/Core/Composer/Composer.php @@ -53,8 +53,7 @@ class Composer { 'symfony/debug' => ['Tests'], 'symfony/dependency-injection' => ['Tests'], 'symfony/dom-crawler' => ['Tests'], - // @see \Drupal\Tests\Component\EventDispatcher\ContainerAwareEventDispatcherTest - // 'symfony/event-dispatcher' => ['Tests'], + 'symfony/event-dispatcher' => ['Tests'], 'symfony/http-foundation' => ['Tests'], 'symfony/http-kernel' => ['Tests'], 'symfony/process' => ['Tests'], diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php index e07046ae0a..b8f329e899 100644 --- a/core/lib/Drupal/Core/CoreServiceProvider.php +++ b/core/lib/Drupal/Core/CoreServiceProvider.php @@ -20,13 +20,13 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass; use Drupal\Core\DependencyInjection\Compiler\TaggedHandlersPass; -use Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass; use Drupal\Core\DependencyInjection\Compiler\RegisterAccessChecksPass; use Drupal\Core\DependencyInjection\Compiler\RegisterServicesForDestructionPass; use Drupal\Core\Plugin\PluginManagerPass; use Drupal\Core\Render\MainContent\MainContentRenderersPass; use Drupal\Core\Site\Settings; use Symfony\Component\DependencyInjection\Compiler\PassConfig; +use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; /** * ServiceProvider class for mandatory core services. @@ -79,7 +79,7 @@ public function register(ContainerBuilder $container) { $container->addCompilerPass(new TwigExtensionPass()); // Add a compiler pass for registering event subscribers. - $container->addCompilerPass(new RegisterEventSubscribersPass(), PassConfig::TYPE_AFTER_REMOVING); + $container->addCompilerPass(new RegisterListenersPass('event_dispatcher', 'event_listener', 'event_subscriber'), PassConfig::TYPE_AFTER_REMOVING); $container->addCompilerPass(new RegisterAccessChecksPass()); diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php deleted file mode 100644 index aa943c7246..0000000000 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php +++ /dev/null @@ -1,62 +0,0 @@ -hasDefinition('event_dispatcher')) { - return; - } - - $definition = $container->getDefinition('event_dispatcher'); - - $event_subscriber_info = []; - foreach ($container->findTaggedServiceIds('event_subscriber') as $id => $attributes) { - - // We must assume that the class value has been correctly filled, even if - // the service is created by a factory. - $class = $container->getDefinition($id)->getClass(); - - $refClass = new \ReflectionClass($class); - $interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface'; - if (!$refClass->implementsInterface($interface)) { - throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface)); - } - - // Get all subscribed events. - foreach ($class::getSubscribedEvents() as $event_name => $params) { - if (is_string($params)) { - $priority = 0; - $event_subscriber_info[$event_name][$priority][] = ['service' => [$id, $params]]; - } - elseif (is_string($params[0])) { - $priority = isset($params[1]) ? $params[1] : 0; - $event_subscriber_info[$event_name][$priority][] = ['service' => [$id, $params[0]]]; - } - else { - foreach ($params as $listener) { - $priority = isset($listener[1]) ? $listener[1] : 0; - $event_subscriber_info[$event_name][$priority][] = ['service' => [$id, $listener[0]]]; - } - } - } - } - - foreach (array_keys($event_subscriber_info) as $event_name) { - krsort($event_subscriber_info[$event_name]); - } - - $definition->addArgument($event_subscriber_info); - } - -} diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php deleted file mode 100644 index baafcd594b..0000000000 --- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php +++ /dev/null @@ -1,251 +0,0 @@ -getMockBuilder(ContainerInterface::class)->getMock(); - $container->expects($this->never())->method($this->anything()); - - $firstListener = new CallableClass(); - $secondListener = function () {}; - $thirdListener = array(new TestEventListener(), 'preFoo'); - $listeners = array( - 'test_event' => array( - 0 => array( - array('callable' => $firstListener), - array('callable' => $secondListener), - array('callable' => $thirdListener), - ), - ), - ); - - $dispatcher = new ContainerAwareEventDispatcher($container, $listeners); - $actualListeners = $dispatcher->getListeners(); - - $expectedListeners = array( - 'test_event' => array( - $firstListener, - $secondListener, - $thirdListener, - ), - ); - - $this->assertSame($expectedListeners, $actualListeners); - } - - public function testDispatchWithCallables() - { - // When passing in callables exclusively as listeners into the event - // dispatcher constructor, the event dispatcher must not attempt to - // resolve any services. - $container = $this->getMockBuilder(ContainerInterface::class)->getMock(); - $container->expects($this->never())->method($this->anything()); - - $firstListener = new CallableClass(); - $secondListener = function () {}; - $thirdListener = array(new TestEventListener(), 'preFoo'); - $listeners = array( - 'test_event' => array( - 0 => array( - array('callable' => $firstListener), - array('callable' => $secondListener), - array('callable' => $thirdListener), - ), - ), - ); - - $dispatcher = new ContainerAwareEventDispatcher($container, $listeners); - $dispatcher->dispatch('test_event'); - - $this->assertTrue($thirdListener[0]->preFooInvoked); - } - - public function testGetListenersWithServices() - { - $container = new ContainerBuilder(); - $container->register('listener_service', 'Symfony\Component\EventDispatcher\Tests\TestEventListener'); - - $listeners = array( - 'test_event' => array( - 0 => array( - array('service' => array('listener_service', 'preFoo')), - ), - ), - ); - - $dispatcher = new ContainerAwareEventDispatcher($container, $listeners); - $actualListeners = $dispatcher->getListeners(); - - $listenerService = $container->get('listener_service'); - $expectedListeners = array( - 'test_event' => array( - array($listenerService, 'preFoo'), - ), - ); - - $this->assertSame($expectedListeners, $actualListeners); - } - - public function testDispatchWithServices() - { - $container = new ContainerBuilder(); - $container->register('listener_service', 'Symfony\Component\EventDispatcher\Tests\TestEventListener'); - - $listeners = array( - 'test_event' => array( - 0 => array( - array('service' => array('listener_service', 'preFoo')), - ), - ), - ); - - $dispatcher = new ContainerAwareEventDispatcher($container, $listeners); - - $dispatcher->dispatch('test_event'); - - $listenerService = $container->get('listener_service'); - $this->assertTrue($listenerService->preFooInvoked); - } - - public function testRemoveService() - { - $container = new ContainerBuilder(); - $container->register('listener_service', 'Symfony\Component\EventDispatcher\Tests\TestEventListener'); - $container->register('other_listener_service', 'Symfony\Component\EventDispatcher\Tests\TestEventListener'); - - $listeners = array( - 'test_event' => array( - 0 => array( - array('service' => array('listener_service', 'preFoo')), - array('service' => array('other_listener_service', 'preFoo')), - ), - ), - ); - - $dispatcher = new ContainerAwareEventDispatcher($container, $listeners); - - $listenerService = $container->get('listener_service'); - $dispatcher->removeListener('test_event', array($listenerService, 'preFoo')); - - // Ensure that other service was not initialized during removal of the - // listener service. - $this->assertFalse($container->initialized('other_listener_service')); - - $dispatcher->dispatch('test_event'); - - $this->assertFalse($listenerService->preFooInvoked); - $otherService = $container->get('other_listener_service'); - $this->assertTrue($otherService->preFooInvoked); - } - - public function testGetListenerPriorityWithServices() - { - $container = new ContainerBuilder(); - $container->register('listener_service', TestEventListener::class); - - $listeners = array( - 'test_event' => array( - 5 => array( - array('service' => array('listener_service', 'preFoo')), - ), - ), - ); - - $dispatcher = new ContainerAwareEventDispatcher($container, $listeners); - $listenerService = $container->get('listener_service'); - $actualPriority = $dispatcher->getListenerPriority('test_event', [$listenerService, 'preFoo']); - - $this->assertSame(5, $actualPriority); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testAddAListenerService() { - parent::testAddAListenerService(); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testPreventDuplicateListenerService() { - parent::testPreventDuplicateListenerService(); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testAddASubscriberService() { - parent::testAddASubscriberService(); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testHasListenersOnLazyLoad() { - parent::testHasListenersOnLazyLoad(); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testGetListenersOnLazyLoad() { - parent::testGetListenersOnLazyLoad(); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testRemoveAfterDispatch() { - parent::testRemoveAfterDispatch(); - } - - /** - * @expectedDeprecation The Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead. - * @group legacy - */ - public function testRemoveBeforeDispatch() { - parent::testRemoveBeforeDispatch(); - } - } diff --git a/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/core/tests/Drupal/Tests/ComposerIntegrationTest.php index b56849d863..9669872a37 100644 --- a/core/tests/Drupal/Tests/ComposerIntegrationTest.php +++ b/core/tests/Drupal/Tests/ComposerIntegrationTest.php @@ -52,7 +52,6 @@ protected function getPaths() { $this->root . '/core/lib/Drupal/Component/DependencyInjection', $this->root . '/core/lib/Drupal/Component/Diff', $this->root . '/core/lib/Drupal/Component/Discovery', - $this->root . '/core/lib/Drupal/Component/EventDispatcher', $this->root . '/core/lib/Drupal/Component/FileCache', $this->root . '/core/lib/Drupal/Component/FileSystem', $this->root . '/core/lib/Drupal/Component/Gettext',