Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-1315

Author: dhorytskyi

app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php

@@ -5,12 +5,13 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Online\Grid;
 
-use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Magento\Customer\Model\Visitor;
-use Magento\Framework\Api;
-use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
 use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
@@ -23,17 +24,17 @@ class Collection extends SearchResult
     /**
      * Value of seconds in one minute
      */
-    const SECONDS_IN_MINUTE = 60;
+    public const SECONDS_IN_MINUTE = 60;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var DateTime
      */
-    protected $date;
+    protected DateTime $date;
 
     /**
      * @var Visitor
      */
-    protected $visitorModel;
+    protected Visitor $visitorModel;
 
     /**
      * @param EntityFactory $entityFactory
@@ -43,7 +44,8 @@ class Collection extends SearchResult
      * @param string $mainTable
      * @param string $resourceModel
      * @param Visitor $visitorModel
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
+     * @param DateTime $date
+     * @throws LocalizedException
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -53,7 +55,7 @@ public function __construct(
         $mainTable,
         $resourceModel,
         Visitor $visitorModel,
-        \Magento\Framework\Stdlib\DateTime\DateTime $date
+        DateTime $date
     ) {
         $this->date = $date;
         $this->visitorModel = $visitorModel;
@@ -65,7 +67,7 @@ public function __construct(
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _initSelect(): Collection
     {
         parent::_initSelect();
         $connection = $this->getConnection();
@@ -78,6 +80,7 @@ protected function _initSelect()
             'main_table.last_visit_at >= ?',
             $connection->formatDate($lastDate)
         );
+        $this->addFilterToMap('customer_id', 'main_table.customer_id');
         $expression = $connection->getCheckSql(
             'main_table.customer_id IS NOT NULL AND main_table.customer_id != 0',
             $connection->quote(Visitor::VISITOR_TYPE_CUSTOMER),
@@ -92,9 +95,9 @@ protected function _initSelect()
      *
      * @param string|array $field
      * @param string|int|array|null $condition
-     * @return \Magento\Cms\Model\ResourceModel\Block\Collection
+     * @return Collection
      */
-    public function addFieldToFilter($field, $condition = null)
+    public function addFieldToFilter($field, $condition = null): Collection
     {
         if ($field == 'visitor_type') {
             $field = 'customer_id';