Skip to content
Snippets Groups Projects
Verified Commit aa25d8ff authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3439824 by quietone: Remove deprecated code from assertion,... 

Issue #3439824 by quietone: Remove deprecated code from assertion, eventdispatcher and plugin components
parent 5637aff4
Branches
Tags
27 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #149356 passed
Stage: 🏗️ Build
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#149363

    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing
    with 0 additions and 1051 deletions
    core/lib/Drupal/Component/Assertion/Handle.php deleted 100644 → 0
    + 0
    − 32
    View file @ 5637aff4
    <?php
    namespace Drupal\Component\Assertion;
    trigger_error(__NAMESPACE__ . '\Handle is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Instead, use assert_options(ASSERT_EXCEPTION, TRUE). See https://www.drupal.org/node/3105918', E_USER_DEPRECATED);
    /**
    * Handler for runtime assertion failures.
    *
    * @ingroup php_assert
    *
    * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use
    * assert_options(ASSERT_EXCEPTION, TRUE).
    *
    * @see https://www.drupal.org/node/3105918
    */
    class Handle {
    /**
    * Ensures exceptions are thrown when an assertion fails.
    */
    public static function register() {
    // Since we're using exceptions, turn error warnings off.
    // phpcs:ignore Generic.PHP.DeprecatedFunctions.Deprecated
    assert_options(ASSERT_WARNING, FALSE);
    // Turn exception throwing on.
    // phpcs:ignore Generic.PHP.DeprecatedFunctions.Deprecated
    assert_options(ASSERT_EXCEPTION, TRUE);
    }
    }
    core/lib/Drupal/Component/Assertion/Inspector.php
    + 0
    − 19
    View file @ aa25d8ff
    ......@@ -18,25 +18,6 @@
    */
    class Inspector {
    /**
    * Asserts argument can be traversed with foreach.
    *
    * @param mixed $traversable
    * Variable to be examined.
    *
    * @return bool
    * TRUE if $traversable can be traversed with foreach.
    *
    * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use
    * is_iterable() instead.
    *
    * @see https://www.drupal.org/node/3422775
    */
    public static function assertTraversable($traversable) {
    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use is_iterable() instead. See https://www.drupal.org/node/3422775', E_USER_DEPRECATED);
    return is_iterable($traversable);
    }
    /**
    * Asserts callback returns TRUE for each member of a traversable.
    *
    ......
    core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php deleted 100644 → 0
    + 0
    − 298
    View file @ 5637aff4
    <?php
    namespace Drupal\Component\EventDispatcher;
    @trigger_error('The ' . __NAMESPACE__ . '\ContainerAwareEventDispatcher is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use Symfony\Component\EventDispatcher\EventDispatcher instead. See https://www.drupal.org/node/3376090', E_USER_DEPRECATED);
    use Psr\EventDispatcher\StoppableEventInterface;
    use Symfony\Component\DependencyInjection\ContainerInterface;
    use Symfony\Component\EventDispatcher\EventDispatcherInterface;
    use Symfony\Component\EventDispatcher\EventSubscriberInterface;
    /**
    * A performance optimized container aware event dispatcher.
    *
    * This version of the event dispatcher contains the following optimizations
    * in comparison to the Symfony event dispatcher component:
    *
    * <dl>
    * <dt>Faster instantiation of the event dispatcher service</dt>
    * <dd>
    * Instead of calling <code>addSubscriberService</code> once for each
    * subscriber, a pre-compiled 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.
    * </dd>
    * <dt>Lazy instantiation of listeners</dt>
    * <dd>
    * 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.
    * </dd>
    * </dl>
    *
    * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use
    * \Symfony\Component\EventDispatcher\EventDispatcher instead.
    *
    * @see https://www.drupal.org/node/3376090
    */
    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(object $event, ?string $eventName = NULL): object {
    $event_name = $eventName ?? get_class($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]);
    }
    $stoppable = $event instanceof StoppableEventInterface;
    // Invoke listeners and resolve callables if necessary.
    foreach ($this->listeners[$event_name] as &$definitions) {
    foreach ($definitions as &$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 ($stoppable && $event->isPropagationStopped()) {
    return $event;
    }
    }
    }
    }
    return $event;
    }
    /**
    * {@inheritdoc}
    */
    public function getListeners($event_name = NULL): array {
    $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 &$definitions) {
    foreach ($definitions as &$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): ?int {
    if (!isset($this->listeners[$event_name])) {
    return NULL;
    }
    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 &$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;
    }
    }
    }
    return NULL;
    }
    /**
    * {@inheritdoc}
    */
    public function hasListeners($event_name = NULL): bool {
    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): void {
    $this->listeners[$event_name][$priority][] = ['callable' => $listener];
    $this->unsorted[$event_name] = TRUE;
    }
    /**
    * {@inheritdoc}
    */
    public function removeListener($event_name, $listener): void {
    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): void {
    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]], $params[1] ?? 0);
    }
    else {
    foreach ($params as $listener) {
    $this->addListener($event_name, [$subscriber, $listener[0]], $listener[1] ?? 0);
    }
    }
    }
    }
    /**
    * {@inheritdoc}
    */
    public function removeSubscriber(EventSubscriberInterface $subscriber): void {
    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]]);
    }
    }
    }
    }
    core/lib/Drupal/Component/Plugin/PluginHelper.php deleted 100644 → 0
    + 0
    − 30
    View file @ 5637aff4
    <?php
    namespace Drupal\Component\Plugin;
    @trigger_error('The ' . __NAMESPACE__ . '\PluginHelper is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Instead, use instanceof() to check for \Drupal\Component\Plugin\ConfigurableInterface. See https://www.drupal.org/node/3198285', E_USER_DEPRECATED);
    /**
    * A helper class to determine if a plugin is configurable.
    *
    * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Instead, use
    * instanceof() to check for \Drupal\Component\Plugin\ConfigurableInterface.
    *
    * @see https://www.drupal.org/node/3198285
    */
    class PluginHelper {
    /**
    * Determines if a plugin is configurable.
    *
    * @param mixed $plugin
    * The plugin to check.
    *
    * @return bool
    * A boolean indicating whether the plugin is configurable.
    */
    public static function isConfigurable($plugin) {
    return $plugin instanceof ConfigurableInterface;
    }
    }
    core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
    + 0
    − 15
    View file @ aa25d8ff
    ......@@ -16,21 +16,6 @@ class InspectorTest extends TestCase {
    use ExpectDeprecationTrait;
    /**
    * Tests asserting argument is an array or traversable object.
    *
    * @covers ::assertTraversable
    *
    * @group legacy
    */
    public function testAssertTraversable() {
    $this->expectDeprecation('Drupal\Component\Assertion\Inspector::assertTraversable() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Use is_iterable() instead. See https://www.drupal.org/node/3422775');
    $this->assertTrue(Inspector::assertTraversable([]));
    $this->assertTrue(Inspector::assertTraversable(new \ArrayObject()));
    $this->assertFalse(Inspector::assertTraversable(new \stdClass()));
    $this->assertFalse(Inspector::assertTraversable('foo'));
    }
    /**
    * Tests asserting all members are strings.
    *
    ......
    core/tests/Drupal/Tests/Component/Plugin/PluginHelperLegacyTest.php deleted 100644 → 0
    + 0
    − 27
    View file @ 5637aff4
    <?php
    declare(strict_types=1);
    namespace Drupal\Tests\Component\Plugin;
    use Drupal\Component\Plugin\ConfigurableInterface;
    use Drupal\Component\Plugin\PluginHelper;
    use PHPUnit\Framework\TestCase;
    use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
    /**
    * @coversDefaultClass \Drupal\Component\Plugin\PluginHelper
    * @group Plugin
    * @group legacy
    */
    class PluginHelperLegacyTest extends TestCase {
    use ExpectDeprecationTrait;
    public function testPluginHelperDeprecation(): void {
    $this->expectDeprecation('The Drupal\Component\Plugin\PluginHelper is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Instead, use instanceof() to check for \Drupal\Component\Plugin\ConfigurableInterface. See https://www.drupal.org/node/3198285');
    $this->assertEquals($this instanceof ConfigurableInterface, PluginHelper::isConfigurable($this));
    $plugin = $this->createMock(ConfigurableInterface::class);
    $this->assertEquals($plugin instanceof ConfigurableInterface, PluginHelper::isConfigurable($plugin));
    }
    }
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment