Merge pull request #3966 from magento-obsessive-owls/MC-5894

[Owls] 2.3 Bug Fix

Author: cspruiell

app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml

@@ -8,7 +8,7 @@
  * @var \Magento\Braintree\Block\Paypal\Button $block
  */
 
-$id = $block->getContainerId() . mt_rand();
+$id = $block->getContainerId() . random_int(0, PHP_INT_MAX);
 
 $config = [
     'Magento_Braintree/js/paypal/button' => [

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -1238,8 +1238,7 @@ public function testInitiatePasswordResetEmailReminder()
 
         $storeId = 1;
 
-        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
-        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+        $hash = hash("sha256", uniqid(microtime() . random_int(0, PHP_INT_MAX), true));
 
         $this->emailNotificationMock->expects($this->once())
             ->method('passwordReminder')
@@ -1263,8 +1262,7 @@ public function testInitiatePasswordResetEmailReset()
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
 
-        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
-        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+        $hash = hash("sha256", uniqid(microtime() . random_int(0, PHP_INT_MAX), true));
 
         $this->emailNotificationMock->expects($this->once())
             ->method('passwordResetConfirmation')
@@ -1288,8 +1286,7 @@ public function testInitiatePasswordResetNoTemplate()
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
 
-        mt_srand(mt_rand() + (100000000 * (float)microtime()) % PHP_INT_MAX);
-        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+        $hash = hash("sha256", uniqid(microtime() . random_int(0, PHP_INT_MAX), true));
 
         $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
 

dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php

@@ -55,22 +55,6 @@ public function setUp()
         $this->customerGroupFactory = $objectManager->create(\Magento\Customer\Api\Data\GroupInterfaceFactory::class);
     }
 
-    /**
-     * Execute per test cleanup.
-     */
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
-
-    /**
-     * Cleaning up the extra groups that might have been created as part of the testing.
-     */
-    public static function tearDownAfterClass()
-    {
-        parent::tearDownAfterClass();
-    }
-
     /**
      * Verify the retrieval of a customer group by Id.
      *
@@ -874,7 +858,7 @@ public function testSearchGroupsDataProvider()
         return [
             ['tax_class_id', 3, []],
             ['tax_class_id', 0, null],
-            ['code', md5(mt_rand(0, 10000000000) . time()), null],
+            ['code', hash("sha256", random_int(0, 10000000000) . time()), null],
             [
                 'id',
                 0,

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/CustomOptions.php

@@ -45,7 +45,7 @@ public function __construct(
 
         if (isset($data['dataset']) && isset($this->params['repository'])) {
             $this->data = $repositoryFactory->get($this->params['repository'])->get($data['dataset']);
-            $this->data = $this->replaceData($this->data, mt_rand());
+            $this->data = $this->replaceData($this->data, random_int(0, PHP_INT_MAX));
             $this->customOptions = $this->data;
         }
         if (isset($data['import_products'])) {

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php

@@ -360,7 +360,7 @@ protected function addVariationMatrix(array $variationsMatrix, array $attribute,
 
         /* If empty matrix add one empty row */
         if (empty($variationsMatrix)) {
-            $variationIsolation = mt_rand(10000, 70000);
+            $variationIsolation = random_int(10000, 70000);
             $variationsMatrix = [
                 [
                     'name' => "In configurable product {$variationIsolation}",
@@ -370,7 +370,7 @@ protected function addVariationMatrix(array $variationsMatrix, array $attribute,
         }
 
         foreach ($variationsMatrix as $rowKey => $row) {
-            $randIsolation = mt_rand(1, 100);
+            $randIsolation = random_int(1, 100);
             $rowName = $row['name'];
             $rowSku = $row['sku'];
             $index = 1;

dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php

@@ -96,7 +96,7 @@ public function test($product, $countProducts, $countSearch)
      */
     protected function createProducts($product, $countProduct)
     {
-        $name = 'simpleProductName' . mt_rand();
+        $name = 'simpleProductName' . random_int(0, PHP_INT_MAX);
         for ($i = 0; $i < $countProduct; $i++) {
             $productFixture = $this->fixtureFactory->createByCode(
                 'catalogProductSimple',

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/SalesTest.php

@@ -53,7 +53,7 @@ public function setUp()
             \Magento\Framework\View\LayoutInterface::class
         )->createBlock(
             \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Sales::class,
-            'sales_' . mt_rand(),
+            'sales_' . random_int(0, PHP_INT_MAX),
             ['coreRegistry' => $this->coreRegistry]
         )->setTemplate(
             'tab/view/sales.phtml'

dev/tests/integration/testsuite/Magento/Framework/Model/ResourceModel/Db/ProfilerTest.php

@@ -9,6 +9,9 @@
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
 
+/**
+ * Class ProfilerTest
+ */
 class ProfilerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -21,17 +24,27 @@ class ProfilerTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_testResourceName = 'testtest_0000_setup';
 
+    /**
+     * @inheritdoc
+     *
+     * phpcs:disable Magento2.Functions.StaticFunction
+     */
     public static function setUpBeforeClass()
     {
-        self::$_testResourceName = 'testtest_' . mt_rand(1000, 9999) . '_setup';
+        self::$_testResourceName = 'testtest_' . random_int(1000, 9999) . '_setup';
 
         \Magento\Framework\Profiler::enable();
-    }
+    } // phpcs:enable
 
+    /**
+     * @inheritdoc
+     *
+     * phpcs:disable Magento2.Functions.StaticFunction
+     */
     public static function tearDownAfterClass()
     {
         \Magento\Framework\Profiler::disable();
-    }
+    } // phpcs:enable
 
     protected function setUp()
     {
@@ -126,19 +139,20 @@ public function testProfilerDuringSqlException()
         $connection = $this->_getConnection();
 
         try {
-            $connection->query('SELECT * FROM unknown_table');
+            $connection->select()->from('unknown_table')->query()->fetch();
         } catch (\Zend_Db_Statement_Exception $exception) {
+            $this->assertNotEmpty($exception);
         }
 
         if (!isset($exception)) {
-            $this->fail("Expected exception didn't thrown!");
+            $this->fail("Expected exception wasn't thrown!");
         }
 
         /** @var \Magento\Framework\App\ResourceConnection $resource */
         $resource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Framework\App\ResourceConnection::class);
         $testTableName = $resource->getTableName('setup_module');
-        $connection->query('SELECT * FROM ' . $testTableName);
+        $connection->select()->from($testTableName)->query()->fetch();
 
         /** @var \Magento\Framework\Model\ResourceModel\Db\Profiler $profiler */
         $profiler = $connection->getProfiler();

dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php

@@ -95,7 +95,7 @@ public function testGetVersion()
         $model->create();
         $this->assertEquals(0, $model->getVersion());
         $changelogName = $this->resource->getTableName($model->getName());
-        $this->connection->insert($changelogName, [$model->getColumnName() => mt_rand(1, 200)]);
+        $this->connection->insert($changelogName, [$model->getColumnName() => random_int(1, 200)]);
         $this->assertEquals($this->connection->lastInsertId($changelogName, 'version_id'), $model->getVersion());
         $model->drop();
     }

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/FormTest.php

@@ -68,7 +68,7 @@ protected function setUp()
         $layout = $this->objectManager->get(LayoutInterface::class);
         $this->block = $layout->createBlock(
             Form::class,
-            'order_create_block' . mt_rand(),
+            'order_create_block' . random_int(0, PHP_INT_MAX),
             ['sessionQuote' => $this->session]
         );
         parent::setUp();