Merge pull request #1774 from magento-tango/2.2.2-develop-PR

Bugs:
- MAGETWO-84000 Undefined index: region_id is presented after save customer address
- MAGETWO-84106 [2.2.1] Implementation (fix) of session locking mechanism in php-redis-session-abstract leads to 30 sec timeout
- MAGETWO-84544 Configurable product reindex too slow for big amount of options
- MAGETWO-84646 Cron jobs incorrect behavior when running job terminated

Author: VladimirZaets

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php

@@ -133,6 +133,10 @@ protected function _applyConfigurableOption()
             ['le' => $this->getTable('catalog_product_entity')],
             'le.' . $linkField . ' = l.parent_id',
             ['parent_id' => 'entity_id']
+        )->join(
+            ['i' => $this->_getDefaultFinalPriceTable()],
+            'le.entity_id = i.entity_id',
+            []
         );
 
         $select = $connection->select();

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

@@ -66,7 +66,14 @@ public function trySetJobUniqueStatusAtomic($scheduleId, $newStatus, $currentSta
     {
         $connection = $this->getConnection();
 
-        $match = $connection->quoteInto('existing.job_code = current.job_code AND existing.status = ?', $newStatus);
+        // this condition added to avoid cron jobs locking after incorrect termination of running job
+        $match = $connection->quoteInto(
+            'existing.job_code = current.job_code ' .
+            'AND (existing.executed_at > UTC_TIMESTAMP() - INTERVAL 1 DAY OR existing.executed_at IS NULL) ' .
+            'AND existing.status = ?',
+            $newStatus
+        );
+
         $selectIfUnlocked = $connection->select()
             ->joinLeft(
                 ['existing' => $this->getTable('cron_schedule')],

app/code/Magento/Cron/Setup/Recurring.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cron\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Cron recurring setup
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var \Magento\Cron\Model\ResourceModel\Schedule
+     */
+    private $schedule;
+
+    /**
+     * Recurring constructor.
+     * @param \Magento\Cron\Model\ResourceModel\Schedule $schedule
+     */
+    public function __construct(
+        \Magento\Cron\Model\ResourceModel\Schedule $schedule
+    ) {
+        $this->schedule = $schedule;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $connection = $this->schedule->getConnection();
+        $connection->update(
+            $this->schedule->getMainTable(),
+            [
+                'status' => \Magento\Cron\Model\Schedule::STATUS_ERROR,
+                'messages' => 'The job is terminated due to system upgrade'
+            ],
+            $connection->quoteInto('status = ?', \Magento\Cron\Model\Schedule::STATUS_RUNNING)
+        );
+    }
+}

app/code/Magento/Customer/Block/Address/Edit.php

@@ -139,9 +139,11 @@ protected function _prepareLayout()
 
         if ($postedData = $this->_customerSession->getAddressFormData(true)) {
             $postedData['region'] = [
-                'region_id' => $postedData['region_id'],
-                'region' => $postedData['region'],
+                'region' => $postedData['region'] ?? null,
             ];
+            if (!empty($postedData['region_id'])) {
+                $postedData['region']['region_id'] = $postedData['region_id'];
+            }
             $this->dataObjectHelper->populateWithArray(
                 $this->_address,
                 $postedData,

app/code/Magento/Customer/Model/AttributeChecker.php

@@ -8,7 +8,6 @@
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Model\Metadata\AttributeResolver;
-use Magento\Framework\App\Helper\Context;
 
 /**
  * Customer attribute checker.

app/code/Magento/Customer/Test/Unit/Block/Address/EditTest.php

@@ -101,15 +101,15 @@ protected function setUp()
         );
     }
 
-    public function testSetLayoutWithOwnAddressAndPostedData()
+    /**
+     * @param array $postedData
+     * @dataProvider postedDataProvider
+     */
+    public function testSetLayoutWithOwnAddressAndPostedData(array $postedData)
     {
         $addressId = 1;
         $customerId = 1;
         $title = __('Edit Address');
-        $postedData = [
-            'region_id' => 1,
-            'region' => 'region',
-        ];
         $newPostedData = $postedData;
         $newPostedData['region'] = $postedData;
 
@@ -169,6 +169,21 @@ public function testSetLayoutWithOwnAddressAndPostedData()
         $this->assertEquals($layoutMock, $this->model->getLayout());
     }
 
+    /**
+     * @return array
+     */
+    public function postedDataProvider()
+    {
+        return [
+            [
+                ['region_id' => 1, 'region' => 'region']
+            ],
+            [
+                ['region' => 'region without id']
+            ]
+        ];
+    }
+
     /**
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml

@@ -19,7 +19,7 @@
         <?php
             $_validationClass = $block->escapeHtmlAttr(
                 $this->helper('Magento\Customer\Helper\Address')
-                     ->getAttributeValidationClass('fax')
+                     ->getAttributeValidationClass('telephone')
             );
         ?>
         <input type="text"

dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php

@@ -54,6 +54,27 @@ public function testTryLockJobAlreadyLockedFails()
         $this->assertFalse($schedule->tryLockJob());
     }
 
+    /**
+     * If the job is already locked but lock time less than 1 day ago, attempting to lock it again should fail
+     */
+    public function testTryLockJobAlreadyLockedSucceeds()
+    {
+        $offsetInThePast = 2*24*60*60;
+
+        $oldSchedule = $this->scheduleFactory->create()
+            ->setCronExpr("* * * * *")
+            ->setJobCode("test_job")
+            ->setStatus(Schedule::STATUS_RUNNING)
+            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp() - $offsetInThePast))
+            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 60))
+            ->setExecutedAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 61));
+        $oldSchedule->save();
+
+        $schedule = $this->createSchedule("test_job", Schedule::STATUS_PENDING);
+
+        $this->assertTrue($schedule->tryLockJob());
+    }
+
     /**
      * If there's a job already locked, should not be able to lock another job
      */

lib/internal/Magento/Framework/Session/SessionManager.php

@@ -504,18 +504,8 @@ public function regenerateId()
             return $this;
         }
 
-        //@see http://php.net/manual/en/function.session-regenerate-id.php#53480 workaround
         if ($this->isSessionExists()) {
-            $oldSessionId = session_id();
-            session_regenerate_id();
-            $newSessionId = session_id();
-            session_id($oldSessionId);
-            session_destroy();
-
-            $oldSession = $_SESSION;
-            session_id($newSessionId);
-            session_start();
-            $_SESSION = $oldSession;
+            session_regenerate_id(true);
         } else {
             session_start();
         }