Fix namespace

Fix #2

composer.json

@@ -43,6 +43,9 @@
     "autoload": {
         "classmap": [
             "src"
+        ],
+        "files": [
+            "src/support/deprecated.php"
         ]
     }
 }

src/Extractors/File/CsvExtractor.php

@@ -7,11 +7,10 @@
  * find in the LICENSE file or at https://opensource.org/licenses/MIT
  */
 
-namespace fab2s\YaEtl\Loaders\File;
+namespace fab2s\YaEtl\Extractors\File;
 
 use fab2s\NodalFlow\NodalFlowException;
 use fab2s\NodalFlow\YaEtlException;
-use fab2s\YaEtl\Extractors\File\FileExtractorAbstract;
 use fab2s\YaEtl\Traits\CsvHandlerTrait;
 
 /**

src/support/deprecated.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of YaEtl.
+ *     (c) Fabrice de Stefanis / https://github.com/fab2s/YaEtl
+ * This source file is licensed under the MIT license which you will
+ * find in the LICENSE file or at https://opensource.org/licenses/MIT
+ */
+
+namespace {
+    /* @see  https://github.com/fab2s/YaEtl/issues/2 */
+    class_alias(\fab2s\YaEtl\Extractors\File\CsvExtractor::class, \fab2s\YaEtl\Loaders\File\CsvExtractor::class);
+}
+
+namespace fab2s\YaEtl\Loaders\File {
+    if (!class_exists(CsvExtractor::class)) {
+        /** @deprecated CsvExtractor this is intended to help IDEs */
+        class CsvExtractor
+        {
+        }
+    }
+}

tests/FileTest.php

@@ -10,8 +10,10 @@
 use fab2s\NodalFlow\NodalFlowException;
 use fab2s\NodalFlow\YaEtlException;
 use fab2s\YaEtl\Extractors\CallableExtractor;
+use fab2s\YaEtl\Extractors\File\CsvExtractor;
+use fab2s\YaEtl\Extractors\File\FileExtractorAbstract;
 use fab2s\YaEtl\Extractors\File\LineExtractor;
-use fab2s\YaEtl\Loaders\File\CsvExtractor;
+use fab2s\YaEtl\Loaders\File\CsvExtractor as DeprecatedCsvExtractor;
 use fab2s\YaEtl\Loaders\File\CsvLoader;
 use fab2s\YaEtl\Transformers\CallableTransformer;
 use fab2s\YaEtl\YaEtl;
@@ -77,20 +79,22 @@ public function testLineExtractor($srcPath, array $expected)
      */
     public function testCsvExtractor($srcPath, $useHeader, array $expected)
     {
-        $csvExtractor = new CsvExtractor($srcPath);
-        $csvExtractor->setUseHeader($useHeader);
-
-        (new YaEtl)->from($csvExtractor)
-            ->transform(new CallableTransformer(function ($record) use ($csvExtractor, $expected, $useHeader) {
-                static $i = 0;
-                $expected = $useHeader ? array_combine($csvExtractor->getHeader(), $expected['values'][$i]) : $expected['values'][$i];
-                $this->assertSame($expected, $record);
-                ++$i;
-            }))
-            ->exec();
+        $this->csvExtractorAssertions(new CsvExtractor($srcPath), $useHeader, $expected);
+    }
 
-        $this->assertSame($expected['header'], $csvExtractor->getHeader());
-        $this->assertSame($expected['encoding'], $csvExtractor->getEncoding());
+    /**
+     * @dataProvider csvExtractorProvider
+     *
+     * @param string $srcPath
+     * @param bool   $useHeader
+     * @param array  $expected
+     *
+     * @throws NodalFlowException
+     * @throws YaEtlException
+     */
+    public function testDeprecatedCsvExtractor($srcPath, $useHeader, array $expected)
+    {
+        $this->csvExtractorAssertions(new DeprecatedCsvExtractor($srcPath), $useHeader, $expected);
     }
 
     /**
@@ -215,6 +219,32 @@ public function lineExtractorProvider()
         ];
     }
 
+    /**
+     * @param FileExtractorAbstract $csvExtractor
+     * @param                       $useHeader
+     * @param array                 $expected
+     *
+     * @throws NodalFlowException
+     * @throws YaEtlException
+     */
+    protected function csvExtractorAssertions(FileExtractorAbstract $csvExtractor, $useHeader, array $expected)
+    {
+        /* @var  CsvExtractor $csvExtractor */
+        $csvExtractor->setUseHeader($useHeader);
+
+        (new YaEtl)->from($csvExtractor)
+            ->transform(new CallableTransformer(function ($record) use ($csvExtractor, $expected, $useHeader) {
+                static $i = 0;
+                $expected = $useHeader ? array_combine($csvExtractor->getHeader(), $expected['values'][$i]) : $expected['values'][$i];
+                $this->assertSame($expected, $record);
+                ++$i;
+            }))
+            ->exec();
+
+        $this->assertSame($expected['header'], $csvExtractor->getHeader());
+        $this->assertSame($expected['encoding'], $csvExtractor->getEncoding());
+    }
+
     /**
      * @return bool|string
      */