style: apply wdes/coding-standard v3

composer.json

@@ -54,6 +54,6 @@
         "phpunit/phpunit": "^7 || ^8 || ^9",
         "slevomat/coding-standard": "^6.0",
         "phpstan/phpstan": "^0.12",
-        "wdes/coding-standard": "^2"
+        "wdes/coding-standard": "^3"
     }
 }

example/simple.php

@@ -1,14 +1,16 @@
 <?php
+
 declare(strict_types = 1);
+
 // Can be removed :)
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use \Wdes\phpI18nL10n\plugins\MoReader;
-use \Wdes\phpI18nL10n\Launcher;
-use \Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
-use \Twig\Environment as TwigEnvironment;
-use \Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
+use Wdes\phpI18nL10n\plugins\MoReader;
+use Wdes\phpI18nL10n\Launcher;
+use Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
+use Twig\Environment as TwigEnvironment;
+use Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
 
 $dataDir  = __DIR__ . '/locale/';
 $moReader = new MoReader(

scripts/tools/generate-twig-cache.php

@@ -1,13 +1,16 @@
 #!/usr/bin/env php
 <?php
-declare(strict_types = 1);
+
 /**
  * @license http://unlicense.org/UNLICENSE The UNLICENSE
  * @author William Desportes <[email protected]>
  */
 
+declare(strict_types = 1);
+
 $options = getopt(
-    '', [
+    '',
+    [
         'twig-cache-dir:',
         'twig-templates-dir:',
         'twig-templates-po-files:',
@@ -52,10 +55,10 @@
 
 require_once(__DIR__ . '/../../vendor/autoload.php');
 
-use \Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
-use \Twig\Cache\FilesystemCache;
-use \Twig\Environment as TwigEnvironment;
-use \Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
+use Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
+use Twig\Cache\FilesystemCache;
+use Twig\Environment as TwigEnvironment;
+use Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
 
 $shortTempDir = $options['twig-templates-po-files'];
 $jsonMaping   = $options['json-mapping'];
@@ -64,7 +67,8 @@
 $loader = new TwigLoaderFilesystem([ $templateDir ]); // Load all templates from the dir
 $cache  = new FilesystemCache($options['twig-cache-dir']);
 $twig   = new TwigEnvironment(
-    $loader, [
+    $loader,
+    [
     'cache' => $cache
     ]
 );
@@ -107,10 +111,12 @@
 $mappings->replacements[] = $templates;
 
 // iterate over all templates
-foreach (new RecursiveIteratorIterator(
+$files = new RecursiveIteratorIterator(
     new RecursiveDirectoryIterator($templateDir),
     RecursiveIteratorIterator::LEAVES_ONLY
-) as $file) {
+);
+
+foreach ($files as $file) {
     // force twig to generate cache
     if ($file->isFile() && $file->getExtension() === 'twig') {
         $shortName = str_replace($templateDir, '', $file);

scripts/tools/update-po-files.php

@@ -1,13 +1,16 @@
 #!/usr/bin/env php
 <?php
-declare(strict_types = 1);
+
 /**
  * @license http://unlicense.org/UNLICENSE The UNLICENSE
  * @author William Desportes <[email protected]>
  */
 
+declare(strict_types = 1);
+
 $options = getopt(
-    '', [
+    '',
+    [
         'po-dir:',
         'po-template:',
         'json-mapping::',
@@ -93,7 +96,7 @@ static function ($matchs) use ($mappings) {
 echo 'PoDir: ' . $poDirectory . "\r\n";
 foreach (glob($poDirectory . '*.po') as $file) {
     exec('msgmerge --quiet --previous -U ' . $file . ' ' . $poTemplate);
-    echo 'File: '. $file . "\r\n";
+    echo 'File: ' . $file . "\r\n";
     poupdate($file);
 }
 poupdate($poTemplate);

src/Launcher.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

src/Twig/Extension/I18n.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

src/Twig/MemoryCache.php

@@ -1,12 +1,14 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 namespace Wdes\phpI18nL10n\Twig;
 
-use \Twig\Cache\CacheInterface;
-use \Twig\TemplateWrapper;
+use Twig\Cache\CacheInterface;
+use Twig\TemplateWrapper;
 
 /**
  * Token parser for Twig
@@ -30,7 +32,7 @@ class MemoryCache implements CacheInterface
      */
     public function generateKey($name, $className): string
     {
-        return 'memcache_'.$name;
+        return 'memcache_' . $name;
     }
 
     /**
@@ -75,7 +77,7 @@ public function getTimestamp($key): int
      */
     public function getFromCache(TemplateWrapper $template): string
     {
-        return $this->memory['memcache_'.$template->getTemplateName()];
+        return $this->memory['memcache_' . $template->getTemplateName()];
     }
 
     /**
@@ -89,7 +91,9 @@ public function extractDoDisplayFromCache(TemplateWrapper $template): string
         $content = self::getFromCache($template);
         // "/function ([a-z_]+)\("
         preg_match_all(
-            '/protected function doDisplay\(([a-z\s,\$=\[\]]+)\)([\s]+){([=%\sa-z\/0-9-\>:\(\)\\\";.,\$\[\]?_-]+)/msi', $content, $output_array
+            '/protected function doDisplay\(([a-z\s,\$=\[\]]+)\)([\s]+){([=%\sa-z\/0-9-\>:\(\)\\\";.,\$\[\]?_-]+)/msi',
+            $content,
+            $output_array
         );
         return $output_array[3][0];
     }

src/Twig/TokenParser.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

src/Twig/TranslationNode.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.

src/plugins/BasePlugin.php

@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

src/plugins/MoReader.php

@@ -1,12 +1,14 @@
 <?php
+
 declare(strict_types = 1);
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 namespace Wdes\phpI18nL10n\plugins;
 
-use \Exception;
-use \stdClass;
+use Exception;
+use stdClass;
 
 /**
  * Plugin for reading .mo files
@@ -42,7 +44,7 @@ class MoReader extends BasePlugin
     public function __construct(array $options)
     {
         if (is_dir($options['localeDir']) == false) {
-            throw new Exception('The directory does not exist : '.$options['localeDir']);
+            throw new Exception('The directory does not exist : ' . $options['localeDir']);
         }
     }
 
@@ -67,14 +69,14 @@ public function readFile(string $file): stdClass
         $this->data->endian = self::determineByteOrder($this->fileRes);
         if ($this->data->endian === -1) {
             fclose($this->fileRes);
-            throw new Exception($file.' is not a valid gettext file.');
+            throw new Exception($file . ' is not a valid gettext file.');
         }
 
         fseek($this->fileRes, 4);
         $this->data->fileFormatRevision = self::readInteger($this->data->endian, $this->fileRes);
         if ($this->data->fileFormatRevision !== 0 && $this->data->fileFormatRevision !== 1) {
             fclose($this->fileRes);
-            throw new Exception($file.' has an unknown major revision.');
+            throw new Exception($file . ' has an unknown major revision.');
         }
         $this->data->nbrOfStrings           = self::readInteger($this->data->endian, $this->fileRes);
         $this->data->tableOffsetOriginal    = self::readInteger($this->data->endian, $this->fileRes);//offset of table with original strings
@@ -121,12 +123,12 @@ public function readTranslations(): array
             $msgStr = null;
             try {
                 $msgId = $this->readStringFromTable($counter, $this->data->msgIdTable);
-            } catch(Exception $e){
+            } catch (Exception $e) {
                 $msgId = [''];
             }
             try {
                 $msgStr = $this->readStringFromTable($counter, $this->data->msgStrTable);
-            } catch(Exception $e){
+            } catch (Exception $e) {
                 $msgStr = [];
             }
             $this->processRecord($data, $msgId, $msgStr);

tests/I18nTest.php

@@ -1,15 +1,17 @@
 <?php
+
 declare(strict_types = 1);
+
 /* The contents of this file is free and unencumbered software released into the
  * public domain.
  * For more information, please refer to <http://unlicense.org/>
  */
 namespace Wdes\phpI18nL10n\Tests;
 
-use \PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase;
 use Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
-use \Twig\Environment as TwigEnv;
-use \Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
+use Twig\Environment as TwigEnv;
+use Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
 use Wdes\phpI18nL10n\plugins\MoReader;
 use Wdes\phpI18nL10n\Launcher;
 use Wdes\phpI18nL10n\Twig\MemoryCache;
@@ -41,7 +43,7 @@ class I18nTest extends TestCase
      */
     public function setUp(): void
     {
-        $dataDir = __DIR__. DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
+        $dataDir = __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
 
         $moReader = new MoReader(
             ['localeDir' => $dataDir]
@@ -52,7 +54,8 @@ public function setUp(): void
         $loader            = new TwigLoaderFilesystem();
         $this->memoryCache = new MemoryCache();
         $this->twig        = new TwigEnv(
-            $loader, [
+            $loader,
+            [
                 'cache' => $this->memoryCache,
                 'debug' => true
             ]
@@ -185,8 +188,8 @@ public function testPluralTranslation(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person"'.
-            ', "%nbr% persons", abs(        // line 1' . "\n" . '($context["nbr_persons"] ?? null))),'.
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person"' .
+            ', "%nbr% persons", abs(        // line 1' . "\n" . '($context["nbr_persons"] ?? null))),' .
             ' array("%nbr%" => ($context["nbr"] ?? null), ));',
             $generatedCode
         );
@@ -206,9 +209,9 @@ public function testPluralTranslationWithComment(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext('.
-            '"one user likes this.", "%nbr% users likes this.",'.
-            ' abs(        // line 1' . "\n" . '($context["nbr_persons"] ?? null))),'.
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext(' .
+            '"one user likes this.", "%nbr% users likes this.",' .
+            ' abs(        // line 1' . "\n" . '($context["nbr_persons"] ?? null))),' .
             ' array("%nbr%" => ($context["nbr"] ?? null), ));',
             $generatedCode
         );
@@ -253,7 +256,7 @@ public function testSimplePluralTranslationCount(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person",'.
+            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person",' .
             ' "persons", abs(twig_get_attribute($this->env, $this->source,         // line 1' . "\n" .
             '($context["a"] ?? null), "count", [], "any", false, false, false, 1)));',
             $generatedCode
@@ -274,10 +277,10 @@ public function testSimplePluralTranslationCountAndVars(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person",'.
-            ' "persons and %count% dogs", abs(twig_get_attribute($this->env,'.
-            ' $this->source,         // line 1' . "\n" . '($context["a"] ?? null), "count", [], "any", false, false, false, 1))),'.
-            ' array("%count%" => abs(twig_get_attribute($this->env,'.
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person",' .
+            ' "persons and %count% dogs", abs(twig_get_attribute($this->env,' .
+            ' $this->source,         // line 1' . "\n" . '($context["a"] ?? null), "count", [], "any", false, false, false, 1))),' .
+            ' array("%count%" => abs(twig_get_attribute($this->env,' .
             ' $this->source, ($context["a"] ?? null), "count", [], "any", false, false, false, 1)), ));',
             $generatedCode
         );

tests/LauncherTest.php

@@ -1,12 +1,14 @@
 <?php
+
 declare(strict_types = 1);
+
 /* The contents of this file is free and unencumbered software released into the
  * public domain.
  * For more information, please refer to <http://unlicense.org/>
  */
 namespace Wdes\phpI18nL10n\Tests;
 
-use \PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase;
 use Wdes\phpI18nL10n\plugins\MoReader;
 use Wdes\phpI18nL10n\Launcher;