[Tests][Twig] Upgraded & fixed FileSizeExtensionTest

Author: alongosz

tests/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtensionTest.php

@@ -14,127 +14,83 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Test\IntegrationTestCase;
 
-/**
- * Class FileSizeExtensionTest.
- */
-class FileSizeExtensionTest extends IntegrationTestCase
+final class FileSizeExtensionTest extends IntegrationTestCase
 {
-    /**
-     * @param string $locale
-     */
-    protected $locale;
-
-    /**
-     * @param array $suffixes
-     */
-    protected $suffixes = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB'];
-
-    /**
-     * @param TranslatorInterface|MockObject
-     */
-    protected $translatorMock;
-
-    /**
-     * @param ConfigResolverInterface|MockObject
-     */
-    protected $configResolverInterfaceMock;
-
-    /**
-     * @param LocaleConverterInterface|MockObject
-     */
-    protected $localeConverterInterfaceMock;
-
-    /**
-     * @param string $locale
-     * @param string $defaultLocale
-     */
+    protected string $locale = '';
+
+    /** @var string[] */
+    protected array $suffixes = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB'];
+
+    protected TranslatorInterface & MockObject $translatorMock;
+
+    protected ConfigResolverInterface & MockObject $configResolverInterfaceMock;
+
+    protected LocaleConverterInterface & MockObject $localeConverterInterfaceMock;
+
     protected function setConfigurationLocale(
-        $locale,
-        $defaultLocale
-    ) {
+        string $locale,
+        string $defaultLocale
+    ): void {
         locale_set_default($defaultLocale);
         $this->locale = $locale;
     }
 
-    /**
-     * @return string $locale
-     */
-    public function getLocale()
+    public function getLocale(): string
     {
-        return [$this->locale];
+        return $this->locale;
     }
 
-    /**
-     * @return array
-     */
-    protected function getExtensions()
+    protected function getExtensions(): array
     {
         return [
             new FileSizeExtension($this->getTranslatorInterfaceMock(), $this->suffixes, $this->getConfigResolverInterfaceMock(), $this->getLocaleConverterInterfaceMock()),
         ];
     }
 
-    protected function getFixturesDir(): string
+    protected static function getFixturesDirectory(): string
     {
         return __DIR__ . '/_fixtures/functions/ibexa_file_size';
     }
 
-    /**
-     * @return ConfigResolverInterface|MockObject
-     */
-    protected function getConfigResolverInterfaceMock()
+    protected function getConfigResolverInterfaceMock(): ConfigResolverInterface & MockObject
     {
         $configResolverInterfaceMock = $this->createMock(ConfigResolverInterface::class);
-        $configResolverInterfaceMock->expects(self::any())
+        $configResolverInterfaceMock->expects(self::atLeastOnce())
             ->method('getParameter')
             ->with('languages')
-            ->will(self::returnValue($this->getLocale()));
+            ->willReturn([$this->getLocale()]);
 
         return $configResolverInterfaceMock;
     }
 
-    /**
-     * @return LocaleConverterInterface|MockObject
-     */
-    protected function getLocaleConverterInterfaceMock()
+    protected function getLocaleConverterInterfaceMock(): LocaleConverterInterface & MockObject
     {
         $this->localeConverterInterfaceMock = $this->createMock(LocaleConverterInterface::class);
-        $this->localeConverterInterfaceMock->expects(self::any())
+        $this->localeConverterInterfaceMock->expects(self::atLeastOnce())
         ->method('convertToPOSIX')
-        ->will(
-            self::returnValueMap(
-                [
-                    ['fre-FR', 'fr-FR'],
-                    ['eng-GB', 'en-GB'],
-                ]
-            )
+        ->willReturnMap(
+            [
+                ['fre-FR', 'fr-FR'],
+                ['eng-GB', 'en-GB'],
+            ]
         );
 
         return $this->localeConverterInterfaceMock;
     }
 
-    /**
-     * @return TranslatorInterface|MockObject
-     */
-    protected function getTranslatorInterfaceMock()
+    protected function getTranslatorInterfaceMock(): TranslatorInterface & MockObject
     {
-        $that = $this;
         $this->translatorMock = $this->createMock(TranslatorInterface::class);
         $this->translatorMock
-            ->expects(self::any())->method('trans')->will(
-                self::returnCallback(
-                    static function ($suffixes) use ($that) {
-                        foreach ($that->getLocale() as $value) {
-                            if ($value === 'fre-FR') {
-                                return $suffixes . ' French version';
-                            } elseif ($value === 'eng-GB') {
-                                return $suffixes . ' English version';
-                            } else {
-                                return $suffixes . ' wrong local so we take the default one which is en-GB here';
-                            }
-                        }
-                    }
-                )
+            ->expects(self::atLeastOnce())
+            ->method('trans')->willReturnCallback(
+                function ($suffixes): string {
+                    return match ($this->getLocale()) {
+                        'fre-FR' => $suffixes . ' French version',
+                        'eng-GB' => $suffixes . ' English version',
+                        default => $suffixes . ' wrong locale so we take the default one which is en-GB here',
+                    };
+                }
             );
 
         return $this->translatorMock;

tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ibexa_file_size/ibexa_file_size.test

@@ -14,25 +14,26 @@
 {{ 910565875123441600000|ibexa_file_size( 2 ) }}
 {{ 910565632767581700000000000|ibexa_file_size( 4 ) }}
 --DATA--
-$this->setConfigurationLocale( array( 'wrong local' ), 'eng-GB' );
-return array()
+$this->setConfigurationLocale('wrong locale', 'eng-GB');
+return []
 --EXPECT--
-10 B wrong local so we take the default one which is en-GB here
-1 kB wrong local so we take the default one which is en-GB here
-5 kB wrong local so we take the default one which is en-GB here
-12 kB wrong local so we take the default one which is en-GB here
-152 kB wrong local so we take the default one which is en-GB here
-26.15126 MB wrong local so we take the default one which is en-GB here
-123.1231 MB wrong local so we take the default one which is en-GB here
-456.5 GB wrong local so we take the default one which is en-GB here
-789.78979 TB wrong local so we take the default one which is en-GB here
-789.7897897898 PB wrong local so we take the default one which is en-GB here
-789.79 EB wrong local so we take the default one which is en-GB here
-789789789.7898 EB wrong local so we take the default one which is en-GB here
+10 B wrong locale so we take the default one which is en-GB here
+1 kB wrong locale so we take the default one which is en-GB here
+5 kB wrong locale so we take the default one which is en-GB here
+12 kB wrong locale so we take the default one which is en-GB here
+152 kB wrong locale so we take the default one which is en-GB here
+26.15126 MB wrong locale so we take the default one which is en-GB here
+123.1231 MB wrong locale so we take the default one which is en-GB here
+456.5 GB wrong locale so we take the default one which is en-GB here
+789.78979 TB wrong locale so we take the default one which is en-GB here
+789.7897897898 PB wrong locale so we take the default one which is en-GB here
+789.79 EB wrong locale so we take the default one which is en-GB here
+789789789.7898 EB wrong locale so we take the default one which is en-GB here
 --DATA--
-return array()
+return []
 --CONFIG--
-$this->locale = "fre-FR"; return array();
+$this->setConfigurationLocale('fre-FR', 'eng-GB');
+return []
 --EXPECT--
 10 B French version
 1 kB French version
@@ -47,9 +48,10 @@ $this->locale = "fre-FR"; return array();
 789,79 EB French version
 789789789,7898 EB French version
 --DATA--
-return array()
+return []
 --CONFIG--
-$this->locale = "eng-GB"; return array();
+$this->setConfigurationLocale('eng-GB', 'eng-GB');
+return [];
 --EXPECT--
 10 B English version
 1 kB English version