Merge branch '1.1' into 1.2

* 1.1: Php Inspections (EA Ultimate): minor code tweaks Add label for issues/pr's that should not be staled
ezecosystem · Jul 2, 2018 · cceb49e · cceb49e
2 parents 11a8010 + 790194a
commit cceb49e
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 16 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -3,6 +3,7 @@ daysUntilClose: 7
 exemptLabels:
   - Bug
   - Critical
+  - Do not stale
 staleLabel: Stale
 markComment: >
   This issue has been automatically marked as stale because it has not had any

diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php
@@ -85,9 +85,7 @@ public function iShouldSeeTheProductVariantNamedAnd(...$names)
      */
     public function iShouldSeeTheProductVariantLabeledAs($label)
     {
-        $itemsLabels = array_map(function ($item) {
-            return $item['descriptor'];
-        }, $this->getJSONResponse());
+        $itemsLabels = array_column($this->getJSONResponse(), 'descriptor');
 
         Assert::oneOf($label, $itemsLabels, 'Expected "%s" to be on the list, found: %s.');
     }

diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php
@@ -97,9 +97,7 @@ public function iShouldSeeTaxonsInTheList($number)
     public function iShouldSeeTheTaxonNamedAnd(...$expectedTaxonNames)
     {
         $response = json_decode($this->client->getResponse()->getContent(), true);
-        $taxonNames = array_map(function ($item) {
-            return $item['name'];
-        }, $response);
+        $taxonNames = array_column($response, 'name');
 
         Assert::allOneOf($taxonNames, $expectedTaxonNames);
     }

diff --git a/src/Sylius/Behat/Context/Setup/ProductContext.php b/src/Sylius/Behat/Context/Setup/ProductContext.php
@@ -342,7 +342,7 @@ public function theProductHasVariantPricedAt(
             $productVariantName,
             $price,
             StringInflector::nameToUppercaseCode($productVariantName),
-            (null !== $channel) ? $channel : $this->sharedStorage->get('channel')
+            $channel ?? $this->sharedStorage->get('channel')
         );
     }
 

diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php
@@ -848,7 +848,7 @@ public function iShouldNotSeeInformationAboutShipments()
      */
     private function assertElementValidationMessage($type, $element, $expectedMessage)
     {
-        $element = sprintf('%s_%s', $type, implode('_', explode(' ', $element)));
+        $element = sprintf('%s_%s', $type, str_replace(' ', '_', $element));
         Assert::true($this->updatePage->checkValidationMessageFor($element, $expectedMessage));
     }
 }
diff --git a/src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php b/src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php
@@ -412,7 +412,7 @@ private function createDefaultAddress()
      */
     private function assertElementValidationMessage($type, $element, $expectedMessage)
     {
-        $element = sprintf('%s_%s', $type, implode('_', explode(' ', $element)));
+        $element = sprintf('%s_%s', $type, str_replace(' ', '_', $element));
         Assert::true($this->addressPage->checkValidationMessageFor($element, $expectedMessage));
     }
 }
diff --git a/src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php b/src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php
@@ -75,7 +75,7 @@ public function isCurrencyChosen($currencyCode)
      */
     public function chooseDefaultTaxZone($taxZone)
     {
-        $this->getDocument()->selectFieldOption('Default tax zone', (null === $taxZone) ? '' : $taxZone);
+        $this->getDocument()->selectFieldOption('Default tax zone', $taxZone ?? '');
     }
 
     /**

diff --git a/src/Sylius/Behat/Page/Admin/Order/UpdatePage.php b/src/Sylius/Behat/Page/Admin/Order/UpdatePage.php
@@ -113,7 +113,7 @@ private function specifyElementValue($elementName, $value)
      */
     private function chooseCountry($country, $addressType)
     {
-        $this->getElement($addressType . '_country')->selectOption((null !== $country) ? $country : 'Select');
+        $this->getElement($addressType . '_country')->selectOption($country ?? 'Select');
     }
 
     /**

diff --git a/src/Sylius/Behat/Page/SymfonyPage.php b/src/Sylius/Behat/Page/SymfonyPage.php
@@ -60,7 +60,7 @@ protected function getUrl(array $urlParameters = [])
             $replace[sprintf('?%s=%s', $key, $value)] = '';
         }
 
-        $path = str_replace(array_keys($replace), array_values($replace), $path);
+        $path = str_replace(array_keys($replace), $replace, $path);
 
         return $this->makePathAbsolute($path);
     }

diff --git a/src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php b/src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php
@@ -113,6 +113,6 @@ private function removeUnusedQueryArgument(string $url, string $key, string $val
             sprintf('?%s=%s', $key, $value) => '',
         ];
 
-        return str_replace(array_keys($replace), array_values($replace), $url);
+        return str_replace(array_keys($replace), $replace, $url);
     }
 }
diff --git a/src/Sylius/Bundle/ThemeBundle/Loader/CircularDependencyChecker.php b/src/Sylius/Bundle/ThemeBundle/Loader/CircularDependencyChecker.php
@@ -26,7 +26,7 @@ public function check(ThemeInterface $theme, array $previousThemes = []): void
             return;
         }
 
-        $previousThemes = array_merge($previousThemes, [$theme]);
+        $previousThemes[] = $theme;
         foreach ($theme->getParents() as $parent) {
             if (in_array($parent, $previousThemes, true)) {
                 throw new CircularDependencyFoundException(array_merge($previousThemes, [$parent]));

diff --git a/src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php b/src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php
@@ -123,7 +123,7 @@ public function create(?string $code = null, ?string $name = null, ?string $curr
      */
     private function provideCurrency(?string $currencyCode): CurrencyInterface
     {
-        $currencyCode = (null !== $currencyCode) ? $currencyCode : self::DEFAULT_CHANNEL_CURRENCY;
+        $currencyCode = $currencyCode ?? self::DEFAULT_CHANNEL_CURRENCY;
 
         /** @var CurrencyInterface $currency */
         $currency = $this->currencyRepository->findOneBy(['code' => $currencyCode]);

diff --git a/src/Sylius/Component/Promotion/Model/Promotion.php b/src/Sylius/Component/Promotion/Model/Promotion.php
@@ -173,7 +173,7 @@ public function getPriority(): int
      */
     public function setPriority(?int $priority): void
     {
-        $this->priority = null === $priority ? -1 : $priority;
+        $this->priority = $priority ?? -1;
     }
 
     /**