Fixed CompileCommand

Removed normalizePath, added _pathInfo

Author: ProgMiner

.gitignore

@@ -1,2 +1,4 @@
 /vendor/
 composer.phar
+
+Data_*.php

app/Command/CompileCommand.php

@@ -42,7 +42,7 @@
 
 use PHPDataGen\Compiler;
 
-use function PHPDataGen\Utility\normalizePath;
+use function PHPDataGen\Utility\_pathInfo;
 
 /**
  * Compile command
@@ -53,7 +53,9 @@ class CompileCommand extends Command {
     protected function compileFile(string $file, OutputStyle $io, Compiler $compiler = null) {
         $io->title($file);
 
-        if (preg_match('/.*\\.pdata/i', $file) === 0) {
+        $pathinfo = _pathInfo($file);
+
+        if ($pathinfo->extension !== 'pdata') {
             $io->warning("File \"$file\" extension is not \".pdata\"");
         }
 
@@ -71,13 +73,13 @@ protected function compileFile(string $file, OutputStyle $io, Compiler $compiler
         }
 
         $model = $parser->getCurrentState()->getBuilder()->build();
-        if (count($model->classes) > 1) {
+        if (count($model->classes) < 1) {
+            $io->warning("File has no classes");
+        } elseif (count($model->classes) > 1) {
             $io->warning("File has more than one class");
         } else {
-            $namespacePath = str_replace('\\', '/', $model->namespace)."/{$model->classes[0]->name}.pdata";
-
-            if (strpos(normalizePath($file), $namespacePath) === false) {
-                $io->warning("File path is mismatch class name");
+            if ($pathinfo->filename !== $model->classes[0]->name) {
+                $io->warning("File name is mismatch class name");
             }
         }
 
@@ -89,7 +91,10 @@ protected function compileFile(string $file, OutputStyle $io, Compiler $compiler
             return;
         }
 
-        file_put_contents(dirname($file).'/Data_'.basename($file, '.pdata').'.php', $result);
+        $resultPath = "{$pathinfo->dirname}/Data_{$pathinfo->filename}.php";
+        file_put_contents($resultPath, $result);
+
+        $io->success("Written in $resultPath");
     }
 
     protected function configure() {

tests/FieldModel.pdata renamed to app/Model/FieldModel.pdata

@@ -25,41 +25,26 @@
 namespace PHPDataGen\Utility;
 
 /**
- * Path normalize function
+ * Extracts directory path, filename, file extension from file path
  *
- * @link http://php.net/manual/function.realpath.php#112367
+ * Return object contains 3 fields:
+ *   - dirname   - Directory path
+ *   - filename  - String before first dot in basename
+ *   - extension - String after first dot in basename
  *
  * @param string $path
  *
- * @return string Normalized path
+ * @return \stdClass
  */
-function normalizePath(string $path): string {
-    $parts = array(); // Array to build a new path from the good parts
-    $path = str_replace('\\', '/', $path); // Replace backslashes with forwardslashes
-    $path = preg_replace('/\/+/', '/', $path); // Combine multiple slashes into a single slash
-    $segments = explode('/', $path); // Collect path segments
+function _pathInfo(string $path): \stdClass {
+    $ret = (object) [];
 
-    $test = ''; // Initialize testing variable
-    foreach ($segments as $segment) {
-        if ($segment != '.') {
-            $test = array_pop($parts);
+    $info = pathinfo($path);
+    $dot = strpos($info['basename'], '.');
 
-            if (is_null($test)) {
-                $parts[] = $segment;
-            } else if ($segment == '..') {
-                if ($test == '..') {
-                    $parts[] = $test;
-                }
+    $ret->dirname = $info['dirname'];
+    $ret->extension = substr($info['basename'], $dot + 1);
+    $ret->filename = substr($info['basename'], 0, $dot);
 
-                if ($test == '..' || $test == '') {
-                    $parts[] = $segment;
-                }
-            } else {
-                $parts[] = $test;
-                $parts[] = $segment;
-            }
-        }
-    }
-
-    return implode('/', $parts);
+    return $ret;
 }

app/Utility/normalizePath.php renamed to app/Utility/_pathInfo.php

@@ -21,7 +21,7 @@
             "PHPDataGen\\": "app"
         },
         "files": [
-            "app/Utility/normalizePath.php"
+            "app/Utility/_pathInfo.php"
         ]
     },
     "config": {