🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - magento#15016: chore: checkout last 5 commits (by @DanielRuf) - magento#15017: chore: use random_int() in some places (by @DanielRuf) - magento#15012: fix: set message-success in setup if we already have the latest version (by @DanielRuf) - magento#15002: small optimization in if-condition (by @likemusic)
sashas777 · May 8, 2018 · aca8c0b · aca8c0b
2 parents 2851994 + 4cb581a
commit aca8c0b
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,8 @@ language: php
 php:
  - 7.0
  - 7.1
+git:
+ depth: 5
 env:
  global:
  - COMPOSER_BIN_DIR=~/bin

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
  */
  protected function _getCheckboxHtml($value, $checked)
  {
- $id = 'id_' . rand(0, 999);
+ $id = 'id_' . random_int(0, 999);
  $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
  $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
  $html .= 'id="' . $id . '" data-role="select-row"';

diff --git a/...de/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/...de/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -28,14 +28,25 @@ class AttributeFilter
  public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
  {
  foreach ($productData as $attribute => $value) {
- $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
- if ($value === '' && $considerUseDefaultsAttribute) {
- /** @var $product Product */
- if ((bool)$product->getData($attribute) === (bool)$value) {
- unset($productData[$attribute]);
- }
+ if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
+ unset($productData[$attribute]);
  }
  }
+
  return $productData;
  }
+
+ /**
+ * @param Product $product
+ * @param $useDefaults
+ * @param $attribute
+ * @param $value
+ * @return bool
+ */
+ private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value)
+ {
+ $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
+
+ return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+ }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -594,7 +594,7 @@ protected function getTemporaryTreeIndexTableName()
  if (empty($this->tempTreeIndexTableName)) {
  $this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
  . '_'
- . substr(md5(time() . rand(0, 999999999)), 0, 8);
+ . substr(md5(time() . random_int(0, 999999999)), 0, 8);
  }
 
  return $this->tempTreeIndexTableName;

diff --git a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php b/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);
  }
 
  /**

diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
@@ -521,7 +521,7 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
  $coupon->setCode(
  $couponCode . self::getCouponCodeGenerator()->getDelimiter() . sprintf(
  '%04u',
- rand(0, 9999)
+ random_int(0, 9999)
  )
  );
  continue;

diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -75,7 +75,7 @@ public function __construct(
  $abc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
  $initVector = '';
  for ($i = 0; $i < $initVectorSize; $i++) {
- $initVector .= $abc[rand(0, strlen($abc) - 1)];
+ $initVector .= $abc[random_int(0, strlen($abc) - 1)];
  }
  } elseif (false === $initVector) {
  /* Set vector to zero bytes to not use it */

diff --git a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
@@ -29,6 +29,6 @@ class BackendFrontnameGenerator
  public static function generate()
  {
  return self::ADMIN_AREA_PATH_PREFIX
- . substr(base_convert(rand(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
+ . substr(base_convert(random_int(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
  }
 }
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -317,7 +317,7 @@ public function apiShutdownFunction()
  protected function _saveFatalErrorReport($reportData)
  {
  $this->directoryWrite->create('report/api');
- $reportId = abs(intval(microtime(true) * rand(100, 1000)));
+ $reportId = abs(intval(microtime(true) * random_int(100, 1000)));
  $this->directoryWrite->writeFile('report/api/' . $reportId, $this->serializer->serialize($reportData));
  return $reportId;
  }

diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -463,7 +463,7 @@ protected function _setReportData($reportData)
  public function saveReport($reportData)
  {
  $this->reportData = $reportData;
- $this->reportId = abs(intval(microtime(true) * rand(100, 1000)));
+ $this->reportId = abs(intval(microtime(true) * random_int(100, 1000)));
  $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
  $this->_setReportData($reportData);
 

diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
@@ -13,6 +13,7 @@ angular.module('select-version', ['ngStorage'])
  $scope.upgradeReadyForNext = false;
  $scope.upgradeProcessed = false;
  $scope.upgradeProcessError = false;
+ $scope.upgradeAlreadyLatestVersion = false;
  $scope.upgradeProcessErrorMessage = '';
  $scope.componentsReadyForNext = true;
  $scope.componentsProcessed = false;
@@ -39,6 +40,7 @@ angular.module('select-version', ['ngStorage'])
 
  if ($scope.upgradeProcessError) {
  $scope.upgradeProcessErrorMessage = "You're already using the latest version, there's nothing for us to do.";
+ $scope.upgradeAlreadyLatestVersion = true;
  } else {
  $scope.selectedOption = [];
  $scope.versions = [];

diff --git a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
@@ -18,7 +18,7 @@ class AddressDataGenerator
  public function generateAddress()
  {
  return [
- 'postcode' => mt_rand(10000, 99999)
+ 'postcode' => random_int(10000, 99999)
  ];
  }
 }
diff --git a/setup/src/Magento/Setup/Model/DataGenerator.php b/setup/src/Magento/Setup/Model/DataGenerator.php
@@ -67,12 +67,12 @@ protected function readData()
  */
  public function generate($minAmountOfWords, $maxAmountOfWords, $key = null)
  {
- $numberOfWords = mt_rand($minAmountOfWords, $maxAmountOfWords);
+ $numberOfWords = random_int($minAmountOfWords, $maxAmountOfWords);
  $result = '';
 
  if ($key === null || !array_key_exists($key, $this->generatedValues)) {
  for ($i = 0; $i < $numberOfWords; $i++) {
- $result .= ' ' . $this->dictionaryData[mt_rand(0, count($this->dictionaryData) - 1)];
+ $result .= ' ' . $this->dictionaryData[random_int(0, count($this->dictionaryData) - 1)];
  }
  $result = trim($result);
 

diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
@@ -63,7 +63,7 @@ public function generate()
  */
  private function generateRawDescription()
  {
- $paragraphsCount = mt_rand(
+ $paragraphsCount = random_int(
  $this->descriptionConfig['paragraphs']['count-min'],
  $this->descriptionConfig['paragraphs']['count-max']
  );

diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
  */
  public function generate()
  {
- $sentencesCount = mt_rand(
+ $sentencesCount = random_int(
  $this->paragraphConfig['sentences']['count-min'],
  $this->paragraphConfig['sentences']['count-max']
  );

diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
  */
  public function generate()
  {
- $sentenceWordsCount = mt_rand(
+ $sentenceWordsCount = random_int(
  $this->sentenceConfig['words']['count-min'],
  $this->sentenceConfig['words']['count-max']
  );

diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
  return $this->wordWrapper->wrapWords(
  $text,
- $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+ $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
  '<b>%s</b>'
  );
  }

diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
@@ -27,7 +27,7 @@ public function getRandomWords($source, $count)
  $randWords = [];
  $wordsSize = count($words);
  while ($count) {
- $randWords[] = $words[mt_rand(0, $wordsSize - 1)];
+ $randWords[] = $words[random_int(0, $wordsSize - 1)];
  $count--;
  }
 

diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
  return $this->wordWrapper->wrapWords(
  $text,
- $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+ $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
  '<i>%s</i>'
  );
  }

diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
  return $this->wordWrapper->wrapWords(
  $text,
- $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+ $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
  '<span>%s</span>'
  );
  }

diff --git a/setup/src/Magento/Setup/Model/Dictionary.php b/setup/src/Magento/Setup/Model/Dictionary.php
@@ -40,7 +40,7 @@ public function getRandWord()
  $this->readDictionary();
  }
 
- $randIndex = mt_rand(0, count($this->dictionary) - 1);
+ $randIndex = random_int(0, count($this->dictionary) - 1);
  return trim($this->dictionary[$randIndex]);
  }
 

diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
@@ -38,7 +38,10 @@
  </span>
  <span class="message-text">Checking for a new version...</span>
  </div>
- <div class="message message-error" ng-show="upgradeProcessError">
+ <div
+ class="message"
+ ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'"
+ ng-show="upgradeProcessError">
  <span class="message-text" ng-bind-html="upgradeProcessErrorMessage"></span>
  </div>
  <div class="message" ng-show="upgradeProcessed && !upgradeProcessError && currentVersion">