Cleanup controller

Author: riasvdv

src/Http/Controllers/PreviewController.php

@@ -81,30 +81,24 @@ public function preview(Request $request, Kernel $kernel): mixed
             ->siteId($request->integer('siteId'))
             ->status(null);
 
-        if ($draftId = $request->integer('draftId')) {
-            $element = $query
-                ->draftId($draftId)
-                ->one();
-        } elseif ($revisionId = $request->integer('revisionId')) {
-            $element = $query
-                ->revisionId($revisionId)
-                ->one();
-        } else {
-            if ($userId = $request->integer('userId')) {
-                // First check if there's a provisional draft
-                $user = \Craft::$app->getUsers()->getUserById($userId);
-                ElementHelper::setProvisionalDraftUser($user);
+        $elementFn = match (true) {
+            (bool) $draftId = $request->integer('draftId') => fn () => $query->draftId($draftId)->one(),
+            (bool) $revisionId = $request->integer('revisionId') => fn () => $query->revisionId($revisionId)->one(),
+            (bool) $userId = $request->integer('userId') => function () use ($userId, $query, $request) {
+                ElementHelper::setProvisionalDraftUser($userId);
+
                 $element = (clone $query)
                     ->draftOf($request->integer('canonicalId'))
                     ->provisionalDrafts()
                     ->draftCreator($userId)
                     ->one();
-            }
 
-            $element ??= $query->id($request->integer('canonicalId'))->one();
-        }
+                return $element ?? $query->id($request->integer('canonicalId'))->one();
+            },
+            default => fn () null,
+        };
 
-        if ($element) {
+        if ($element = $elementFn()) {
             if (! $element->lft && $element->getIsDerivative()) {
                 // See if we can add structure data to it
                 $canonical = $element->getCanonical(true);

yii2-adapter/legacy/helpers/ElementHelper.php

@@ -1179,12 +1179,16 @@ public static function isMultiSite(ElementInterface $element): bool
     /**
      * Sets user to be used for swapping in provisional drafts.
      *
-     * @param UserElement|null $user
+     * @param UserElement|int|null $user
      *
      * @since 5.8.0
      */
-    public static function setProvisionalDraftUser(?UserElement $user): void
+    public static function setProvisionalDraftUser(UserElement|int|null $user): void
     {
+        if (is_int($user)) {
+            $user = \Craft::$app->getUsers()->getUserById($user);
+        }
+
         self::$provisionalDraftUser = $user;
     }
 }