Port cache commands to annotated (#2498)

* Port cache commands to Annotated. * Remove a code comment. * Remove old file. * Misc minot fixes and renames. * Update to new cache clear method * Remove debug code. * Cast topic element to a bool to match old API
drush-ops · Dec 12, 2016 · 1b30544 · 1b30544
1 parent 53fd6a6
commit 1b30544
Show file tree

Hide file tree

Showing 10 changed files with 359 additions and 396 deletions.
diff --git a/commands/core/cache.drush.inc b/commands/core/cache.drush.inc
diff --git a/commands/core/drupal/cache.inc b/commands/core/drupal/cache.inc
@@ -1,4 +1,6 @@
 <?php
+use Drush\Commands\core\CacheCommands;
+
 /**
  * @file
  *   Engine for the cache commands.
@@ -38,7 +40,7 @@ function _drush_cache_command_set($cid, $data, $bin, $expire, $tags) {
 
 function _drush_cache_clear_types($include_bootstrapped_types) {
   $types = array(
-    'drush' => 'drush_cache_clear_drush',
+    'drush' => ['\Drush\Commands\core\CacheCommands', 'cacheDrush'],
     'all' => 'drush_cache_clear_both',
   );
   if ($include_bootstrapped_types) {
@@ -88,7 +90,7 @@ function drush_cache_clear_block() {
  * Clear caches internal to Drush core and Drupal.
  */
 function drush_cache_clear_both() {
-  drush_cache_clear_drush();
+  CacheCommands::clearDrush();
   if (drush_has_boostrapped(DRUSH_BOOTSTRAP_DRUPAL_FULL)) {
     drupal_flush_all_caches();
   }

diff --git a/commands/core/drupal/cache_8.inc b/commands/core/drupal/cache_8.inc
@@ -27,10 +27,6 @@ function _drush_cache_command_set($cid, $data, $bin, $expire, $tags) {
     $bin = _drush_cache_bin_default();
   }
 
-  // Convert the "expire" argument to a valid value for Drupal's cache_set().
-  if ($expire == 'CACHE_TEMPORARY') {
-    $expire = Cache::TEMPORARY;
-  }
   if (!isset($expire) || $expire == 'CACHE_PERMANENT') {
     $expire = Cache::PERMANENT;
   }
@@ -40,7 +36,7 @@ function _drush_cache_command_set($cid, $data, $bin, $expire, $tags) {
 
 function _drush_cache_clear_types($include_bootstrapped_types) {
   $types = array(
-    'drush' => 'drush_cache_clear_drush',
+    'drush' => ['\Drush\Commands\core\CacheCommands', 'cacheDrush'],
   );
   if ($include_bootstrapped_types) {
     $types += array(

diff --git a/commands/core/topic.drush.inc b/commands/core/topic.drush.inc
@@ -62,7 +62,7 @@ function drush_topic_core_topic($topic_name = NULL) {
     }
   }
   if (empty($topics)) {
-    return drush_set_error('DRUSH_NO_SUCH_TOPIC', dt("No topics on !topic found.", array('!topic' => $topic_name)));
+    return drush_set_error('DRUSH_NO_SUCH_TOPIC', dt("!topic topic not found.", array('!topic' => $topic_name)));
   }
   if (count($topics) > 1) {
     // Show choice list.