jon48 / webtrees-mod-translationtool

app/TranslationToolModule.php

Indentation +55 added lines, -55 removed lines

@@ -30,68 +30,68 @@
  */
 class TranslationToolModule extends AbstractModule implements ModuleMyArtJaubInterface, ModuleConfigInterface
 {
-    use ModuleMyArtJaubTrait;
-    use ModuleConfigTrait;
+                                use ModuleMyArtJaubTrait;
+                                use ModuleConfigTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Translation Tool');
-    }
+                                /**
+                                 * {@inheritDoc}
+                                 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+                                 */
+                                public function title(): string
+                                {
+                                return I18N::translate('Translation Tool');
+                                }
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Manage webtrees translation.');
-    }
+                                /**
+                                 * {@inheritDoc}
+                                 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+                                 */
+                                public function description(): string
+                                {
+                                return I18N::translate('Manage webtrees translation.');
+                                }
 
-    public function customModuleVersion(): string
-    {
-        return '2.0.11-v.1';
-    }
+                                public function customModuleVersion(): string
+                                {
+                                return '2.0.11-v.1';
+                                }
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleSupportUrl()
-     */
-    public function customModuleSupportUrl(): string
-    {
-        return 'https://github.com/jon48/webtrees-mod-translationtool';
-    }
+                                /**
+                                 * {@inheritDoc}
+                                 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleSupportUrl()
+                                 */
+                                public function customModuleSupportUrl(): string
+                                {
+                                return 'https://github.com/jon48/webtrees-mod-translationtool';
+                                }
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
+                                /**
+                                 * {@inheritDoc}
+                                 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+                                 */
+                                public function loadRoutes(Map $router): void
+                                {
+                                $router->attach('', '', static function (Map $router): void {
 
 
-            $router->attach('', '/module-maj/translationtool', static function (Map $router): void {
+                                $router->attach('', '/module-maj/translationtool', static function (Map $router): void {
 
-                $router->extras([
-                    'middleware' => [
-                        AuthAdministrator::class,
-                    ],
-                ]);
-                $router->get(TranslationStatus::class, '/status', TranslationStatus::class);
-            });
-        });
-    }
+                                $router->extras([
+                                'middleware' => [
+                                AuthAdministrator::class,
+                                ],
+                                ]);
+                                $router->get(TranslationStatus::class, '/status', TranslationStatus::class);
+                                });
+                                });
+                                }
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(TranslationStatus::class);
-    }
+                                /**
+                                 * {@inheritDoc}
+                                 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+                                 */
+                                public function getConfigLink(): string
+                                {
+                                return route(TranslationStatus::class);
+                                }
 }

Spacing +2 added lines, -2 removed lines

@@ -71,10 +71,10 @@
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
 
-            $router->attach('', '/module-maj/translationtool', static function (Map $router): void {
+            $router->attach('', '/module-maj/translationtool', static function(Map $router): void {
 
                 $router->extras([
                     'middleware' => [

app/Http/RequestHandlers/TranslationStatus.php

Indentation +42 added lines, -42 removed lines

@@ -30,53 +30,53 @@
  */
 class TranslationStatus implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+                                use ViewResponseTrait;
 
-    /** @var ?TranslationToolModule $module */
-    private $module;
+                                /** @var ?TranslationToolModule $module */
+                                private $module;
 
-    /** @var SourceCodeService $sourcecode_service */
-    private $sourcecode_service;
+                                /** @var SourceCodeService $sourcecode_service */
+                                private $sourcecode_service;
 
-    /**
-     * Constructor for TranslationStatus request handler
-     *
-     * @param ModuleService $module_service
-     * @param SourceCodeService $sourcecode_service
-     */
-    public function __construct(ModuleService $module_service, SourceCodeService $sourcecode_service)
-    {
-        $this->module = $module_service->findByInterface(TranslationToolModule::class)->first();
-        $this->sourcecode_service = $sourcecode_service;
-    }
+                                /**
+                                 * Constructor for TranslationStatus request handler
+                                 *
+                                 * @param ModuleService $module_service
+                                 * @param SourceCodeService $sourcecode_service
+                                 */
+                                public function __construct(ModuleService $module_service, SourceCodeService $sourcecode_service)
+                                {
+                                $this->module = $module_service->findByInterface(TranslationToolModule::class)->first();
+                                $this->sourcecode_service = $sourcecode_service;
+                                }
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+                                /**
+                                 * {@inheritDoc}
+                                 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+                                 */
+                                public function handle(ServerRequestInterface $request): ResponseInterface
+                                {
+                                $this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+                                if ($this->module === null) {
+                                throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+                                }
 
-        $locale = I18N::locale();
-        $sourceCodePaths = $this->sourcecode_service->sourceCodePaths();
-        $translation_analyser = new TranslationsAnalyzer(
-            $this->sourcecode_service,
-            $sourceCodePaths,
-            $locale->languageTag()
-        );
+                                $locale = I18N::locale();
+                                $sourceCodePaths = $this->sourcecode_service->sourceCodePaths();
+                                $translation_analyser = new TranslationsAnalyzer(
+                                $this->sourcecode_service,
+                                $sourceCodePaths,
+                                $locale->languageTag()
+                                );
 
-        return $this->viewResponse($this->module->name() . '::status', [
-            'title'                 =>  $this->module->title(),
-            'language'              =>  $locale->endonym(),
-            'source_code_paths'     =>  $sourceCodePaths->flatten()->sort(),
-            'translations_stats'    =>  $translation_analyser->translationsStatictics(),
-            'missing_translations'  =>  $translation_analyser->missingTranslations(),
-            'non_used_translations' =>  $translation_analyser->nonUsedMajTranslations()
-        ]);
-    }
+                                return $this->viewResponse($this->module->name() . '::status', [
+                                'title'                 =>  $this->module->title(),
+                                'language'              =>  $locale->endonym(),
+                                'source_code_paths'     =>  $sourceCodePaths->flatten()->sort(),
+                                'translations_stats'    =>  $translation_analyser->translationsStatictics(),
+                                'missing_translations'  =>  $translation_analyser->missingTranslations(),
+                                'non_used_translations' =>  $translation_analyser->nonUsedMajTranslations()
+                                ]);
+                                }
 }

app/Services/SourceCodeService.php

Indentation +125 added lines, -125 removed lines

@@ -28,129 +28,129 @@
 class SourceCodeService
 {
 
-    /**
-     * Gettext Translations merge strategy to be used - Use Theirs data
-     * @var int MERGE_STRATEGY_THEIRS
-     */
-    private const MERGE_STRATEGY_THEIRS = Merge::HEADERS_OVERRIDE
-        | Merge::TRANSLATIONS_THEIRS
-        | Merge::TRANSLATIONS_OVERRIDE
-        | Merge::EXTRACTED_COMMENTS_THEIRS
-        | Merge::REFERENCES_THEIRS
-        | Merge::FLAGS_THEIRS
-        | Merge::COMMENTS_THEIRS;
-
-    /**
-     * I18N functions to be looked for in the code
-     * @var array
-     */
-    private const I18N_FUNCTIONS = [
-        'translate' => 'gettext',
-        'plural' => 'ngettext',
-        'translateContext' => 'pgettext'
-    ];
-
-    /**
-     * Lists all paths containing source code to be scanned for translations.
-     * This contains the MyArtJaub modules's resources folder,
-     * as well as MyArtJaub modules PSR-4 autoloading paths loaded through Composer
-     *
-     * @return Collection
-     */
-    public function sourceCodePaths(): Collection
-    {
-        $paths = app(ModuleService::class)->findByInterface(ModuleMyArtJaubInterface::class)
-            ->mapWithKeys(function (ModuleMyArtJaubInterface $module): array {
-                return [$module->name() => [realpath($module->resourcesFolder())]];
-            });
-
-        $maj_packages = app(ComposerService::class)->listMyArtJaubPackagesPaths();
-
-        foreach ($maj_packages as list($maj_package, $psr4_paths)) {
-            /** @var PackageInterface $maj_package */
-            $installer_name = $maj_package->getExtra()['installer-name'] ?? '';
-            $key = $installer_name === '' ? $maj_package->getName() : '_' . $installer_name . '_';
-            if (count($psr4_paths) > 0) {
-                $paths->put($key, array_merge($paths->get($key, []), $psr4_paths));
-            }
-        }
-
-        return $paths;
-    }
-
-    /**
-     * Find all strings to be translated in PHP or PHTML files for a set of source code paths
-     * The returned structure is a associated Collection with:
-     *      - key: package/domain
-     *      - value: Gettext Translations object for that domain
-     *
-     * @param Collection $source_code_paths
-     * @return Collection
-     */
-    public function findStringsToTranslate(Collection $source_code_paths): Collection
-    {
-        $strings_to_translate = new Collection();
-        foreach ($source_code_paths as $package => $paths) {
-            $php_files = array();
-            foreach ($paths as $path) {
-                $php_files = array_merge($php_files, $this->glob_recursive($path . '/*.php') ?: array());
-                $php_files = array_merge($php_files, $this->glob_recursive($path . '/*.phtml') ?: array());
-            }
-
-            $php_scanner = new PhpScanner(Translations::create($package));
-            $php_scanner
-                ->setFunctions(self::I18N_FUNCTIONS)
-                ->ignoreInvalidFunctions(true);
-            $php_scanner->setDefaultDomain($package);
-            foreach ($php_files as $php_file) {
-                $php_scanner->scanFile($php_file);
-            }
-
-            $strings_to_translate->put(
-                $package,
-                $strings_to_translate
-                    ->get($package, Translations::create())
-                    ->mergeWith($php_scanner->getTranslations()[$package], self::MERGE_STRATEGY_THEIRS)
-            );
-        }
-        return $strings_to_translate;
-    }
-
-    /**
-     * List all translations defined in MyArtJaub modules
-     * The returned structure is a associated Collection with:
-     *      - key: module name
-     *      - value: array of translations for the module
-     *
-     * @param string $language
-     * @return Collection
-     */
-    public function listMyArtJaubTranslations(string $language): Collection
-    {
-        return app(ModuleService::class)->findByInterface(ModuleMyArtJaubInterface::class)
-            ->mapWithKeys(function (ModuleMyArtJaubInterface $module) use ($language): array {
-                return [$module->name() => $module->customTranslations($language)];
-            });
-    }
-
-    /**
-     * Extension of the standard PHP glob function to apply it recursively.
-     *
-     * @param string $pattern
-     * @param int $flags
-     * @return string[]
-     * @see glob()
-     * @phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-     */
-    protected function glob_recursive(string $pattern, int $flags = 0): array
-    {
-        $files = glob($pattern, $flags) ?: [];
-        $dirs = glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) ?: [];
-
-        foreach ($dirs as $dir) {
-            $files = array_merge($files, $this->glob_recursive($dir . '/' . basename($pattern), $flags));
-        }
-
-        return $files;
-    }
+                                /**
+                                 * Gettext Translations merge strategy to be used - Use Theirs data
+                                 * @var int MERGE_STRATEGY_THEIRS
+                                 */
+                                private const MERGE_STRATEGY_THEIRS = Merge::HEADERS_OVERRIDE
+                                | Merge::TRANSLATIONS_THEIRS
+                                | Merge::TRANSLATIONS_OVERRIDE
+                                | Merge::EXTRACTED_COMMENTS_THEIRS
+                                | Merge::REFERENCES_THEIRS
+                                | Merge::FLAGS_THEIRS
+                                | Merge::COMMENTS_THEIRS;
+
+                                /**
+                                 * I18N functions to be looked for in the code
+                                 * @var array
+                                 */
+                                private const I18N_FUNCTIONS = [
+                                'translate' => 'gettext',
+                                'plural' => 'ngettext',
+                                'translateContext' => 'pgettext'
+                                ];
+
+                                /**
+                                 * Lists all paths containing source code to be scanned for translations.
+                                 * This contains the MyArtJaub modules's resources folder,
+                                 * as well as MyArtJaub modules PSR-4 autoloading paths loaded through Composer
+                                 *
+                                 * @return Collection
+                                 */
+                                public function sourceCodePaths(): Collection
+                                {
+                                $paths = app(ModuleService::class)->findByInterface(ModuleMyArtJaubInterface::class)
+                                ->mapWithKeys(function (ModuleMyArtJaubInterface $module): array {
+                                return [$module->name() => [realpath($module->resourcesFolder())]];
+                                });
+
+                                $maj_packages = app(ComposerService::class)->listMyArtJaubPackagesPaths();
+
+                                foreach ($maj_packages as list($maj_package, $psr4_paths)) {
+                                /** @var PackageInterface $maj_package */
+                                $installer_name = $maj_package->getExtra()['installer-name'] ?? '';
+                                $key = $installer_name === '' ? $maj_package->getName() : '_' . $installer_name . '_';
+                                if (count($psr4_paths) > 0) {
+                                $paths->put($key, array_merge($paths->get($key, []), $psr4_paths));
+                                }
+                                }
+
+                                return $paths;
+                                }
+
+                                /**
+                                 * Find all strings to be translated in PHP or PHTML files for a set of source code paths
+                                 * The returned structure is a associated Collection with:
+                                 *      - key: package/domain
+                                 *      - value: Gettext Translations object for that domain
+                                 *
+                                 * @param Collection $source_code_paths
+                                 * @return Collection
+                                 */
+                                public function findStringsToTranslate(Collection $source_code_paths): Collection
+                                {
+                                $strings_to_translate = new Collection();
+                                foreach ($source_code_paths as $package => $paths) {
+                                $php_files = array();
+                                foreach ($paths as $path) {
+                                $php_files = array_merge($php_files, $this->glob_recursive($path . '/*.php') ?: array());
+                                $php_files = array_merge($php_files, $this->glob_recursive($path . '/*.phtml') ?: array());
+                                }
+
+                                $php_scanner = new PhpScanner(Translations::create($package));
+                                $php_scanner
+                                ->setFunctions(self::I18N_FUNCTIONS)
+                                ->ignoreInvalidFunctions(true);
+                                $php_scanner->setDefaultDomain($package);
+                                foreach ($php_files as $php_file) {
+                                $php_scanner->scanFile($php_file);
+                                }
+
+                                $strings_to_translate->put(
+                                $package,
+                                $strings_to_translate
+                                ->get($package, Translations::create())
+                                ->mergeWith($php_scanner->getTranslations()[$package], self::MERGE_STRATEGY_THEIRS)
+                                );
+                                }
+                                return $strings_to_translate;
+                                }
+
+                                /**
+                                 * List all translations defined in MyArtJaub modules
+                                 * The returned structure is a associated Collection with:
+                                 *      - key: module name
+                                 *      - value: array of translations for the module
+                                 *
+                                 * @param string $language
+                                 * @return Collection
+                                 */
+                                public function listMyArtJaubTranslations(string $language): Collection
+                                {
+                                return app(ModuleService::class)->findByInterface(ModuleMyArtJaubInterface::class)
+                                ->mapWithKeys(function (ModuleMyArtJaubInterface $module) use ($language): array {
+                                return [$module->name() => $module->customTranslations($language)];
+                                });
+                                }
+
+                                /**
+                                 * Extension of the standard PHP glob function to apply it recursively.
+                                 *
+                                 * @param string $pattern
+                                 * @param int $flags
+                                 * @return string[]
+                                 * @see glob()
+                                 * @phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+                                 */
+                                protected function glob_recursive(string $pattern, int $flags = 0): array
+                                {
+                                $files = glob($pattern, $flags) ?: [];
+                                $dirs = glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) ?: [];
+
+                                foreach ($dirs as $dir) {
+                                $files = array_merge($files, $this->glob_recursive($dir . '/' . basename($pattern), $flags));
+                                }
+
+                                return $files;
+                                }
 }

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
     public function sourceCodePaths(): Collection
     {
         $paths = app(ModuleService::class)->findByInterface(ModuleMyArtJaubInterface::class)
-            ->mapWithKeys(function (ModuleMyArtJaubInterface $module): array {
+            ->mapWithKeys(function(ModuleMyArtJaubInterface $module): array {
                 return [$module->name() => [realpath($module->resourcesFolder())]];
             });
 
@@ -69,7 +69,7 @@ 
         foreach ($maj_packages as list($maj_package, $psr4_paths)) {
             /** @var PackageInterface $maj_package */
             $installer_name = $maj_package->getExtra()['installer-name'] ?? '';
-            $key = $installer_name === '' ? $maj_package->getName() : '_' . $installer_name . '_';
+            $key = $installer_name === '' ? $maj_package->getName() : '_'.$installer_name.'_';
             if (count($psr4_paths) > 0) {
                 $paths->put($key, array_merge($paths->get($key, []), $psr4_paths));
             }
@@ -93,8 +93,8 @@ 
         foreach ($source_code_paths as $package => $paths) {
             $php_files = array();
             foreach ($paths as $path) {
-                $php_files = array_merge($php_files, $this->glob_recursive($path . '/*.php') ?: array());
-                $php_files = array_merge($php_files, $this->glob_recursive($path . '/*.phtml') ?: array());
+                $php_files = array_merge($php_files, $this->glob_recursive($path.'/*.php') ?: array());
+                $php_files = array_merge($php_files, $this->glob_recursive($path.'/*.phtml') ?: array());
             }
 
             $php_scanner = new PhpScanner(Translations::create($package));
@@ -128,7 +128,7 @@ 
     public function listMyArtJaubTranslations(string $language): Collection
     {
         return app(ModuleService::class)->findByInterface(ModuleMyArtJaubInterface::class)
-            ->mapWithKeys(function (ModuleMyArtJaubInterface $module) use ($language): array {
+            ->mapWithKeys(function(ModuleMyArtJaubInterface $module) use ($language): array {
                 return [$module->name() => $module->customTranslations($language)];
             });
     }
@@ -145,10 +145,10 @@ 
     protected function glob_recursive(string $pattern, int $flags = 0): array
     {
         $files = glob($pattern, $flags) ?: [];
-        $dirs = glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) ?: [];
+        $dirs = glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) ?: [];
 
         foreach ($dirs as $dir) {
-            $files = array_merge($files, $this->glob_recursive($dir . '/' . basename($pattern), $flags));
+            $files = array_merge($files, $this->glob_recursive($dir.'/'.basename($pattern), $flags));
         }
 
         return $files;

app/Model/TranslationsAnalyzer.php

Indentation +208 added lines, -208 removed lines

@@ -29,219 +29,219 @@
 
 
 
-    /** @var SourceCodeService $sourcecode_service */
-    private $sourcecode_service;
-
-    /**
-     * List of items to be translated found in the code.
-     * @var ?Collection $strings_to_translate
-     */
-    private $strings_to_translate;
-
-    /**
-     * List of translations loaded through the standard I18N library.
-     * @var ?Collection $loaded_translations
-     */
-    private $loaded_translations;
-
-    /**
-     * List of translations loaded within the MyArtJaub modules
-     * @var ?Collection $maj_translations
-     */
-    private $maj_translations;
-
-    /**
-     * List of paths for source code
-     * @var Collection $source_code_paths
-     */
-    private $source_code_paths;
-
-    /**
-     * Reference language code
-     * @var string $language
-     */
-    private $language;
-
-    /**
-     * Constructor for TranslationAnalyzer
-     *
-     * @param SourceCodeService $sourcecode_service
-     * @param Collection $code_paths
-     * @param string $language
-     */
-    public function __construct(SourceCodeService $sourcecode_service, Collection $code_paths, string $language = null)
-    {
-        $this->sourcecode_service = $sourcecode_service;
-        $this->language = $language ?? I18N::locale()->languageTag();
-        $this->source_code_paths = $code_paths;
-    }
-
-    /******************************
+                                /** @var SourceCodeService $sourcecode_service */
+                                private $sourcecode_service;
+
+                                /**
+                                 * List of items to be translated found in the code.
+                                 * @var ?Collection $strings_to_translate
+                                 */
+                                private $strings_to_translate;
+
+                                /**
+                                 * List of translations loaded through the standard I18N library.
+                                 * @var ?Collection $loaded_translations
+                                 */
+                                private $loaded_translations;
+
+                                /**
+                                 * List of translations loaded within the MyArtJaub modules
+                                 * @var ?Collection $maj_translations
+                                 */
+                                private $maj_translations;
+
+                                /**
+                                 * List of paths for source code
+                                 * @var Collection $source_code_paths
+                                 */
+                                private $source_code_paths;
+
+                                /**
+                                 * Reference language code
+                                 * @var string $language
+                                 */
+                                private $language;
+
+                                /**
+                                 * Constructor for TranslationAnalyzer
+                                 *
+                                 * @param SourceCodeService $sourcecode_service
+                                 * @param Collection $code_paths
+                                 * @param string $language
+                                 */
+                                public function __construct(SourceCodeService $sourcecode_service, Collection $code_paths, string $language = null)
+                                {
+                                $this->sourcecode_service = $sourcecode_service;
+                                $this->language = $language ?? I18N::locale()->languageTag();
+                                $this->source_code_paths = $code_paths;
+                                }
+
+                                /******************************
      *  Data retrieval functions  *
      ******************************/
 
-    /**
-     * Compute the key for a given GetText Translation entry, dealing with context \x04 and plural \x00 cases.
-     *
-     * @param Translation $translation
-     * @return string
-     */
-    private function getTranslationKey(Translation $translation): string
-    {
-        $key = $translation->getOriginal();
-        $translation_plural = $translation->getPlural();
-        if ($translation_plural !== null && strlen($translation_plural) > 0) {
-            $key .= I18N::PLURAL . $translation_plural;
-        }
-        $translation_context = $translation->getContext();
-        if ($translation_context !== null && strlen($translation_context) > 0) {
-            $key = $translation_context . I18N::CONTEXT . $key;
-        }
-        return $key;
-    }
-
-    /**
-     * Returns the strings tagged for translation in the source code.
-     * The returned structure is an associative Collection with :
-     *      - key: MD5 hash of the Translation key
-     *      - value: array [
-     *              0 => GetText Translations Header (including domain)
-     *              1 => GetTex Translation
-     *          ]
-     *
-     * @return Collection
-     */
-    private function stringsToTranslate(): Collection
-    {
-        if ($this->strings_to_translate === null) {
-            $strings_to_translate_list = $this->sourcecode_service->findStringsToTranslate($this->source_code_paths);
-
-            $this->strings_to_translate = new Collection();
-            foreach ($strings_to_translate_list as $translations) {
-                foreach ($translations as $translation) {
-                    $key = md5($this->getTranslationKey($translation));
-                    $this->strings_to_translate->put($key, [$translations->getHeaders(), $translation]);
-                }
-            }
-        }
-        return $this->strings_to_translate;
-    }
-
-    /**
-     * Returns the list of translations loaded through the standard I18N library.
-     * The returned structure is an associative Collection with :
-     *      - key: Original translation key
-     *      - value: Translated string
-     *
-     * @return Collection
-     */
-    private function loadedTranslations(): Collection
-    {
-        if ($this->loaded_translations === null) {
-            $I18N_class = new ReflectionClass(I18N::class);
-            $translator_property = $I18N_class->getProperty('translator');
-            $translator_property->setAccessible(true);
-            $wt_translator = $translator_property->getValue();
-
-            $translator_class = new ReflectionClass(get_class($wt_translator));
-            $translations_property = $translator_class->getProperty('translations');
-            $translations_property->setAccessible(true);
-            $this->loaded_translations = collect($translations_property->getValue($wt_translator));
-        }
-        return $this->loaded_translations;
-    }
-
-    /**
-     * Returns the list of translations loaded in MyArtJaub modules.
-     * The returned structure is an associative Collection with :
-     *      - key: MD5 hash of the translation key
-     *      - value: array [
-     *              0 => Module name
-     *              1 => Translation key
-     *          ]
-     *
-     * @return Collection
-     */
-    private function loadedMyArtJaubTranslations(): Collection
-    {
-        if ($this->maj_translations === null) {
-            $maj_translations_list = $this->sourcecode_service->listMyArtJaubTranslations($this->language);
-
-            $this->maj_translations = new Collection();
-            foreach ($maj_translations_list as $module => $maj_mod_translations) {
-                foreach (array_keys($maj_mod_translations) as $maj_mod_translation) {
-                    $this->maj_translations->put(md5((string) $maj_mod_translation), [$module, $maj_mod_translation]);
-                }
-            }
-        }
-        return $this->maj_translations;
-    }
-
-    /*************************
+                                /**
+                                 * Compute the key for a given GetText Translation entry, dealing with context \x04 and plural \x00 cases.
+                                 *
+                                 * @param Translation $translation
+                                 * @return string
+                                 */
+                                private function getTranslationKey(Translation $translation): string
+                                {
+                                $key = $translation->getOriginal();
+                                $translation_plural = $translation->getPlural();
+                                if ($translation_plural !== null && strlen($translation_plural) > 0) {
+                                $key .= I18N::PLURAL . $translation_plural;
+                                }
+                                $translation_context = $translation->getContext();
+                                if ($translation_context !== null && strlen($translation_context) > 0) {
+                                $key = $translation_context . I18N::CONTEXT . $key;
+                                }
+                                return $key;
+                                }
+
+                                /**
+                                 * Returns the strings tagged for translation in the source code.
+                                 * The returned structure is an associative Collection with :
+                                 *      - key: MD5 hash of the Translation key
+                                 *      - value: array [
+                                 *              0 => GetText Translations Header (including domain)
+                                 *              1 => GetTex Translation
+                                 *          ]
+                                 *
+                                 * @return Collection
+                                 */
+                                private function stringsToTranslate(): Collection
+                                {
+                                if ($this->strings_to_translate === null) {
+                                $strings_to_translate_list = $this->sourcecode_service->findStringsToTranslate($this->source_code_paths);
+
+                                $this->strings_to_translate = new Collection();
+                                foreach ($strings_to_translate_list as $translations) {
+                                foreach ($translations as $translation) {
+                                $key = md5($this->getTranslationKey($translation));
+                                $this->strings_to_translate->put($key, [$translations->getHeaders(), $translation]);
+                                }
+                                }
+                                }
+                                return $this->strings_to_translate;
+                                }
+
+                                /**
+                                 * Returns the list of translations loaded through the standard I18N library.
+                                 * The returned structure is an associative Collection with :
+                                 *      - key: Original translation key
+                                 *      - value: Translated string
+                                 *
+                                 * @return Collection
+                                 */
+                                private function loadedTranslations(): Collection
+                                {
+                                if ($this->loaded_translations === null) {
+                                $I18N_class = new ReflectionClass(I18N::class);
+                                $translator_property = $I18N_class->getProperty('translator');
+                                $translator_property->setAccessible(true);
+                                $wt_translator = $translator_property->getValue();
+
+                                $translator_class = new ReflectionClass(get_class($wt_translator));
+                                $translations_property = $translator_class->getProperty('translations');
+                                $translations_property->setAccessible(true);
+                                $this->loaded_translations = collect($translations_property->getValue($wt_translator));
+                                }
+                                return $this->loaded_translations;
+                                }
+
+                                /**
+                                 * Returns the list of translations loaded in MyArtJaub modules.
+                                 * The returned structure is an associative Collection with :
+                                 *      - key: MD5 hash of the translation key
+                                 *      - value: array [
+                                 *              0 => Module name
+                                 *              1 => Translation key
+                                 *          ]
+                                 *
+                                 * @return Collection
+                                 */
+                                private function loadedMyArtJaubTranslations(): Collection
+                                {
+                                if ($this->maj_translations === null) {
+                                $maj_translations_list = $this->sourcecode_service->listMyArtJaubTranslations($this->language);
+
+                                $this->maj_translations = new Collection();
+                                foreach ($maj_translations_list as $module => $maj_mod_translations) {
+                                foreach (array_keys($maj_mod_translations) as $maj_mod_translation) {
+                                $this->maj_translations->put(md5((string) $maj_mod_translation), [$module, $maj_mod_translation]);
+                                }
+                                }
+                                }
+                                return $this->maj_translations;
+                                }
+
+                                /*************************
      *  Analyzer functions   *
      *************************/
 
 
-    /**
-     * Returns the translations missing through the standard I18N.
-     * The returned array is composed of items with the structure:
-     *      - array [
-     *              0 => GetText Translations Header (including domain)
-     *              1 => GetTex Translation
-     *          ]
-     *
-     * @return array
-     */
-    public function missingTranslations(): array
-    {
-        $missing_translations = array();
-        foreach ($this->stringsToTranslate() as $translation_info) {
-            list(, $translation) = $translation_info;
-            if (!$this->loadedTranslations()->has($this->getTranslationKey($translation))) {
-                $missing_translations[] = $translation_info;
-            }
-        }
-
-        return $missing_translations;
-    }
-
-    /**
-     * Returns the translations defined in the MaJ modules, but not actually used in the code.
-     * The returned array is composed of items with the structure:
-     *      - array [
-     *              0 => Module name
-     *              1 => Translation key
-     *          ]
-     *
-     * @return array
-     */
-    public function nonUsedMajTranslations(): array
-    {
-        $removed_translations = array();
-        $strings_to_translate_list = $this->stringsToTranslate();
-        foreach ($this->loadedMyArtJaubTranslations() as $msgid => $translation_info) {
-            if (!$strings_to_translate_list->has($msgid)) {
-                $removed_translations[] = $translation_info;
-            }
-        }
-        return $removed_translations;
-    }
-
-    /**
-     * Get some statistics about the translations data.
-     * Returns an array with the statistics:
-     *      nbTranslations : total number of translations
-     *      nbTranslationsFound: total number of translations found in the code
-     *      nbMajTranslations: total number of translations loaded in the MyArtJaub modules
-     *
-     * @return array
-     */
-    public function translationsStatictics(): array
-    {
-        return array(
-            'nbTranslations' => $this->loadedTranslations()->count(),
-            'nbTranslationsFound' => $this->stringsToTranslate()->count(),
-            'nbMajTranslations' => $this->loadedMyArtJaubTranslations()->count()
-        );
-    }
+                                /**
+                                 * Returns the translations missing through the standard I18N.
+                                 * The returned array is composed of items with the structure:
+                                 *      - array [
+                                 *              0 => GetText Translations Header (including domain)
+                                 *              1 => GetTex Translation
+                                 *          ]
+                                 *
+                                 * @return array
+                                 */
+                                public function missingTranslations(): array
+                                {
+                                $missing_translations = array();
+                                foreach ($this->stringsToTranslate() as $translation_info) {
+                                list(, $translation) = $translation_info;
+                                if (!$this->loadedTranslations()->has($this->getTranslationKey($translation))) {
+                                $missing_translations[] = $translation_info;
+                                }
+                                }
+
+                                return $missing_translations;
+                                }
+
+                                /**
+                                 * Returns the translations defined in the MaJ modules, but not actually used in the code.
+                                 * The returned array is composed of items with the structure:
+                                 *      - array [
+                                 *              0 => Module name
+                                 *              1 => Translation key
+                                 *          ]
+                                 *
+                                 * @return array
+                                 */
+                                public function nonUsedMajTranslations(): array
+                                {
+                                $removed_translations = array();
+                                $strings_to_translate_list = $this->stringsToTranslate();
+                                foreach ($this->loadedMyArtJaubTranslations() as $msgid => $translation_info) {
+                                if (!$strings_to_translate_list->has($msgid)) {
+                                $removed_translations[] = $translation_info;
+                                }
+                                }
+                                return $removed_translations;
+                                }
+
+                                /**
+                                 * Get some statistics about the translations data.
+                                 * Returns an array with the statistics:
+                                 *      nbTranslations : total number of translations
+                                 *      nbTranslationsFound: total number of translations found in the code
+                                 *      nbMajTranslations: total number of translations loaded in the MyArtJaub modules
+                                 *
+                                 * @return array
+                                 */
+                                public function translationsStatictics(): array
+                                {
+                                return array(
+                                'nbTranslations' => $this->loadedTranslations()->count(),
+                                'nbTranslationsFound' => $this->stringsToTranslate()->count(),
+                                'nbMajTranslations' => $this->loadedMyArtJaubTranslations()->count()
+                                );
+                                }
 }

Spacing +2 added lines, -2 removed lines

@@ -91,11 +91,11 @@
         $key = $translation->getOriginal();
         $translation_plural = $translation->getPlural();
         if ($translation_plural !== null && strlen($translation_plural) > 0) {
-            $key .= I18N::PLURAL . $translation_plural;
+            $key .= I18N::PLURAL.$translation_plural;
         }
         $translation_context = $translation->getContext();
         if ($translation_context !== null && strlen($translation_context) > 0) {
-            $key = $translation_context . I18N::CONTEXT . $key;
+            $key = $translation_context.I18N::CONTEXT.$key;
         }
         return $key;
     }