Merge(dev) Rename namespace to Wdes\phpI18nL10n

wdes · Mar 29, 2020 · 63d0467 · 63d0467
2 parents 7b7b6fd + 79caeda
commit 63d0467
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Upgraded squizlabs/php_codesniffer from 3.3.x to 3.5.x
 - Upgraded phpstan/phpstan from 0.11.8+ to 0.12+
+- BREAKING CHANGE rename namespace to Wdes\phpI18nL10n
 
 ### Fixed
 - Test phpunit suite

diff --git a/composer.json b/composer.json
@@ -55,7 +55,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Wdes\\PIL\\": "src/"
+            "Wdes\\phpI18nL10n\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/example/simple.php b/example/simple.php
@@ -4,9 +4,9 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use \Wdes\PIL\plugins\MoReader;
-use \Wdes\PIL\Launcher;
-use \Wdes\PIL\Twig\Extension\I18n as ExtensionI18n;
+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;
 

diff --git a/scripts/tools/generate-twig-cache.php b/scripts/tools/generate-twig-cache.php
@@ -52,7 +52,7 @@
 
 require_once(__DIR__ . '/../../vendor/autoload.php');
 
-use \Wdes\PIL\Twig\Extension\I18n as ExtensionI18n;
+use \Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
 use \Twig\Cache\FilesystemCache;
 use \Twig\Environment as TwigEnvironment;
 use \Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;

diff --git a/src/Launcher.php b/src/Launcher.php
@@ -3,9 +3,9 @@
 /* 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\PIL;
+namespace Wdes\phpI18nL10n;
 
-use \Wdes\PIL\plugins\BasePlugin;
+use Wdes\phpI18nL10n\plugins\BasePlugin;
 
 /**
  * Plugin for reading .mo files

diff --git a/src/Twig/Extension/I18n.php b/src/Twig/Extension/I18n.php
@@ -3,9 +3,9 @@
 /* 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\PIL\Twig\Extension;
+namespace Wdes\phpI18nL10n\Twig\Extension;
 
-use Wdes\PIL\Twig\TokenParser;
+use Wdes\phpI18nL10n\Twig\TokenParser;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
@@ -25,7 +25,7 @@ public function getFilters(): array
     {
         return [
             new TwigFilter(
-                'trans', '\Wdes\PIL\Launcher::gettext'
+                'trans', '\Wdes\phpI18nL10n\Launcher::gettext'
             ),
         ];
     }

diff --git a/src/Twig/MemoryCache.php b/src/Twig/MemoryCache.php
@@ -3,7 +3,7 @@
 /* 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\PIL\Twig;
+namespace Wdes\phpI18nL10n\Twig;
 
 use \Twig\Cache\CacheInterface;
 use \Twig\TemplateWrapper;

diff --git a/src/Twig/TokenParser.php b/src/Twig/TokenParser.php
@@ -3,9 +3,9 @@
 /* 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\PIL\Twig;
+namespace Wdes\phpI18nL10n\Twig;
 
-use \Wdes\PIL\Twig\TranslationNode;
+use Wdes\phpI18nL10n\Twig\TranslationNode;
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\NameExpression;
 use Twig\Node\Node;

diff --git a/src/Twig/TranslationNode.php b/src/Twig/TranslationNode.php
@@ -4,7 +4,7 @@
  * 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\PIL\Twig;
+namespace Wdes\phpI18nL10n\Twig;
 
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
@@ -75,7 +75,7 @@ public function compile(Compiler $compiler): void
             $vars                   = array_merge($vars, $Pvars);
         }
 
-        $prefix = '\Wdes\PIL\Launcher::getPlugin()->';
+        $prefix = '\Wdes\phpI18nL10n\Launcher::getPlugin()->';
         if ($this->hasNode('context')) {
             $function = $this->hasNode('plural') ? 'ngettext' : 'pgettext';
         } else {

diff --git a/src/plugins/BasePlugin.php b/src/plugins/BasePlugin.php
@@ -3,7 +3,7 @@
 /* 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\PIL\plugins;
+namespace Wdes\phpI18nL10n\plugins;
 
 /**
  * Plugin interface

diff --git a/src/plugins/MoReader.php b/src/plugins/MoReader.php
@@ -3,9 +3,9 @@
 /* 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\PIL\plugins;
+namespace Wdes\phpI18nL10n\plugins;
 
-use \Wdes\PIL\plugins\BasePlugin;
+use Wdes\phpI18nL10n\plugins\BasePlugin;
 use \Exception;
 use \stdClass;
 

diff --git a/tests/I18nTest.php b/tests/I18nTest.php
@@ -7,12 +7,12 @@
 namespace Wdes\phpI18nL10n\Tests;
 
 use \PHPUnit\Framework\TestCase;
-use \Wdes\PIL\Twig\Extension\I18n as ExtensionI18n;
+use Wdes\phpI18nL10n\Twig\Extension\I18n as ExtensionI18n;
 use \Twig\Environment as TwigEnv;
 use \Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
-use \Wdes\PIL\plugins\MoReader;
-use \Wdes\PIL\Launcher;
-use \Wdes\PIL\Twig\MemoryCache;
+use Wdes\phpI18nL10n\plugins\MoReader;
+use Wdes\phpI18nL10n\Launcher;
+use Wdes\phpI18nL10n\Twig\MemoryCache;
 
 /**
  * @author William Desportes <[email protected]>
@@ -72,7 +72,7 @@ public function testSimpleTranslation(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo \Wdes\PIL\Launcher::getPlugin()->gettext("Translate this");',
+            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->gettext("Translate this");',
             $generatedCode
         );
         $html = $template->render([]);
@@ -91,7 +91,7 @@ public function testSimpleTranslationWithComment(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo \Wdes\PIL\Launcher::getPlugin()->gettext("Translate this");',
+            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->gettext("Translate this");',
             $generatedCode
         );
         $this->assertStringContainsString(
@@ -115,7 +115,7 @@ public function testSimpleTranslationWithContext(): void
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
 
         $this->assertStringContainsString(
-            'echo \Wdes\PIL\Launcher::getPlugin()->pgettext("NayanCat", "Translate this");',
+            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->pgettext("NayanCat", "Translate this");',
             $generatedCode
         );
         $html = $template->render([]);
@@ -135,7 +135,8 @@ public function testSimpleTranslationWithContextAndVariable(): void
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
 
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\PIL\Launcher::getPlugin()->pgettext("The user name", "Translate this %name%"), ["%name%" => ($context["name"] ?? null)]);',
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->pgettext("The user name", "Translate this %name%"), '
+            . '["%name%" => ($context["name"] ?? null)]);',
             $generatedCode
         );
         $html = $template->render(
@@ -159,7 +160,7 @@ public function testSimpleTranslationWithContextAndVariables(): void
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
 
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\PIL\Launcher::getPlugin()->pgettext("The user name", "Translate this %key%: %value%"), '
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->pgettext("The user name", "Translate this %key%: %value%"), '
             . '["%key%" => ($context["key"] ?? null), "%value%" => ($context["value"] ?? null)]);',
             $generatedCode
         );
@@ -184,7 +185,7 @@ public function testPluralTranslation(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\PIL\Launcher::getPlugin()->ngettext("One person"'.
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person"'.
             ', "%nbr% persons", abs(($context["nbr_persons"] ?? null))),'.
             ' ["%nbr%" => ($context["nbr"] ?? null)]);',
             $generatedCode
@@ -205,7 +206,7 @@ public function testPluralTranslationWithComment(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\PIL\Launcher::getPlugin()->ngettext('.
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext('.
             '"one user likes this.", "%nbr% users likes this.",'.
             ' abs(($context["nbr_persons"] ?? null))),'.
             ' ["%nbr%" => ($context["nbr"] ?? null)]);',
@@ -231,7 +232,7 @@ public function testSimplePluralTranslation(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo \Wdes\PIL\Launcher::getPlugin()->ngettext("One person", "persons", abs(($context["a"] ?? null)));',
+            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person", "persons", abs(($context["a"] ?? null)));',
             $generatedCode
         );
         $html = $template->render(["nbr" => 5]);
@@ -252,7 +253,7 @@ public function testSimplePluralTranslationCount(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo \Wdes\PIL\Launcher::getPlugin()->ngettext("One person",'.
+            'echo \Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person",'.
             ' "persons", abs(twig_get_attribute($this->env, $this->source,'.
             ' ($context["a"] ?? null), "count", [], "any", false, false, false, 1)));',
             $generatedCode
@@ -273,7 +274,7 @@ public function testSimplePluralTranslationCountAndVars(): void
         );
         $generatedCode = $this->memoryCache->extractDoDisplayFromCache($template);
         $this->assertStringContainsString(
-            'echo strtr(\Wdes\PIL\Launcher::getPlugin()->ngettext("One person",'.
+            'echo strtr(\Wdes\phpI18nL10n\Launcher::getPlugin()->ngettext("One person",'.
             ' "persons and %count% dogs", abs(twig_get_attribute($this->env,'.
             ' $this->source, ($context["a"] ?? null), "count", [], "any", false, false, false, 1))),'.
             ' ["%count%" => abs(twig_get_attribute($this->env,'.

diff --git a/tests/LauncherTest.php b/tests/LauncherTest.php
@@ -7,8 +7,8 @@
 namespace Wdes\phpI18nL10n\Tests;
 
 use \PHPUnit\Framework\TestCase;
-use \Wdes\PIL\plugins\MoReader;
-use \Wdes\PIL\Launcher;
+use Wdes\phpI18nL10n\plugins\MoReader;
+use Wdes\phpI18nL10n\Launcher;
 
 /**
  * Test class for Utils

diff --git a/tests/MoReaderTest.php b/tests/MoReaderTest.php
@@ -8,7 +8,7 @@
 
 use Exception;
 use PHPUnit\Framework\TestCase;
-use Wdes\PIL\plugins\MoReader;
+use Wdes\phpI18nL10n\plugins\MoReader;
 use \stdClass;
 
 /**

diff --git a/tests/TranslationNodeTest.php b/tests/TranslationNodeTest.php
@@ -12,8 +12,8 @@
 use Twig\Node\Expression\NameExpression;
 use \Twig\Environment as TwigEnv;
 use \Twig\Loader\FilesystemLoader as TwigLoaderFilesystem;
-use \Wdes\PIL\Twig\TranslationNode;
-use \Wdes\PIL\Twig\MemoryCache;
+use Wdes\phpI18nL10n\Twig\TranslationNode;
+use Wdes\phpI18nL10n\Twig\MemoryCache;
 
 /**
  * @author William Desportes <[email protected]>