Fix #39: Adjust namespaces

Author: mapeveri

composer.json

@@ -25,7 +25,7 @@
     "require": {
         "php": "^7.4",
         "psr/event-dispatcher": "^1.0",
-        "psr/log": "^1.1",        
+        "psr/log": "^1.1",
         "yiisoft/friendly-exception": "^1.0",
         "yiisoft/yii-console": "^3.0@dev"
     },
@@ -34,7 +34,8 @@
         "pda/pheanstalk": "*",
         "phpunit/phpunit": "^9.0",
         "yiisoft/di": "^3.0@dev",
-        "yiisoft/log": "^3.0@dev"
+        "yiisoft/log": "^3.0@dev",
+        "yiisoft/event-dispatcher": "^3.0@dev"
     },
     "suggest": {
         "ext-pcntl": "Need for process signals."

config/common.php

@@ -4,8 +4,8 @@
 use Psr\EventDispatcher\ListenerProviderInterface;
 use Yiisoft\EventDispatcher\Dispatcher\Dispatcher;
 use Yiisoft\EventDispatcher\Provider\Provider;
-use Yiisoft\Yii\Queue\Workers\Worker as QueueWorker;
-use Yiisoft\Yii\Queue\Workers\WorkerInterface;
+use Yiisoft\Yii\Queue\Worker\Worker as QueueWorker;
+use Yiisoft\Yii\Queue\Worker\WorkerInterface;
 
 return [
     EventDispatcherInterface::class => Dispatcher::class,

config/params.php

@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Yii\Queue\Commands\ListenCommand;
-use Yiisoft\Yii\Queue\Commands\RunCommand;
+use Yiisoft\Yii\Queue\Command\ListenCommand;
+use Yiisoft\Yii\Queue\Command\RunCommand;
 
 return [
     'console' => [

config/tests.php

@@ -5,6 +5,6 @@
 //        '@runtime' => dirname(__DIR__) . '/tests/runtime',
 //    ],
 //    'syncQueue' => [
-//        '__class' => \Yiisoft\Yii\Queue\Drivers\Sync\Queue::class,
+//        '__class' => \Yiisoft\Yii\Queue\Driver\Sync\Queue::class,
 //    ],
 ];

src/Commands/ListenCommand.php renamed to src/Command/ListenCommand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Commands;
+namespace Yiisoft\Yii\Queue\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

src/Commands/RunCommand.php renamed to src/Command/RunCommand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Commands;
+namespace Yiisoft\Yii\Queue\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

src/DriverInterface.php

@@ -6,10 +6,10 @@
 
 use InvalidArgumentException;
 use Yiisoft\Yii\Queue\Enum\JobStatus;
-use Yiisoft\Yii\Queue\Jobs\DelayableJobInterface;
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
-use Yiisoft\Yii\Queue\Jobs\PrioritisedJobInterface;
-use Yiisoft\Yii\Queue\Jobs\RetryableJobInterface;
+use Yiisoft\Yii\Queue\Job\DelayableJobInterface;
+use Yiisoft\Yii\Queue\Job\JobInterface;
+use Yiisoft\Yii\Queue\Job\PrioritisedJobInterface;
+use Yiisoft\Yii\Queue\Job\RetryableJobInterface;
 
 interface DriverInterface
 {

src/Enum/JobStatus.php

@@ -4,7 +4,7 @@
 
 namespace Yiisoft\Yii\Queue\Enum;
 
-use Yiisoft\Yii\Queue\Exceptions\InvalidStatusException;
+use Yiisoft\Yii\Queue\Exception\InvalidStatusException;
 
 class JobStatus
 {

src/Events/AfterExecution.php renamed to src/Event/AfterExecution.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Events;
+namespace Yiisoft\Yii\Queue\Event;
 
 use Yiisoft\Yii\Queue\MessageInterface;
 use Yiisoft\Yii\Queue\Queue;

src/Events/AfterPush.php renamed to src/Event/AfterPush.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Events;
+namespace Yiisoft\Yii\Queue\Event;
 
 use Yiisoft\Yii\Queue\MessageInterface;
 use Yiisoft\Yii\Queue\Queue;

src/Events/BeforeExecution.php renamed to src/Event/BeforeExecution.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Events;
+namespace Yiisoft\Yii\Queue\Event;
 
 use Yiisoft\Yii\Queue\MessageInterface;
 use Yiisoft\Yii\Queue\Queue;

src/Events/BeforePush.php renamed to src/Event/BeforePush.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Events;
+namespace Yiisoft\Yii\Queue\Event;
 
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
+use Yiisoft\Yii\Queue\Job\JobInterface;
 use Yiisoft\Yii\Queue\Queue;
 
 final class BeforePush

src/Events/JobFailure.php renamed to src/Event/JobFailure.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Events;
+namespace Yiisoft\Yii\Queue\Event;
 
 use Throwable;
 use Yiisoft\Yii\Queue\MessageInterface;

src/Exceptions/InvalidStatusException.php renamed to src/Exception/InvalidStatusException.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Exceptions;
+namespace Yiisoft\Yii\Queue\Exception;
 
 use InvalidArgumentException;
 use Throwable;

src/Exceptions/JobNotSupportedException.php renamed to src/Exception/JobNotSupportedException.php

@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Exceptions;
+namespace Yiisoft\Yii\Queue\Exception;
 
 use Throwable;
 use UnexpectedValueException;
 use Yiisoft\FriendlyException\FriendlyExceptionInterface;
 use Yiisoft\Yii\Queue\DriverInterface;
-use Yiisoft\Yii\Queue\Jobs\DelayableJobInterface;
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
-use Yiisoft\Yii\Queue\Jobs\PrioritisedJobInterface;
-use Yiisoft\Yii\Queue\Jobs\RetryableJobInterface;
+use Yiisoft\Yii\Queue\Job\DelayableJobInterface;
+use Yiisoft\Yii\Queue\Job\JobInterface;
+use Yiisoft\Yii\Queue\Job\PrioritisedJobInterface;
+use Yiisoft\Yii\Queue\Job\RetryableJobInterface;
 
 class JobNotSupportedException extends UnexpectedValueException implements FriendlyExceptionInterface
 {

src/Jobs/AttemptsRestrictedJob.php renamed to src/Job/AttemptsRestrictedJob.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Jobs;
+namespace Yiisoft\Yii\Queue\Job;
 
 use Throwable;
 

src/Jobs/CallableJob.php renamed to src/Job/CallableJob.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Jobs;
+namespace Yiisoft\Yii\Queue\Job;
 
 use Yiisoft\Serializer\SerializerInterface;
 

src/Jobs/DelayableJobInterface.php renamed to src/Job/DelayableJobInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Jobs;
+namespace Yiisoft\Yii\Queue\Job;
 
 interface DelayableJobInterface extends JobInterface
 {

src/Jobs/JobInterface.php renamed to src/Job/JobInterface.php

@@ -6,7 +6,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace Yiisoft\Yii\Queue\Jobs;
+namespace Yiisoft\Yii\Queue\Job;
 
 /**
  * Job Interface.

src/Jobs/PrioritisedJobInterface.php renamed to src/Job/PrioritisedJobInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Jobs;
+namespace Yiisoft\Yii\Queue\Job;
 
 interface PrioritisedJobInterface extends JobInterface
 {

src/Jobs/RetryableJobInterface.php renamed to src/Job/RetryableJobInterface.php

@@ -6,7 +6,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace Yiisoft\Yii\Queue\Jobs;
+namespace Yiisoft\Yii\Queue\Job;
 
 use Throwable;
 

src/Message.php

@@ -4,7 +4,7 @@
 
 namespace Yiisoft\Yii\Queue;
 
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
+use Yiisoft\Yii\Queue\Job\JobInterface;
 
 class Message implements MessageInterface
 {

src/MessageInterface.php

@@ -4,7 +4,7 @@
 
 namespace Yiisoft\Yii\Queue;
 
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
+use Yiisoft\Yii\Queue\Job\JobInterface;
 
 interface MessageInterface
 {

src/Queue.php

@@ -8,13 +8,13 @@
 use Yiisoft\EventDispatcher\Provider\Provider;
 use Yiisoft\Yii\Queue\Cli\LoopInterface;
 use Yiisoft\Yii\Queue\Enum\JobStatus;
-use Yiisoft\Yii\Queue\Events\AfterPush;
-use Yiisoft\Yii\Queue\Events\BeforePush;
-use Yiisoft\Yii\Queue\Events\JobFailure;
-use Yiisoft\Yii\Queue\Exceptions\InvalidJobException;
-use Yiisoft\Yii\Queue\Exceptions\JobNotSupportedException;
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
-use Yiisoft\Yii\Queue\Workers\WorkerInterface;
+use Yiisoft\Yii\Queue\Event\AfterPush;
+use Yiisoft\Yii\Queue\Event\BeforePush;
+use Yiisoft\Yii\Queue\Event\JobFailure;
+use Yiisoft\Yii\Queue\Exception\InvalidJobException;
+use Yiisoft\Yii\Queue\Exception\JobNotSupportedException;
+use Yiisoft\Yii\Queue\Job\JobInterface;
+use Yiisoft\Yii\Queue\Worker\WorkerInterface;
 
 /**
  * Base Queue.

src/Workers/Worker.php renamed to src/Worker/Worker.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Workers;
+namespace Yiisoft\Yii\Queue\Worker;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
-use Yiisoft\Yii\Queue\Events\AfterExecution;
-use Yiisoft\Yii\Queue\Events\BeforeExecution;
-use Yiisoft\Yii\Queue\Events\JobFailure;
+use Yiisoft\Yii\Queue\Event\AfterExecution;
+use Yiisoft\Yii\Queue\Event\BeforeExecution;
+use Yiisoft\Yii\Queue\Event\JobFailure;
 use Yiisoft\Yii\Queue\MessageInterface;
 use Yiisoft\Yii\Queue\Queue;
 

src/Workers/WorkerInterface.php renamed to src/Worker/WorkerInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Workers;
+namespace Yiisoft\Yii\Queue\Worker;
 
 use Yiisoft\Yii\Queue\MessageInterface;
 use Yiisoft\Yii\Queue\Queue;

tests/App/SimpleJob.php

@@ -8,7 +8,7 @@
 
 namespace Yiisoft\Yii\Queue\Tests\App;
 
-use Yiisoft\Yii\Queue\Jobs\JobInterface;
+use Yiisoft\Yii\Queue\Job\JobInterface;
 
 /**
  * Simple Job.

tests/unit/WorkerTest.php

@@ -7,14 +7,14 @@
 use Psr\EventDispatcher\ListenerProviderInterface;
 use RuntimeException;
 use Yiisoft\EventDispatcher\Provider\Provider;
-use Yiisoft\Yii\Queue\Events\BeforeExecution;
-use Yiisoft\Yii\Queue\Events\JobFailure;
+use Yiisoft\Yii\Queue\Event\BeforeExecution;
+use Yiisoft\Yii\Queue\Event\JobFailure;
 use Yiisoft\Yii\Queue\Message;
 use Yiisoft\Yii\Queue\Queue;
 use Yiisoft\Yii\Queue\Tests\App\ExceptionalSimpleJob;
 use Yiisoft\Yii\Queue\Tests\App\SimpleJob;
 use Yiisoft\Yii\Queue\Tests\TestCase;
-use Yiisoft\Yii\Queue\Workers\Worker;
+use Yiisoft\Yii\Queue\Worker\Worker;
 
 class WorkerTest extends TestCase
 {