Merge pull request #4071 from magento-obsessive-owls/owls-delivery

Author: danmooney2

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/Paypal/etc/frontend/di.xml

@@ -40,6 +40,7 @@
         <arguments>
             <argument name="secureUrlList" xsi:type="array">
                 <item name="paypal_billing" xsi:type="string">/paypal/billing/</item>
+                <item name="paypal_billing_agreement" xsi:type="string">/paypal/billing_agreement/</item>
                 <item name="paypal_bml" xsi:type="string">/paypal/bml/</item>
                 <item name="paypal_hostedpro" xsi:type="string">/paypal/hostedpro/</item>
                 <item name="paypal_ipn" xsi:type="string">/paypal/ipn/</item>

app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php

@@ -38,7 +38,7 @@ public function generateCode()
         $length = $this->getActualLength();
         $code = '';
         for ($i = 0, $indexMax = strlen($alphabet) - 1; $i < $length; ++$i) {
-            $code .= substr($alphabet, mt_rand(0, $indexMax), 1);
+            $code .= substr($alphabet, random_int(0, $indexMax), 1);
         }
 
         return $code;
@@ -54,7 +54,7 @@ protected function getActualLength()
         $lengthMin = $this->getLengthMin() ? $this->getLengthMin() : static::DEFAULT_LENGTH_MIN;
         $lengthMax = $this->getLengthMax() ? $this->getLengthMax() : static::DEFAULT_LENGTH_MAX;
 
-        return $this->getLength() ? $this->getLength() : mt_rand($lengthMin, $lengthMax);
+        return $this->getLength() ? $this->getLength() : random_int($lengthMin, $lengthMax);
     }
 
     /**

app/code/Magento/Search/Model/ResourceModel/SynonymReader.php

@@ -85,11 +85,10 @@ protected function _construct()
      */
     private function queryByPhrase($phrase)
     {
-        $phrase = $this->fullTextSelect->removeSpecialCharacters($phrase);
         $matchQuery = $this->fullTextSelect->getMatchQuery(
             ['synonyms' => 'synonyms'],
             $phrase,
-            Fulltext::FULLTEXT_MODE_BOOLEAN
+            Fulltext::FULLTEXT_MODE_NATURAL
         );
         $query = $this->getConnection()->select()->from(
             $this->getMainTable()

app/code/Magento/Vault/etc/frontend/di.xml

@@ -23,4 +23,11 @@
         <plugin name="ProcessPaymentVaultConfiguration" type="Magento\Vault\Plugin\PaymentVaultConfigurationProcess"/>
         <plugin name="ProcessPaymentConfiguration" disabled="true"/>
     </type>
+    <type name="Magento\Framework\Url\SecurityInfo">
+        <arguments>
+            <argument name="secureUrlList" xsi:type="array">
+                <item name="vault" xsi:type="string">/vault/</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

composer.json

@@ -64,7 +64,8 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-zip": "*",
-        "sjparkinson/static-review": "~4.1"
+        "sjparkinson/static-review": "~4.1",
+        "paragonie/random_compat": ">=1 <9.99"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",

composer.lock

@@ -867,7 +867,7 @@ public function testSearchGroupsDataProvider()
         return [
             ['tax_class_id', 3, []],
             ['tax_class_id', 0, null],
-            ['code', md5(mt_rand(0, 10000000000) . time()), null],
+            ['code', md5(random_int(0, 10000000000) . time()), null],
             [
                 'id',
                 0,

dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.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/Catalog/Test/Fixture/Product/CustomOptions.php

@@ -325,7 +325,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}",
@@ -335,7 +335,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;