MC-18948: Switch default search engine from MySQL to ElasticSearch

- fix static

Author: cpartica

app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchRemovalNotification.php

@@ -43,7 +43,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function apply()
+    public function apply(): DataPatchInterface
     {
         if ($this->scopeConfig->getValue('catalog/search/engine') === 'mysql') {
             $message = <<<MESSAGE
@@ -53,6 +53,7 @@ public function apply()
 
             $this->notifier->addNotice(__('Deprecation Notice'), __($message));
         }
+        return $this;
     }
 
     /**

app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Action/FullTest.php

@@ -11,10 +11,10 @@
  */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Search\Request\Config|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Search\Request\Config|\PHPUnit\Framework\MockObject\MockObject */
     protected $searchRequestConfig;
 
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit\Framework\MockObject\MockObject */
     protected $storeManager;
 
     /** @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full */

app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php

@@ -17,22 +17,22 @@ class EngineResolverTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $scopeConfig;
 
     /**
-     * @var string|\PHPUnit_Framework_MockObject_MockObject
+     * @var string|\PHPUnit\Framework\MockObject\MockObject
      */
     private $path;
 
     /**
-     * @var string|\PHPUnit_Framework_MockObject_MockObject
+     * @var string|\PHPUnit\Framework\MockObject\MockObject
      */
     private $scopeType;
 
     /**
-     * @var null|string|\PHPUnit_Framework_MockObject_MockObject
+     * @var null|string|\PHPUnit\Framework\MockObject\MockObject
      */
     private $scopeCode;
 
@@ -42,7 +42,7 @@ class EngineResolverTest extends \PHPUnit\Framework\TestCase
     private $engines = [];
 
     /**
-     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $loggerMock;
 

lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php

@@ -17,17 +17,17 @@
 class AdapterTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var ResponseFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $responseFactory;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $connectionAdapter;
 
     /**
-     * @var \Magento\Framework\Search\Adapter\Mysql\Mapper|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Search\Adapter\Mysql\Mapper|\PHPUnit\Framework\MockObject\MockObject
      */
     private $mapper;
 
@@ -42,32 +42,32 @@ class AdapterTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\Search\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Search\RequestInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $request;
 
     /**
-     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\DB\Select|\PHPUnit\Framework\MockObject\MockObject
      */
     private $select;
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit\Framework\MockObject\MockObject
      */
     private $resource;
 
     /**
-     * @var BucketInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var BucketInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $bucket;
 
     /**
-     * @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder|\PHPUnit\Framework\MockObject\MockObject
      */
     private $aggregatioBuilder;
 
     /**
-     * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorage|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorage|\PHPUnit\Framework\MockObject\MockObject
      */
     private $temporaryStorage;