Fix PHPStorm findings

sonata-project · Dec 6, 2019 · b9ac023 · b9ac023
1 parent c07455e
commit b9ac023
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 63 deletions.
diff --git a/src/DependencyInjection/Compiler/StrictPass.php b/src/DependencyInjection/Compiler/StrictPass.php
@@ -51,11 +51,6 @@ public function process(ContainerBuilder $container)
      */
     private function changeReference(Reference $reference, $serviceId)
     {
-        // Stay compatible with Symfony 2
-        if (method_exists($reference, 'isStrict')) {
-            return new Reference($serviceId, $reference->getInvalidBehavior(), $reference->isStrict(false));
-        }
-
         return new Reference($serviceId, $reference->getInvalidBehavior());
     }
 }
diff --git a/src/DependencyInjection/SonataIntlExtension.php b/src/DependencyInjection/SonataIntlExtension.php
@@ -107,12 +107,15 @@ protected function configureLocale(ContainerBuilder $container, array $config)
      */
     private function validateTimezones(array $timezones)
     {
-        try {
-            foreach ($timezones as $timezone) {
-                $tz = new \DateTimeZone($timezone);
+        foreach ($timezones as $timezone) {
+            try {
+                new \DateTimeZone($timezone);
+            } catch (\Exception $e) {
+                throw new \RuntimeException(sprintf(
+                    'Unknown timezone "%s". Please check your sonata_intl configuration.',
+                    $timezone
+                ));
             }
-        } catch (\Exception $e) {
-            throw new \RuntimeException(sprintf('Unknown timezone "%s". Please check your sonata_intl configuration.', $timezone));
         }
     }
 }
diff --git a/src/SonataIntlBundle.php b/src/SonataIntlBundle.php
@@ -23,7 +23,7 @@ class SonataIntlBundle extends Bundle
      *
      * @static
      *
-     * @param $version
+     * @param string $version
      *
      * @return string
      */

diff --git a/src/Templating/Helper/BaseHelper.php b/src/Templating/Helper/BaseHelper.php
@@ -76,8 +76,7 @@ public static function getICUDataVersion()
 
         ob_start();
         phpinfo();
-        $content = ob_get_contents();
-        ob_end_clean();
+        $content = ob_get_clean();
 
         $info = explode("\n", $content);
 

diff --git a/src/Templating/Helper/DateTimeHelper.php b/src/Templating/Helper/DateTimeHelper.php
@@ -61,7 +61,7 @@ public function formatDate($date, $locale = null, $timezone = null, $dateType =
 
         $formatter = self::createInstance([
             'locale' => $locale ?: $this->localeDetector->getLocale(),
-            'datetype' => null === $dateType ? \IntlDateFormatter::MEDIUM : $dateType,
+            'datetype' => $dateType ?? \IntlDateFormatter::MEDIUM,
             'timetype' => \IntlDateFormatter::NONE,
             'timezone' => $timezone ?: $this->timezoneDetector->getTimezone(),
             'calendar' => \IntlDateFormatter::GREGORIAN,
@@ -85,8 +85,8 @@ public function formatDateTime($datetime, $locale = null, $timezone = null, $dat
 
         $formatter = self::createInstance([
             'locale' => $locale ?: $this->localeDetector->getLocale(),
-            'datetype' => null === $dateType ? \IntlDateFormatter::MEDIUM : $dateType,
-            'timetype' => null === $timeType ? \IntlDateFormatter::MEDIUM : $timeType,
+            'datetype' => $dateType ?? \IntlDateFormatter::MEDIUM,
+            'timetype' => $timeType ?? \IntlDateFormatter::MEDIUM,
             'timezone' => $timezone ?: $this->timezoneDetector->getTimezone(),
             'calendar' => \IntlDateFormatter::GREGORIAN,
         ]);
@@ -109,7 +109,7 @@ public function formatTime($time, $locale = null, $timezone = null, $timeType =
         $formatter = self::createInstance([
             'locale' => $locale ?: $this->localeDetector->getLocale(),
             'datetype' => \IntlDateFormatter::NONE,
-            'timetype' => null === $timeType ? \IntlDateFormatter::MEDIUM : $timeType,
+            'timetype' => $timeType ?? \IntlDateFormatter::MEDIUM,
             'timezone' => $timezone ?: $this->timezoneDetector->getTimezone(),
             'calendar' => \IntlDateFormatter::GREGORIAN,
         ]);
@@ -119,7 +119,7 @@ public function formatTime($time, $locale = null, $timezone = null, $timeType =
 
     /**
      * @param \DateTime|\DateTimeInterface|string|int $datetime
-     * @param                                         $pattern
+     * @param string                                  $pattern
      * @param string|null                             $locale
      * @param string|null                             $timezone
      *

diff --git a/src/Templating/Helper/LocaleHelper.php b/src/Templating/Helper/LocaleHelper.php
@@ -40,7 +40,7 @@ public function country($code, $locale = null)
             return $name ? $this->fixCharset($name) : '';
         }
 
-        return Countries::getName($code, $locale ?: $this->localeDetector->getLocale());
+        return $this->fixCharset(Countries::getName($code, $locale ?: $this->localeDetector->getLocale()));
     }
 
     /**
@@ -82,7 +82,7 @@ public function locale($code, $locale = null)
             return $name ? $this->fixCharset($name) : '';
         }
 
-        return Locales::getName($code, $locale ?: $this->localeDetector->getLocale());
+        return $this->fixCharset(Locales::getName($code, $locale ?: $this->localeDetector->getLocale()));
     }
 
     /**

diff --git a/src/Templating/Helper/NumberHelper.php b/src/Templating/Helper/NumberHelper.php
@@ -69,7 +69,7 @@ public function formatPercent($number, array $attributes = [], array $textAttrib
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->format($number, \NumberFormatter::PERCENT, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -89,7 +89,7 @@ public function formatDuration($number, array $attributes = [], array $textAttri
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->format($number, \NumberFormatter::DURATION, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -109,7 +109,7 @@ public function formatDecimal($number, array $attributes = [], array $textAttrib
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->format($number, \NumberFormatter::DECIMAL, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -129,7 +129,7 @@ public function formatSpellout($number, array $attributes = [], array $textAttri
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->format($number, \NumberFormatter::SPELLOUT, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -155,7 +155,7 @@ public function formatCurrency($number, $currency, array $attributes = [], array
 
         $methodArgs = array_pad(\func_get_args(), 6, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[4], $methodArgs[5]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[4], $methodArgs[5]);
 
         $formatter = $this->getFormatter($locale ?: $this->localeDetector->getLocale(), \NumberFormatter::CURRENCY, $attributes, $textAttributes, $symbols);
 
@@ -177,7 +177,7 @@ public function formatScientific($number, array $attributes = [], array $textAtt
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->format($number, \NumberFormatter::SCIENTIFIC, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -197,7 +197,7 @@ public function formatOrdinal($number, array $attributes = [], array $textAttrib
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->format($number, \NumberFormatter::ORDINAL, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -207,7 +207,7 @@ public function formatOrdinal($number, array $attributes = [], array $textAttrib
      * attributes.
      *
      * @param string|float|int $number         The number to format
-     * @param                  $style
+     * @param string           $style
      * @param array            $attributes     The attributes used by the formatter
      * @param array            $textAttributes The text attributes used by the formatter
      * @param string|null      $locale         The locale used to format the number
@@ -218,7 +218,7 @@ public function format($number, $style, array $attributes = [], array $textAttri
     {
         $methodArgs = array_pad(\func_get_args(), 6, null);
 
-        list($locale, $symbols) = $this->normalizeMethodSignature($methodArgs[4], $methodArgs[5]);
+        [$locale, $symbols] = $this->normalizeMethodSignature($methodArgs[4], $methodArgs[5]);
 
         $formatter = $this->getFormatter($locale ?: $this->localeDetector->getLocale(), $style, $attributes, $textAttributes, $symbols);
 

diff --git a/src/Timezone/LocaleBasedTimezoneDetector.php b/src/Timezone/LocaleBasedTimezoneDetector.php
@@ -45,6 +45,6 @@ public function getTimezone()
     {
         $locale = $this->localeDetector->getLocale();
 
-        return isset($this->timezoneMap[$locale]) ? $this->timezoneMap[$locale] : null;
+        return $this->timezoneMap[$locale] ?? null;
     }
 }
diff --git a/src/Twig/Extension/DateTimeExtension.php b/src/Twig/Extension/DateTimeExtension.php
@@ -47,7 +47,7 @@ public function getFilters()
     }
 
     /**
-     * @param \Datetime|string|int $date
+     * @param \DateTime|string|int $date
      * @param string|null          $pattern
      * @param string|null          $locale
      * @param string|null          $timezone
@@ -65,7 +65,7 @@ public function formatDate($date, $pattern = null, $locale = null, $timezone = n
     }
 
     /**
-     * @param \Datetime|string|int $time
+     * @param \DateTime|string|int $time
      * @param string|null          $pattern
      * @param string|null          $locale
      * @param string|null          $timezone
@@ -83,7 +83,7 @@ public function formatTime($time, $pattern = null, $locale = null, $timezone = n
     }
 
     /**
-     * @param \Datetime|string|int $time
+     * @param \DateTime|string|int $time
      * @param string|null          $pattern
      * @param string|null          $locale
      * @param string|null          $timezone

diff --git a/src/Twig/Extension/NumberExtension.php b/src/Twig/Extension/NumberExtension.php
@@ -81,7 +81,7 @@ public function formatCurrency($number, $currency, array $attributes = [], array
     {
         $methodArgs = array_pad(\func_get_args(), 6, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[4], $methodArgs[5]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[4], $methodArgs[5]);
 
         return $this->helper->formatCurrency($number, $currency, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -101,7 +101,7 @@ public function formatDecimal($number, array $attributes = [], array $textAttrib
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->helper->formatDecimal($number, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -121,7 +121,7 @@ public function formatScientific($number, array $attributes = [], array $textAtt
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->helper->formatScientific($number, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -141,7 +141,7 @@ public function formatSpellout($number, array $attributes = [], array $textAttri
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->helper->formatSpellout($number, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -161,7 +161,7 @@ public function formatPercent($number, array $attributes = [], array $textAttrib
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->helper->formatPercent($number, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -181,7 +181,7 @@ public function formatDuration($number, array $attributes = [], array $textAttri
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->helper->formatDuration($number, $attributes, $textAttributes, $symbols, $locale);
     }
@@ -201,7 +201,7 @@ public function formatOrdinal($number, array $attributes = [], array $textAttrib
     {
         $methodArgs = array_pad(\func_get_args(), 5, null);
 
-        list($locale, $symbols) = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
+        [$locale, $symbols] = $this->helper->normalizeMethodSignature($methodArgs[3], $methodArgs[4]);
 
         return $this->helper->formatOrdinal($number, $attributes, $textAttributes, $symbols, $locale);
     }

diff --git a/tests/Helper/DateTimeHelperTest.php b/tests/Helper/DateTimeHelperTest.php
@@ -32,11 +32,11 @@ protected function setUp(): void
     public function testLocale()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
-        $localeDetector->expects($this->any())
+        $localeDetector
             ->method('getLocale')->willReturn('en');
 
         $timezoneDetector = $this->createMock(TimezoneDetectorInterface::class);
-        $timezoneDetector->expects($this->any())
+        $timezoneDetector
             ->method('getTimezone')->willReturn('Europe/Paris');
 
         $helper = new DateTimeHelper($timezoneDetector, 'UTF-8', $localeDetector);
@@ -79,15 +79,15 @@ public function testLocale()
     public function testLocaleTimezones()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
-        $localeDetector->expects($this->any())
+        $localeDetector
             ->method('getLocale')->willReturn('en');
 
         $timezoneDetector = $this->createMock(TimezoneDetectorInterface::class);
-        $timezoneDetector->expects($this->any())
+        $timezoneDetector
             ->method('getTimezone')->willReturn('Europe/London');
 
         $timezoneDetectorWithMapping = $this->createMock(TimezoneDetectorInterface::class);
-        $timezoneDetectorWithMapping->expects($this->any())
+        $timezoneDetectorWithMapping
             ->method('getTimezone')->willReturn('Europe/Paris');
 
         $this->assertSame('Europe/London', $timezoneDetector->getTimezone());
@@ -118,11 +118,11 @@ public function testLocaleTimezones()
     public function testImmutable()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
-        $localeDetector->expects($this->any())
+        $localeDetector
             ->method('getLocale')->willReturn('en');
 
         $timezoneDetector = $this->createMock(TimezoneDetectorInterface::class);
-        $timezoneDetector->expects($this->any())
+        $timezoneDetector
             ->method('getTimezone')->willReturn('Europe/Paris');
 
         $helper = new DateTimeHelper($timezoneDetector, 'UTF-8', $localeDetector);

diff --git a/tests/Helper/LocaleHelperTest.php b/tests/Helper/LocaleHelperTest.php
@@ -22,7 +22,7 @@ class LocaleHelperTest extends TestCase
     public function getHelper()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
-        $localeDetector->expects($this->any())
+        $localeDetector
             ->method('getLocale')->willReturn('fr');
 
         return new LocaleHelper('UTF-8', $localeDetector);

diff --git a/tests/Helper/NumberHelperTest.php b/tests/Helper/NumberHelperTest.php
@@ -100,7 +100,7 @@ public function testExceptionOnInvalidParams()
         $this->assertNull($formatter);
 
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
-        $localeDetector->expects($this->any())
+        $localeDetector
             ->method('getLocale')->willReturn('en');
 
         $helper = new NumberHelper('UTF-8', $localeDetector, ['fraction_digits' => 2], ['negative_prefix' => 'MINUS']);
@@ -236,7 +236,6 @@ private function createLocaleDetectorMock()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
         $localeDetector
-            ->expects($this->any())
             ->method('getLocale')->willReturn('en')
         ;
 

diff --git a/tests/Locale/RequestStackDetectorTest.php b/tests/Locale/RequestStackDetectorTest.php
@@ -29,13 +29,11 @@ public function testGetLocale()
         $request = $this->createMock(Request::class);
 
         $requestStack
-            ->expects($this->any())
             ->method('getCurrentRequest')
             ->willReturn($request)
         ;
 
         $request
-            ->expects($this->any())
             ->method('getLocale')
             ->willReturn('en')
         ;

diff --git a/tests/Timezone/ChainTimezoneDetectorTest.php b/tests/Timezone/ChainTimezoneDetectorTest.php
@@ -43,7 +43,6 @@ public function testDetectsTimezoneForUser($detectorsTimezones, $expectedTimezon
         foreach ($detectorsTimezones as $timezone) {
             $timezoneDetector = $this->createMock(TimezoneDetectorInterface::class);
             $timezoneDetector
-                ->expects($this->any())
                 ->method('getTimezone')
                 ->willReturn($timezone)
             ;

diff --git a/tests/Timezone/LocaleBasedTimezoneDetectorTest.php b/tests/Timezone/LocaleBasedTimezoneDetectorTest.php
@@ -26,7 +26,6 @@ public function testDetectsTimezoneForLocale()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
         $localeDetector
-            ->expects($this->any())
             ->method('getLocale')
             ->willReturn('fr')
         ;
@@ -39,7 +38,6 @@ public function testTimezoneNotDetected()
     {
         $localeDetector = $this->createMock(LocaleDetectorInterface::class);
         $localeDetector
-            ->expects($this->any())
             ->method('getLocale')
             ->willReturn('de')
         ;