Merge remote-tracking branch 'anzin/fix-deprecation-integration-part-3' into ph-delivery

Author: xmav

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -303,7 +303,7 @@ script;
 script;
         endif;
 
-        if (strpos($block->getRowClickCallback(), 'order.') !== false):
+        if ($block->getRowClickCallback() && strpos($block->getRowClickCallback(), 'order.') !== false):
             $scriptString .= <<<script
 
     deps.push('Magento_Sales/order/create/form')

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

@@ -87,8 +87,8 @@ $_helper = $block->getData('outputHelper');
                                               data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
                                               action="<?= $escaper->escapeUrl($postParams['action']) ?>"
                                               method="post">
-                                            <?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?>
-                                            <?php foreach ($optionsData as $optionItem): ?>
+                                            <?php $options = $block->getData('viewModel')->getOptionsData($_product); ?>
+                                            <?php foreach ($options as $optionItem): ?>
                                                 <input type="hidden"
                                                        name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
                                                        value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
@@ -119,7 +119,7 @@ $_helper = $block->getData('outputHelper');
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <?= strpos($pos, $viewMode . '-primary') ?
+                                <?= ($pos && strpos($pos, $viewMode . '-primary')) ?
                                     /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                         $position,
                                         'product-item-info_' . $_product->getId() . ' div.actions-primary'
@@ -129,7 +129,7 @@ $_helper = $block->getData('outputHelper');
                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
-                                <?= strpos($pos, $viewMode . '-secondary') ?
+                                <?= ($pos && strpos($pos, $viewMode . '-secondary')) ?
                                     /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                         $position,
                                         'product-item-info_' . $_product->getId() . ' div.actions-secondary'
@@ -150,7 +150,7 @@ $_helper = $block->getData('outputHelper');
                         </div>
                     </div>
                 </div>
-                <?= strpos($pos, $viewMode . '-actions') ?
+                <?= ($pos && strpos($pos, $viewMode . '-actions')) ?
                 /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     $position,
                     'product-item-info_' . $_product->getId() . ' div.product-item-actions'
@@ -160,6 +160,7 @@ $_helper = $block->getData('outputHelper');
         </ol>
     </div>
     <?= $block->getChildBlock('toolbar')->setIsBottom(true)->toHtml() ?>
+    <?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
     <script type="text/x-magento-init">
     {
         "[data-role=tocart-form], .form.map.checkout": {

app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php

@@ -115,7 +115,7 @@ public function getTreeLoaderUrl()
 
         $currentTreePath = $this->getRequest()->getParam('current_tree_path');
 
-        if (strlen($currentTreePath)) {
+        if ($currentTreePath !== null && strlen($currentTreePath)) {
             $params['current_tree_path'] = $currentTreePath;
         }
 
@@ -138,7 +138,7 @@ public function getRootNodeName()
     /**
      * Return tree node full path based on current path
      *
-     * @return string
+     * @return string[]
      */
     public function getTreeCurrentPath()
     {
@@ -150,7 +150,7 @@ public function getTreeCurrentPath()
             $path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath();
         }
 
-        if (strlen($path)) {
+        if ($path) {
             $path = str_replace($this->_cmsWysiwygImages->getStorageRoot(), '', $path);
             $relative = [];
             foreach (explode('/', $path) as $dirName) {

app/code/Magento/Cron/Model/Schedule.php

@@ -129,7 +129,7 @@ public function trySchedule()
             return false;
         }
         $configTimeZone = $this->timezoneConverter->getConfigTimezone();
-        $storeDateTime = $this->dateTimeFactory->create(null, new \DateTimeZone($configTimeZone));
+        $storeDateTime = $this->dateTimeFactory->create('now', new \DateTimeZone($configTimeZone));
         if (!is_numeric($time)) {
             //convert time from UTC to admin store timezone
             //we assume that all schedules in configuration (crontab.xml and DB tables) are in admin store timezone

app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php

@@ -36,6 +36,6 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function isUrlSecure($url)
     {
-        return (strpos($url, 'http:') !== 0);
+        return (is_string($url) && strpos($url, 'http:') !== 0);
     }
 }

app/code/Magento/Tax/Model/Calculation/Rate.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Tax\Api\Data\TaxRateInterface;
+use Magento\Tax\Api\Data\TaxRateTitleInterface;
 
 /**
  * Tax Rate Model
@@ -18,7 +19,7 @@
  */
 class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements TaxRateInterface
 {
-    /**
+    /**#@+
      * Constants defined for keys of array, makes typos less likely
      */
     public const KEY_ID              = 'id';
@@ -32,9 +33,10 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements T
     public const KEY_PERCENTAGE_RATE = 'rate';
     public const KEY_CODE            = 'code';
     public const KEY_TITLES          = 'titles';
+    /**#@-*/
 
     /**
-     * @var null
+     * @var TaxRateTitleInterface[]
      */
     protected $_titles = null;
 
@@ -213,7 +215,9 @@ public function beforeDelete()
     }
 
     /**
-     * After rate delete redeclared for dispatch tax_settings_change_after event
+     * After rate delete
+     *
+     * Redeclared for dispatch tax_settings_change_after event
      *
      * @return \Magento\Tax\Model\Calculation\Rate
      */
@@ -327,10 +331,8 @@ public function getRegionName()
     }
 
     /**
-     * Get tax calculation rate id
-     *
-     * @codeCoverageIgnoreStart
      * @inheritdoc
+     * @codeCoverageIgnoreStart
      */
     public function getTaxCalculationRateId()
     {
@@ -503,7 +505,7 @@ public function setCode($code)
     /**
      * Set tax rate titles
      *
-     * @param \Magento\Tax\Api\Data\TaxRateTitleInterface[] $titles
+     * @param TaxRateTitleInterface[] $titles
      * @return $this
      */
     public function setTitles(array $titles = null)

dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php

@@ -156,6 +156,7 @@ public function testCallRefundTransaction()
                 [],
                 $httpQuery
             );
+        $this->httpClient->method('read')->willReturn('');
 
         $this->nvpApi->callRefundTransaction();
     }

dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php

@@ -95,7 +95,7 @@ public function testConsecutiveProcessProlong()
         );
         $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
         $prolongsDiff = log($this->securityConfig->getAdminSessionLifetime()) - 2; // X from comment above
-        $dateInPast = $this->dateTime->formatDate($this->authSession->getUpdatedAt() - $prolongsDiff);
+        $dateInPast = $this->dateTime->formatDate((int) ($this->authSession->getUpdatedAt() - $prolongsDiff));
         $this->adminSessionsManager->getCurrentSession()
             ->setData(
                 'updated_at',
@@ -127,7 +127,7 @@ public function testProcessProlong()
         );
         $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
         $prolongsDiff = 4 * log($this->securityConfig->getAdminSessionLifetime()) + 2; // X from comment above
-        $dateInPast = $this->dateTime->formatDate($this->authSession->getUpdatedAt() - $prolongsDiff);
+        $dateInPast = $this->dateTime->formatDate((int) ($this->authSession->getUpdatedAt() - $prolongsDiff));
         $this->adminSessionsManager->getCurrentSession()
             ->setData(
                 'updated_at',
@@ -171,7 +171,7 @@ public function testProcessProlongWithExpiredUser()
         // need to trigger a prolong
         $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
         $prolongsDiff = 4 * log($this->securityConfig->getAdminSessionLifetime()) + 2;
-        $dateInPast = $this->dateTime->formatDate($this->authSession->getUpdatedAt() - $prolongsDiff);
+        $dateInPast = $this->dateTime->formatDate((int) ($this->authSession->getUpdatedAt() - $prolongsDiff));
         $this->adminSessionsManager->getCurrentSession()
             ->setData(
                 'updated_at',

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -239,8 +239,9 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
     {
         $formatTime = $showTime ? $format : \IntlDateFormatter::NONE;
 
-        if (!($date instanceof \DateTimeInterface)) {
-            $date = new \DateTime($date);
+        if (!$date instanceof \DateTimeInterface) {
+            /** @phpstan-ignore-next-line */
+            $date = new \DateTime($date ?? 'now');
         }
 
         return $this->formatDateTime($date, $format, $formatTime);

setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php

@@ -122,8 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $totalEndTime = microtime(true);
-            $totalResultTime = $totalEndTime - $totalStartTime;
-
+            $totalResultTime = (int) ($totalEndTime - $totalStartTime);
             $output->writeln('<info>Total execution time: ' . gmdate('H:i:s', $totalResultTime) . '</info>');
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');