Skip to content

Commit

Permalink
remove deps from dispatcher
Browse files Browse the repository at this point in the history
  • Loading branch information
marcogiovinazzi committed Aug 22, 2017
1 parent bcdb611 commit f025924
Show file tree
Hide file tree
Showing 20 changed files with 76 additions and 1,447 deletions.
10 changes: 8 additions & 2 deletions .gitignore
Expand Up @@ -4,5 +4,11 @@ coverage.clover
vendor/
docs/_build/
build
tests/root/database/extender_test
tests/root/logs/extenderd.log
tests/root/cache*
!tests/root/cache.placeholder
tests/root/database*
!tests/root/database.placeholder
tests/root/logs*
!tests/root/logs.placeholder
tests/root/run*
!tests/root/run.placeholder
2 changes: 1 addition & 1 deletion src/Comodojo/Extender/Components/Version.php
@@ -1,6 +1,6 @@
<?php namespace Comodojo\Extender\Components;

use \Comodojo\Dispatcher\Components\Configuration;
use \Comodojo\Foundation\Base\Configuration;

/**
* Version information class
Expand Down
112 changes: 0 additions & 112 deletions src/Comodojo/Extender/Extender.php

This file was deleted.

6 changes: 3 additions & 3 deletions src/Comodojo/Extender/ExtenderDaemon.php
Expand Up @@ -12,10 +12,10 @@
use \Comodojo\Extender\Queue\Manager as QueueManager;
use \Comodojo\Extender\Schedule\Manager as ScheduleManager;
use \Comodojo\Extender\Orm\Entities\Schedule;
use \Comodojo\Extender\Traits\CacheTrait;
use \Comodojo\Daemon\Daemon as AbstractDaemon;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Dispatcher\Traits\CacheTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Foundation\Events\Manager as EventsManager;
use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Foundation\Logging\Manager as LogManager;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Queue/Manager.php
Expand Up @@ -2,8 +2,8 @@

use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Foundation\Events\Manager as EventsManager;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Extender\Traits\EntityManagerTrait;
use \Comodojo\Extender\Task\Request;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Schedule/Manager.php
Expand Up @@ -2,8 +2,8 @@

use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Foundation\Events\Manager as EventsManager;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Extender\Traits\EntityManagerTrait;
use \Comodojo\Extender\Orm\Entities\Schedule;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Task/AbstractTask.php
Expand Up @@ -3,9 +3,9 @@
use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Extender\Interfaces\TaskInterface;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Daemon\Traits\PidTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Daemon\Utils\ProcessTools;
use \Psr\Log\LoggerInterface;
use \Comodojo\Foundation\Events\Manager as EventsManager;
Expand Down
2 changes: 1 addition & 1 deletion src/Comodojo/Extender/Task/Locker.php
Expand Up @@ -2,7 +2,7 @@

use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Psr\Log\LoggerInterface;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Task/Manager.php
Expand Up @@ -2,8 +2,8 @@

use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Foundation\Events\Manager as EventsManager;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Daemon\Utils\ProcessTools;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Extender\Traits\TasksTableTrait;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Task/Runner.php
Expand Up @@ -6,8 +6,8 @@
use \Comodojo\Extender\Events\TaskStatusEvent;
use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Foundation\Events\Manager as EventsManager;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Extender\Traits\TasksTableTrait;
use \Comodojo\Extender\Orm\Entities\Worklog;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Task/Table.php
Expand Up @@ -5,8 +5,8 @@
use \Comodojo\Foundation\DataAccess\ArrayAccessTrait;
use \Comodojo\Foundation\DataAccess\IteratorTrait;
use \Comodojo\Foundation\DataAccess\CountableTrait;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Psr\Log\LoggerInterface;
use \Iterator;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Task/TaskItem.php
@@ -1,7 +1,7 @@
<?php namespace Comodojo\Extender\Task;

use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Foundation\Base\Configuration;
use \Comodojo\Foundation\Events\Manager as EventsManager;
Expand Down
45 changes: 45 additions & 0 deletions src/Comodojo/Extender/Traits/CacheTrait.php
@@ -0,0 +1,45 @@
<?php namespace Comodojo\Extender\Traits;

use \Comodojo\SimpleCache\Manager as CacheManager;

/**
* @package Comodojo Dispatcher
* @author Marco Giovinazzi <marco.giovinazzi@comodojo.org>
* @author Marco Castiello <marco.castiello@gmail.com>
* @license GPL-3.0+
*
* LICENSE:
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

trait CacheTrait {

protected $cache;

public function getCache() {

return $this->cache;

}

public function setCache(CacheManager $cache) {

$this->cache = $cache;

return $this;

}

}
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Workers/QueueWorker.php
Expand Up @@ -4,8 +4,8 @@
use \Comodojo\Extender\Task\Manager as TaskManager;
use \Comodojo\Extender\Queue\Manager as QueueManager;
use \Comodojo\Extender\Task\Request;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Extender\Traits\TasksTableTrait;
use \Comodojo\Extender\Traits\EntityManagerTrait;
Expand Down
4 changes: 2 additions & 2 deletions src/Comodojo/Extender/Workers/ScheduleWorker.php
Expand Up @@ -4,8 +4,8 @@
use \Comodojo\Extender\Task\Manager as TaskManager;
use \Comodojo\Extender\Schedule\Manager as ScheduleManager;
use \Comodojo\Extender\Task\Request;
use \Comodojo\Daemon\Traits\LoggerTrait;
use \Comodojo\Daemon\Traits\EventsTrait;
use \Comodojo\Foundation\Logging\LoggerTrait;
use \Comodojo\Foundation\Events\EventsTrait;
use \Comodojo\Extender\Traits\ConfigurationTrait;
use \Comodojo\Extender\Traits\TasksTableTrait;
use \Comodojo\Extender\Traits\EntityManagerTrait;
Expand Down

0 comments on commit f025924

Please sign in to comment.