Merge remote-tracking branch 'origin/2.1' into 2.x

Author: robertSt7

phpstan-baseline.neon

@@ -3,4 +3,13 @@ parameters:
 		-
 			message: "#^Parameter \\#2 \\$callback of function array_filter expects \\(callable\\(mixed\\)\\: bool\\)\\|null, 'intval' given\\.$#"
 			count: 1
-			path: src/Controller/Admin/DataObject/ClassificationstoreController.php
+			path: src/Controller/Admin/DataObject/ClassificationstoreController.php
+		-
+			message: "#^Call to protected method addToUpdateTaskQueue\\(\\) of class Pimcore\\\\Model\\\\Asset\\.$#"
+			count: 1
+			path: src/Controller/Admin/Asset/AssetController.php
+
+		-
+			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
+			count: 1
+			path: src/Controller/Admin/Asset/AssetController.php

src/Controller/Admin/Asset/AssetController.php

@@ -12,6 +12,7 @@
 
 namespace Pimcore\Bundle\AdminBundle\Controller\Admin\Asset;
 
+use function is_callable;
 use Pimcore\Bundle\AdminBundle\Controller\Admin\ElementControllerBase;
 use Pimcore\Bundle\AdminBundle\Controller\Traits\AdminStyleTrait;
 use Pimcore\Bundle\AdminBundle\Controller\Traits\ApplySchedulerDataTrait;
@@ -1445,9 +1446,14 @@ private function getResponseByScanStatus(Asset\Document $asset, bool $processBac
         if ($scanStatus === null) {
             $scanStatus = Asset\Enum\PdfScanStatus::IN_PROGRESS;
             if ($processBackground) {
-                \Pimcore::getContainer()->get('messenger.bus.pimcore-core')->dispatch(
-                    new AssetUpdateTasksMessage($asset->getId())
-                );
+                if (is_callable([$asset, 'addToUpdateTaskQueue'])) {
+                    $asset->addToUpdateTaskQueue();
+                } else {
+                    // Todo: BC layer, remove with 3.0 release
+                    \Pimcore::getContainer()->get('messenger.bus.pimcore-core')->dispatch(
+                        new AssetUpdateTasksMessage($asset->getId())
+                    );
+                }
             }
         }