magento · magento-devops-reposync-svc · Nov 10, 2021 · Oct 27, 2021
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -1850,7 +1850,7 @@ private function reInitModel(): void
             ->getMockForAbstractClass();
 
         $dateTime = '2017-10-25 18:57:08';
-        $timestamp = '1508983028';
+        $timestamp = 1508983028;
         $dateTimeMock = $this->getMockBuilder(\DateTime::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['format', 'getTimestamp', 'setTimestamp'])
@@ -2363,7 +2363,7 @@ public function testCreateAccountWithPasswordHashWithCustomerAddresses(): void
     private function prepareDateTimeFactory(): string
     {
         $dateTime = '2017-10-25 18:57:08';
-        $timestamp = '1508983028';
+        $timestamp = 1508983028;
         $dateTimeMock = $this->createMock(\DateTime::class);
         $dateTimeMock->expects($this->any())
             ->method('format')

diff --git a/lib/internal/Magento/Framework/App/Console/Request.php b/lib/internal/Magento/Framework/App/Console/Request.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Console request
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -19,7 +17,7 @@ class Request implements \Magento\Framework\App\RequestInterface
      */
     public function __construct(array $parameters = [])
     {
-        $data = getopt(null, $parameters);
+        $data = getopt('', $parameters);
         // It can happen that request comes from http (e.g. pub/cron.php), but it runs the console
         if ($data) {
             $this->setParams($data);
@@ -35,17 +33,19 @@ public function __construct(array $parameters = [])
      */
     public function getModuleName()
     {
+        // phpcs:ignore Squiz.PHP.NonExecutableCode.ReturnNotRequired
         return;
     }
 
     /**
      * Set Module name
      *
      * @param string $name
+     *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function setModuleName($name)
+    public function setModuleName($name) // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
     {
     }
 
@@ -56,6 +56,7 @@ public function setModuleName($name)
      */
     public function getActionName()
     {
+        // phpcs:ignore Squiz.PHP.NonExecutableCode.ReturnNotRequired
         return;
     }
 
@@ -66,7 +67,7 @@ public function getActionName()
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function setActionName($name)
+    public function setActionName($name)  // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
     {
     }
 
@@ -112,10 +113,11 @@ public function setParams(array $data)
      *
      * @param null|string $name
      * @param null|string $default
+     *
      * @return null|string|void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getCookie($name, $default)
+    public function getCookie($name, $default)  // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
     {
     }
 

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
@@ -175,7 +175,8 @@ public function testSaveConfig()
             ->method('getFiles')
             ->willReturn('test.php');
         $this->dirRead->expects($this->any())
-            ->method('getAbsolutePath');
+            ->method('getAbsolutePath')
+            ->willReturn('');
         $this->filesystem->expects($this->any())
             ->method('getDirectoryWrite')
             ->with(DirectoryList::CONFIG)
@@ -231,7 +232,8 @@ public function testSaveConfigOverride()
             ->method('getFiles')
             ->willReturn('test.php');
         $this->dirRead->expects($this->any())
-            ->method('getAbsolutePath');
+            ->method('getAbsolutePath')
+            ->willReturn('');
         $this->filesystem->expects($this->any())
             ->method('getDirectoryWrite')
             ->with(DirectoryList::CONFIG)

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -142,7 +142,7 @@ public function testGetBasePathWithPath()
     public function testGetBasePathWithoutPath()
     {
         $this->model = $this->getModel();
-        $this->model->setBasePath(null);
+        $this->model->setBasePath('');
         $this->assertEquals('/', $this->model->getBasePath());
     }
 

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -814,7 +814,7 @@ protected function _splitMultiQuery($sql)
         $parts = preg_split(
             '#(;|\'|"|\\\\|//|--|\n|/\*|\*/)#',
             $sql,
-            null,
+            -1,
             PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE
         );
 
@@ -3625,6 +3625,7 @@ public function selectsByRange($rangeField, \Magento\Framework\DB\Select $select
     private function getQueryGenerator()
     {
         if ($this->queryGenerator === null) {
+            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->queryGenerator = \Magento\Framework\App\ObjectManager::getInstance()->create(QueryGenerator::class);
         }
         return $this->queryGenerator;
@@ -4097,6 +4098,7 @@ public function getAutoIncrementField($tableName, $schemaName = null)
     public function getSchemaListener()
     {
         if ($this->schemaListener === null) {
+            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
             $this->schemaListener = \Magento\Framework\App\ObjectManager::getInstance()->create(SchemaListener::class);
         }
         return $this->schemaListener;

diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
@@ -87,7 +87,7 @@ public function testExecuteWhenThrowPDOException()
         $this->pdoStatementMock->expects($this->once())
             ->method('execute')
             ->willThrowException(new \PDOException('test message'));
-
+        $this->setQueryStringForPdoStmtMock($query);
         $this->assertEquals($errorReporting, error_reporting(), 'Error report level was\'t restored');
 
         (new Mysql($this->adapterMock, $query))->_execute();
@@ -152,4 +152,23 @@ public function testExecuteWhenParamsAsParameterObject()
 
         (new Mysql($this->adapterMock, $query))->_execute($params);
     }
+
+    /**
+     * Initialize queryString property.
+     *
+     * @param string $query
+     *
+     * @return void
+     */
+    private function setQueryStringForPdoStmtMock(string $query): void
+    {
+        /*
+         * In PHP 8.1 $queryString is a Typed property, thus it should be initialized before the 1st call.
+         * But it's not automatically initialized in case of Mocking, so we do it here.
+         * Note: In PHP < 8.1 such assignment prohibited.
+         */
+        if (PHP_VERSION_ID >= 80100) {
+            $this->pdoStatementMock->queryString = $query;
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php
@@ -373,9 +373,9 @@ public function toString($format = '')
     /**
      * Set/Get attribute wrapper
      *
-     * @param   string $method
-     * @param   array $args
-     * @return  mixed
+     * @param string $method
+     * @param array $args
+     * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __call($method, $args)
@@ -464,7 +464,7 @@ public function serialize($keys = [], $valueSeparator = '=', $fieldSeparator = '
      * Present object data as string in debug mode
      *
      * @param mixed $data
-     * @param array &$objects
+     * @param array $objects
      * @return array
      */
     public function debug($data = null, &$objects = [])

diff --git a/lib/internal/Magento/Framework/Event/Observer/Cron.php b/lib/internal/Magento/Framework/Event/Observer/Cron.php
@@ -27,7 +27,7 @@ class Cron extends \Magento\Framework\Event\Observer
      */
     public function isValidFor(\Magento\Framework\Event $event)
     {
-        $e = preg_split('#\s+#', $this->getCronExpr(), null, PREG_SPLIT_NO_EMPTY);
+        $e = preg_split('#\s+#', $this->getCronExpr(), -1, PREG_SPLIT_NO_EMPTY);
         if (count($e) !== 5) {
             return false;
         }

diff --git a/lib/internal/Magento/Framework/Filter/SplitWords.php b/lib/internal/Magento/Framework/Filter/SplitWords.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Framework\Filter;
 
-/**
- * Split words
- */
 class SplitWords implements \Zend_Filter_Interface
 {
     /**
@@ -46,7 +43,7 @@ public function __construct($uniqueOnly = true, $wordsQty = 0, $wordSeparatorReg
     public function filter($str)
     {
         $result = [];
-        $split = preg_split('#' . $this->wordSeparatorRegexp . '#siu', $str, null, PREG_SPLIT_NO_EMPTY);
+        $split = preg_split('#' . $this->wordSeparatorRegexp . '#siu', $str, -1, PREG_SPLIT_NO_EMPTY);
         foreach ($split as $word) {
             if ($this->uniqueOnly) {
                 $result[$word] = $word;

diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -6,8 +6,10 @@
 
 namespace Magento\Framework\Model\ResourceModel\Db\Collection;
 
-use \Magento\Framework\App\ResourceConnection\SourceProviderInterface;
-use \Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Event\ManagerInterface;
 
 /**
  * Abstract Resource Collection
@@ -106,23 +108,23 @@ abstract class AbstractCollection extends AbstractDb implements SourceProviderIn
     /**
      * Event manager proxy
      *
-     * @var \Magento\Framework\Event\ManagerInterface
+     * @var ManagerInterface
      */
     protected $_eventManager = null;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param ManagerInterface $eventManager
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
+        ManagerInterface $eventManager,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     ) {
@@ -241,12 +243,7 @@ protected function _initSelectFields()
                     $column = $field;
                 }
 
-                if ($alias !== null &&
-                    in_array($alias, $columnsToSelect) ||
-                    // If field already joined from another table
-                    $alias === null &&
-                    isset($alias, $columnsToSelect)
-                ) {
+                if ($alias !== null && in_array($alias, $columnsToSelect)) {
                     continue;
                 }
 
@@ -468,9 +465,8 @@ public function getResourceModelName()
     public function getResource()
     {
         if (empty($this->_resource)) {
-            $this->_resource = \Magento\Framework\App\ObjectManager::getInstance()->create(
-                $this->getResourceModelName()
-            );
+            // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
+            $this->_resource = ObjectManager::getInstance()->create($this->getResourceModelName());
         }
         return $this->_resource;
     }
@@ -513,14 +509,13 @@ public function getAllIds()
      */
     public function join($table, $cond, $cols = '*')
     {
+        $alias = $table;
         if (is_array($table)) {
             foreach ($table as $k => $v) {
                 $alias = $k;
                 $table = $v;
                 break;
             }
-        } else {
-            $alias = $table;
         }
 
         if (!isset($this->_joinedTables[$alias])) {
@@ -624,7 +619,7 @@ public function __sleep()
     public function __wakeup()
     {
         parent::__wakeup();
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->_eventManager = $objectManager->get(\Magento\Framework\Event\ManagerInterface::class);
+        // phpcs:ignore Magento2.PHP.AutogeneratedClassNotInConstructor
+        $this->_eventManager = ObjectManager::getInstance()->get(ManagerInterface::class);
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/TMap.php b/lib/internal/Magento/Framework/ObjectManager/TMap.php
@@ -8,7 +8,6 @@
 use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Class TMap
  * @internal
  */
 class TMap implements \IteratorAggregate, \Countable, \ArrayAccess
@@ -62,7 +61,7 @@ public function __construct(
         array $array = [],
         \Closure $objectCreationStrategy = null
     ) {
-        if (!class_exists($this->type) && !interface_exists($type)) {
+        if ((empty($this->type) || !class_exists($this->type)) && !interface_exists($type)) {
             throw new \InvalidArgumentException(sprintf('Unknown type %s', $type));
         }
 
@@ -142,7 +141,7 @@ private function initObject($index)
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function getIterator()
     {
@@ -156,23 +155,23 @@ public function getIterator()
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function offsetExists($offset)
     {
         return array_key_exists($offset, $this->array);
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function offsetGet($offset)
     {
         return isset($this->array[$offset]) ? $this->initObject($offset) : null;
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function offsetSet($offset, $value)
     {
@@ -187,7 +186,7 @@ public function offsetSet($offset, $value)
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function offsetUnset($offset)
     {
@@ -202,7 +201,7 @@ public function offsetUnset($offset)
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function count()
     {