Allow --drafts, --provisional-drafts, and --revisions to be set to `n…

…ull`
craftcms · Dec 6, 2024 · 4f05385 · 4f05385
1 parent 98fa5a3
commit 4f05385
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -24,6 +24,7 @@
 - The Queue Manager utility now shows jobs’ class names. ([#16228](https://github.com/craftcms/cms/pull/16228))
 - Improved the wording of field instance action labels. ([#16261](https://github.com/craftcms/cms/discussions/16261))
 - Improved the error output for nested elements when they can’t be resaved via `resave` commands.
+- `resave` commands’ `--drafts`, `--provisional-drafts`, and `--revisions` options can now be set to `null`, causing elements to be resaved regardless of whether they’re drafts/provisional drafts/revisions.
 
 ### Development
 - Added support for fallback element partial templates, e.g. `_partials/entry.twig` as opposed to `_partials/entry/typeHandle.twig`. ([#16125](https://github.com/craftcms/cms/pull/16125))

diff --git a/src/console/controllers/ResaveController.php b/src/console/controllers/ResaveController.php
@@ -21,6 +21,7 @@
 use craft\elements\User;
 use craft\errors\InvalidElementException;
 use craft\events\MultiElementActionEvent;
+use craft\helpers\App;
 use craft\helpers\Console;
 use craft\helpers\ElementHelper;
 use craft\helpers\Inflector;
@@ -102,21 +103,24 @@ final public static function normalizeTo(?string $to): callable
 
     /**
      * @var bool Whether to resave element drafts.
+     * Set to `null` if all elements should be resaved regardless of whether they’re drafts.
      * @since 3.6.5
      */
-    public bool $drafts = false;
+    public bool|string|null $drafts = null;
 
     /**
      * @var bool Whether to resave provisional element drafts.
+     * Set to `null` if all elements should be resaved regardless of whether they’re provisional drafts.
      * @since 3.7.0
      */
-    public bool $provisionalDrafts = false;
+    public bool|string|null $provisionalDrafts = null;
 
     /**
-     * @var bool Whether to resave element revisions.
+     * @var bool|string Whether to resave element revisions.
+     * Set to `null` if all elements should be resaved regardless of whether they’re revisions.
      * @since 3.7.35
      */
-    public bool $revisions = false;
+    public bool|string|null $revisions = null;
 
     /**
      * @var int|string|null The ID(s) of the elements to resave.
@@ -323,6 +327,16 @@ public function beforeAction($action): bool
             return false;
         }
 
+        // Can't default these properties to false because then yii\console\Controller::runAction() will
+        // typecast their values to booleans
+        foreach (['drafts', 'provisionalDrafts', 'revisions'] as $property) {
+            $this->$property ??= false;
+            if (is_string($this->$property)) {
+                $value = App::normalizeValue($this->$property);
+                $this->$property = $value !== null ? (bool)$value : null;
+            }
+        }
+
         if (isset($this->propagateTo)) {
             $siteHandles = array_filter(StringHelper::split($this->propagateTo));
             $this->propagateTo = [];
@@ -678,21 +692,16 @@ public function saveElements(ElementQueryInterface $query): int
      */
     private function _baseCriteria(): array
     {
-        $criteria = [];
+        $criteria = [
+            'drafts' => $this->drafts,
+            'provisionalDrafts' => $this->provisionalDrafts,
+            'revisions' => $this->revisions,
+        ];
 
-        if ($this->drafts) {
+        if ($this->provisionalDrafts !== false && $this->drafts == false) {
             $criteria['drafts'] = true;
         }
 
-        if ($this->provisionalDrafts) {
-            $criteria['drafts'] = true;
-            $criteria['provisionalDrafts'] = true;
-        }
-
-        if ($this->revisions) {
-            $criteria['revisions'] = true;
-        }
-
         if ($this->elementId) {
             $criteria['id'] = is_int($this->elementId) ? $this->elementId : explode(',', $this->elementId);
         }
@@ -823,7 +832,7 @@ private function _resaveElements(ElementQueryInterface $query): int
         } else {
             $elementsService->on(Elements::EVENT_BEFORE_RESAVE_ELEMENT, $beforeCallback);
             $elementsService->on(Elements::EVENT_AFTER_RESAVE_ELEMENT, $afterCallback);
-            $elementsService->resaveElements($query, true, !$this->revisions, $this->updateSearchIndex, $this->touch);
+            $elementsService->resaveElements($query, true, $this->revisions === false, $this->updateSearchIndex, $this->touch);
             $elementsService->off(Elements::EVENT_BEFORE_RESAVE_ELEMENT, $beforeCallback);
             $elementsService->off(Elements::EVENT_AFTER_RESAVE_ELEMENT, $afterCallback);
         }