Modernize

Author: pmaselkowski

composer.json

@@ -14,14 +14,13 @@
     "maslosoft/miniview": "*",
     "maslosoft/addendum": "*",
     "maslosoft/sitcom": "*",
-    "symfony/console": ">=2.7 <7.0",
+    "symfony/console": ">=7",
     "maslosoft/whitelist": "*"
   },
   "bin": [
     "i18n-extractor"
   ],
   "require-dev": {
-    "maslosoft/hedron": "*",
     "codeception/module-asserts": "^3",
     "codeception/codeception": "^5"
   },

composer.lock

@@ -0,0 +1 @@
+i18n-extractor

msft

@@ -33,16 +33,16 @@
 class ContextFiller implements FillerInterface
 {
 
-	private $searchPaths = [];
+	private array $searchPaths = [];
 
-	public function fill($searchPaths = [])
+	public function fill($searchPaths = []): void
 	{
 		$this->searchPaths = $searchPaths;
 
 		FileWalker::scan([$this, 'walk'], $this->searchPaths);
 	}
 
-	public function walk($file, $content)
+	public function walk($file, $content): void
 	{
 		$context = Context::create($file, $this->searchPaths);
 		$tokenizer = new Tokenizer($content);
@@ -64,7 +64,7 @@ public function walk($file, $content)
 		/* @var $txCalls[] TokenInterface */
 		foreach ($functions as $function)
 		{
-			if (in_array($function->value, array_keys($txFunctions)))
+			if (array_key_exists($function->value, $txFunctions))
 			{
 				$txCalls[] = $function;
 			}

src/ContextFiller.php

@@ -22,7 +22,7 @@
 class DirectoryContextFiller implements FillerInterface
 {
 
-	public function fill($src = 'src')
+	public function fill($src = 'src'): void
 	{
 		$extractor = new ContextFiller();
 		$extractor->fill([$src]);

src/DirectoryContextFiller.php

@@ -22,7 +22,7 @@
 class DirectoryExtractor implements ExtractorInterface
 {
 
-	public function extract($src = 'src', $dest = 'generated')
+	public function extract($src = 'src', $dest = 'generated'): void
 	{
 		$extractor = new I18NExtractor();
 		$extractor->generate([$src], $dest);

src/DirectoryExtractor.php

@@ -31,8 +31,8 @@
 
 class AnnotationsExtractor
 {
-	const Method = 'method';
-	const Field = 'field';
+	public const Method = 'method';
+	public const Field = 'field';
 
 	/**
 	 * Extractor instance
@@ -45,7 +45,7 @@ public function __construct(I18NExtractor $extractor)
 		$this->extractor = $extractor;
 	}
 
-	public function getMessages($file)
+	public function getMessages($file): array
 	{
 		$annotations = AnnotationUtility::rawAnnotate($file);
 

src/Helpers/AnnotationsExtractor.php

@@ -25,11 +25,11 @@ class Context
 
 	/**
 	 * Create context based on file name
-	 * @param string $file
+	 * @param string   $file
 	 * @param string[] $trimPaths
 	 * @return string
 	 */
-	public static function create($file, $trimPaths = [])
+	public static function create(string $file, array $trimPaths = []): string
 	{
 		// Replace windows slashes
 		$file = str_replace('\\', '/', $file);
@@ -40,7 +40,7 @@ public static function create($file, $trimPaths = [])
 		// Remove search paths in from of file path
 		foreach ($trimPaths as $path)
 		{
-			$pathQuoted = preg_quote($path);
+			$pathQuoted = preg_quote($path, '~');
 			$pattern = "~^$pathQuoted/~";
 			if (preg_match($pattern, $name))
 			{

src/Helpers/Context.php

@@ -39,7 +39,7 @@ class FileWalker
 	 *
 	 * @param callback $callback
 	 */
-	public static function scan($callback, $searchPaths = [])
+	public static function scan(callable $callback, $searchPaths = []): void
 	{
 		foreach ($searchPaths as $path)
 		{
@@ -59,7 +59,7 @@ public static function scan($callback, $searchPaths = [])
 					// TODO Log this
 					continue;
 				}
-				call_user_func($callback, $file, $contents);
+				$callback($file, $contents);
 			}
 		}
 	}

src/Helpers/FileWalker.php

@@ -42,11 +42,13 @@ class I18NExtractor
 	 */
 	const ConfigName = "i18n-extractor";
 
+	protected EmbeDi $di;
+
 	/**
 	 * View Renderer
 	 * @var MiniView
 	 */
-	public $view = null;
+	public MiniView $view;
 
 	public $i18nAnnotations = [
 		'Label',