Merge branch 'magento:2.4-develop' into fix_implode_multiline_address_with_null_value

Author: Zaahed

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/AdobeStock_232925587.png

@@ -6,8 +6,11 @@
  */
 namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
 
+use Magento\AsynchronousOperations\Model\Operation;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation as OperationResourceModel;
+
 /**
- * Class Collection
+ * Class Collection for Magento Operation table
  * @codeCoverageIgnore
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
@@ -20,9 +23,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
     protected function _construct()
     {
         $this->_init(
-            \Magento\AsynchronousOperations\Model\Operation::class,
-            \Magento\AsynchronousOperations\Model\ResourceModel\Operation::class
+            Operation::class,
+            OperationResourceModel::class
         );
         $this->setMainTable('magento_operation');
+        $this->_setIdFieldName(OperationResourceModel::TABLE_PRIMARY_KEY);
     }
 }

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/[email protected]

@@ -9,14 +9,12 @@
 
 use Magento\Authorization\Model\Acl\Role\Group;
 use Magento\Authorization\Model\ResourceModel\Role as RoleResource;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\DataObject;
-use Magento\SharedCatalog\Model\SharedCatalogFactory;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
-use Magento\Authorization\Model\RoleFactory;
-use Magento\Authorization\Model\RulesFactory;
-use Magento\User\Model\UserFactory;
 
 /**
  * Creating a new admin role

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/adobe-commerce-dark.png

@@ -6,10 +6,12 @@
 
 namespace Magento\Backend\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
@@ -23,7 +25,7 @@ abstract class AbstractCacheSetCommand extends AbstractCacheManageCommand
     abstract protected function isEnable();
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -43,5 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln('Cleaned cache types:');
             $output->writeln(join(PHP_EOL, $changedTypes));
         }
+
+        return Cli::RETURN_SUCCESS;
     }
 }

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/adobe-commerce-light.png

@@ -6,12 +6,14 @@
 
 namespace Magento\Backend\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\App\Cache\Manager;
 
 /**
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
@@ -54,13 +56,15 @@ abstract protected function getDisplayMessage();
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $types = $this->getRequestedTypes($input);
         $this->performAction($types);
         $output->writeln($this->getDisplayMessage());
         $output->writeln(join(PHP_EOL, $types));
+
+        return Cli::RETURN_SUCCESS;
     }
 }

app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Backend\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -18,7 +19,7 @@
 class CacheStatusCommand extends AbstractCacheCommand
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -28,13 +29,15 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln('Current status:');
         foreach ($this->cacheManager->getStatus() as $cache => $status) {
             $output->writeln(sprintf('%30s: %d', $cache, $status));
         }
+
+        return Cli::RETURN_SUCCESS;
     }
 }

app/code/Magento/Authorization/Test/Fixture/Role.php

@@ -130,7 +130,7 @@ public function refreshAcl($user = null)
         }
         if ($user->getReloadAclFlag()) {
             $user->unsetData('password');
-            $user->setReloadAclFlag('0')->save();
+            $user->setReloadAclFlag(0)->save();
         }
         return $this;
     }