Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / drush / drush / src / Commands / core / CacheCommands.php

diff --git a/vendor/drush/drush/src/Commands/core/CacheCommands.php b/vendor/drush/drush/src/Commands/core/CacheCommands.php
index af900ef1410d9fc1b6bb6d72f38166322096dbae..025a1662b71bb08f56e6ee21f44200958cce4b91 100644 (file)
--- a/vendor/drush/drush/src/Commands/core/CacheCommands.php
+++ b/vendor/drush/drush/src/Commands/core/CacheCommands.php
@@ -12,6 +12,7 @@ use Drupal\Core\DrupalKernel;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Cache\Cache;
 use Drush\Drush;
+use Drush\Utils\StringUtils;
 use Symfony\Component\HttpFoundation\Request;
 
 /*
@@ -60,13 +61,16 @@ class CacheCommands extends DrushCommands implements CustomEventAwareInterface,
      *
      * @command cache:clear
      * @param string $type The particular cache to clear. Omit this argument to choose from available types.
+     * @param array $args Additional arguments as might be expected (e.g. bin name).
      * @option cache-clear Set to 0 to suppress normal cache clearing; the caller should then clear if needed.
      * @hidden-options cache-clear
      * @aliases cc,cache-clear
      * @bootstrap max
      * @notify Caches have been cleared.
+     * @usage drush cc bin entity,bootstrap
+     *   Clear the entity and bootstrap cache bins.
      */
-    public function clear($type, $options = ['cache-clear' => true])
+    public function clear($type, array $args, $options = ['cache-clear' => true])
     {
         $boot_manager = Drush::bootstrapManager();
 
@@ -78,7 +82,7 @@ class CacheCommands extends DrushCommands implements CustomEventAwareInterface,
         $types = $this->getTypes($boot_manager->hasBootstrapped((DRUSH_BOOTSTRAP_DRUPAL_FULL)));
 
         // Do it.
-        drush_op($types[$type]);
+        drush_op($types[$type], $args);
         $this->logger()->success(dt("'!name' cache was cleared.", ['!name' => $type]));
     }
 
@@ -250,6 +254,8 @@ class CacheCommands extends DrushCommands implements CustomEventAwareInterface,
                 'router' => [$this, 'clearRouter'],
                 'css-js' => [$this, 'clearCssJs'],
                 'render' => [$this, 'clearRender'],
+                'plugin' => [$this, 'clearPlugin'],
+                'bin' => [$this, 'clearBins'],
             ];
         }
 
@@ -270,6 +276,17 @@ class CacheCommands extends DrushCommands implements CustomEventAwareInterface,
         drush_cache_clear_all(null, 'factory'); // command info from annotated-command library
     }
 
+    /**
+     * Clear one or more cache bins.
+     */
+    public static function clearBins($args = ['default'])
+    {
+        $bins = StringUtils::csvToArray($args);
+        foreach ($bins as $bin) {
+            \Drupal::service("cache.$bin")->deleteAll();
+        }
+    }
+
     public static function clearThemeRegistry()
     {
         \Drupal::service('theme.registry')->reset();
@@ -297,6 +314,11 @@ class CacheCommands extends DrushCommands implements CustomEventAwareInterface,
         Cache::invalidateTags(['rendered']);
     }
 
+    public static function clearPlugin()
+    {
+        \Drupal::getContainer()->get('plugin.cache_clearer')->clearCachedDefinitions();
+    }
+
     /**
      * Loads the Drupal autoloader and returns the instance.
      */