Fix more ns

composer.json

@@ -46,9 +46,9 @@
         "laravel/laravel": "To use Laravel (The awesome) implementations"
     },
     "autoload": {
-        "classmap": [
-            "src"
-        ],
+        "psr-4": {
+            "fab2s\\YaEtl\\": "src"
+        },
         "files": [
             "src/support/deprecated.php"
         ]

src/Events/ProgressBarSubscriber.php

@@ -7,12 +7,13 @@
  * find in the LICENSE file or at https://opensource.org/licenses/MIT
  */
 
-namespace fab2s\YaEtl\Laravel\Callbacks;
+namespace fab2s\YaEtl\Events;
 
 use fab2s\NodalFlow\Events\FlowEvent;
 use fab2s\NodalFlow\Events\FlowEventInterface;
 use fab2s\NodalFlow\Flows\FlowInterface;
 use fab2s\YaEtl\YaEtl;
+use ReflectionException;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -54,7 +55,7 @@ class ProgressBarSubscriber implements EventSubscriberInterface
      *
      * @param YaEtl|null $flow
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function __construct(YaEtl $flow = null)
     {
@@ -67,7 +68,7 @@ public function __construct(YaEtl $flow = null)
     /**
      * @param YaEtl $flow
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      *
      * @return static
      */
@@ -111,7 +112,7 @@ public function setOutput(OutputInterface $output): self
      */
     public function setProgressMod(int $progressMod): self
     {
-        $this->progressMod = max(1, (int) $progressMod);
+        $this->progressMod = max(1, $progressMod);
 
         return $this;
     }
@@ -148,7 +149,7 @@ public function start(FlowEventInterface $event)
 
     /**
      * Triggered when a Flow progresses,
-     * eg exec once or generates once
+     * e.g. exec once or generates once
      */
     public function progress()
     {
@@ -163,11 +164,11 @@ public function progress()
     public function success(FlowEventInterface $event)
     {
         $this->progressBar->finish();
-        $this->output->writeln(PHP_EOL);
+        $this->output->writeln('');
         $flow       = $event->getFlow();
         $flowStatus = $flow->getFlowStatus();
         if ($flowStatus->isDirty()) {
-            $this->output->writeln('<warn>[YaEtl] Dirty Success</warn>');
+            $this->output->writeln('<comment>[YaEtl] Dirty Success</comment>');
         } else {
             $this->output->writeln('<info>[YaEtl] Clean Success</info>');
         }
@@ -183,7 +184,7 @@ public function success(FlowEventInterface $event)
     public function fail(FlowEventInterface $event)
     {
         $this->progressBar->finish();
-        $this->output->writeln(PHP_EOL);
+        $this->output->writeln('');
         $this->output->writeln('<error>[YaEtl] Failed</error>');
         $this->displayReport($event->getFlow());
     }

src/support/deprecated.php

@@ -9,13 +9,23 @@
 
 namespace {
     class_alias(\fab2s\YaEtl\YaEtlException::class, \fab2s\NodalFlow\YaEtlException::class);
+    class_alias(\fab2s\YaEtl\Events\ProgressBarSubscriber::class, \fab2s\YaEtl\Laravel\Callbacks\ProgressBarSubscriber::class);
 }
 
 namespace fab2s\NodalFlow {
     if (!class_exists(YaEtlException::class)) {
-        /** @deprecated YaEtlException this is intended to help IDEs */
+        /** @deprecated YaEtlException use fab2s\NodalFlow\YaEtlException instead (NS update) */
         class YaEtlException
         {
         }
     }
 }
+
+namespace fab2s\YaEtl\Laravel\Callbacks {
+    if (!class_exists(ProgressBarSubscriber::class)) {
+        /** @deprecated ProgressBarSubscriber use fab2s\YaEtl\Events\ProgressBarSubscriber instead (NS update) */
+        class ProgressBarSubscriber
+        {
+        }
+    }
+}

tests/FileTest.php

@@ -20,7 +20,7 @@
 /**
  * Class FileTest
  */
-class FileTest extends \TestBase
+class FileTest extends TestBase
 {
     /**
      * @var array

tests/FromTest.php

@@ -18,7 +18,7 @@
 /**
  * Class FromTest
  */
-class FromTest extends \TestBase
+class FromTest extends TestBase
 {
     public function setUp(): void
     {

tests/JoinTest.php

@@ -16,7 +16,7 @@
 /**
  * Class JoinTest
  */
-class JoinTest extends \TestBase
+class JoinTest extends TestBase
 {
     public function setUp(): void
     {

tests/ProgressTest.php

@@ -8,16 +8,16 @@
  */
 
 use fab2s\NodalFlow\NodalFlowException;
+use fab2s\YaEtl\Events\ProgressBarSubscriber;
 use fab2s\YaEtl\Extractors\CallableExtractor;
-use fab2s\YaEtl\Laravel\Callbacks\ProgressBarSubscriber;
 use fab2s\YaEtl\Transformers\NoOpTransformer;
 use fab2s\YaEtl\YaEtl;
 use Symfony\Component\Console\Output\StreamOutput;
 
 /**
  * Class ProgressTest
  */
-class ProgressTest extends \TestBase
+class ProgressTest extends TestBase
 {
     /**
      * @dataProvider progressProvider
@@ -137,7 +137,7 @@ protected function getStreamContent($stream, bool $normalize = false): string
     /**
      * @return Closure
      */
-    protected function getNoOpClosure(): \Closure
+    protected function getNoOpClosure(): Closure
     {
         return function ($record) {
             return $record;
@@ -149,7 +149,7 @@ protected function getNoOpClosure(): \Closure
      *
      * @return Closure
      */
-    protected function getTraversableClosure($limit = 10): \Closure
+    protected function getTraversableClosure(int $limit = 10): Closure
     {
         return function () use ($limit) {
             for ($i = 1; $i <= $limit; ++$i) {

tests/QualifierTest.php

@@ -19,7 +19,7 @@
 /**
  * Class QualifierTest
  */
-class QualifierTest extends \TestBase
+class QualifierTest extends TestBase
 {
     /**
      * @dataProvider interruptProvider