mirror of https://github.com/MISP/MISP
chg: remove LocatorAwareTrait as it was added to AppTable
parent
df136f6b3b
commit
6997e83420
|
@ -11,7 +11,6 @@ use Cake\Datasource\EntityInterface;
|
|||
use Cake\Event\EventInterface;
|
||||
use Cake\Http\Exception\MethodNotAllowedException;
|
||||
use Cake\Http\Exception\NotFoundException;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\Utility\Inflector;
|
||||
use Exception;
|
||||
use GlobIterator;
|
||||
|
@ -24,8 +23,6 @@ use RuntimeException;
|
|||
*/
|
||||
class GalaxiesTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
public $useTable = 'galaxies';
|
||||
|
||||
public $recursive = -1;
|
||||
|
|
|
@ -4,7 +4,6 @@ namespace App\Model\Table;
|
|||
|
||||
use App\Model\Entity\Distribution;
|
||||
use App\Model\Table\AppTable;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\Utility\Hash;
|
||||
use Cake\Validation\Validator;
|
||||
|
||||
|
@ -15,8 +14,6 @@ use Cake\Validation\Validator;
|
|||
*/
|
||||
class GalaxyClusterRelationsTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
public $useTable = 'galaxy_cluster_relations';
|
||||
|
||||
public $recursive = -1;
|
||||
|
|
|
@ -20,7 +20,6 @@ use Cake\Event\EventInterface;
|
|||
use Cake\Http\Exception\MethodNotAllowedException;
|
||||
use Cake\Http\Exception\NotFoundException;
|
||||
use Cake\I18n\FrozenTime;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\ORM\Query;
|
||||
use Cake\ORM\RulesChecker;
|
||||
use Cake\Utility\Hash;
|
||||
|
@ -38,8 +37,6 @@ use Exception;
|
|||
*/
|
||||
class GalaxyClustersTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
private $__assetCache = [];
|
||||
private $__clusterCache = [];
|
||||
private $deletedClusterUUID;
|
||||
|
|
|
@ -8,13 +8,10 @@ use App\Model\Table\AppTable;
|
|||
use ArrayObject;
|
||||
use Cake\Event\EventInterface;
|
||||
use Cake\Http\Exception\MethodNotAllowedException;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Exception;
|
||||
|
||||
class JobsTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
public function initialize(array $config): void
|
||||
{
|
||||
parent::initialize($config);
|
||||
|
@ -53,7 +50,6 @@ class JobsTable extends AppTable
|
|||
$EventsTable = $this->fetchTable('Events');
|
||||
|
||||
if (in_array($type, array_keys($EventsTable->exportTypes())) && $type !== 'bro') {
|
||||
|
||||
BackgroundJobsTool::getInstance()->enqueue(
|
||||
BackgroundJobsTool::CACHE_QUEUE,
|
||||
BackgroundJobsTool::CMD_EVENT,
|
||||
|
@ -67,7 +63,6 @@ class JobsTable extends AppTable
|
|||
$jobId
|
||||
);
|
||||
} elseif ($type === 'bro') {
|
||||
|
||||
BackgroundJobsTool::getInstance()->enqueue(
|
||||
BackgroundJobsTool::CACHE_QUEUE,
|
||||
BackgroundJobsTool::CMD_EVENT,
|
||||
|
|
|
@ -13,15 +13,12 @@ use Cake\Event\Event;
|
|||
use Cake\Event\EventInterface;
|
||||
use Cake\Http\Exception\MethodNotAllowedException;
|
||||
use Cake\Log\Engine\SyslogLog;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\Validation\Validator;
|
||||
use Exception;
|
||||
use InvalidArgumentException;
|
||||
|
||||
class LogsTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
const WARNING_ACTIONS = [
|
||||
'warning',
|
||||
'change_pw',
|
||||
|
|
|
@ -5,13 +5,10 @@ namespace App\Model\Table;
|
|||
use App\Lib\Tools\FileAccessTool;
|
||||
use App\Model\Entity\NoticelistEntry;
|
||||
use App\Model\Table\AppTable;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\Validation\Validator;
|
||||
|
||||
class NoticelistsTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
public function initialize(array $config): void
|
||||
{
|
||||
parent::initialize($config);
|
||||
|
|
|
@ -11,7 +11,6 @@ use Cake\Database\Expression\QueryExpression;
|
|||
use Cake\Datasource\EntityInterface;
|
||||
use Cake\Event\EventInterface;
|
||||
use Cake\Http\Exception\MethodNotAllowedException;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\ORM\Query;
|
||||
use Cake\ORM\RulesChecker;
|
||||
use Cake\Utility\Text;
|
||||
|
@ -21,8 +20,6 @@ use InvalidArgumentException;
|
|||
|
||||
class SharingGroupsTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
|
||||
public function initialize(array $config): void
|
||||
{
|
||||
parent::initialize($config);
|
||||
|
|
|
@ -13,7 +13,6 @@ use Cake\Datasource\EntityInterface;
|
|||
use Cake\Event\EventInterface;
|
||||
use Cake\Http\Exception\BadRequestException;
|
||||
use Cake\Http\Exception\NotFoundException;
|
||||
use Cake\ORM\Locator\LocatorAwareTrait;
|
||||
use Cake\ORM\RulesChecker;
|
||||
use Cake\Validation\Validator;
|
||||
use Exception;
|
||||
|
@ -22,7 +21,6 @@ use InvalidArgumentException;
|
|||
|
||||
class UsersTable extends AppTable
|
||||
{
|
||||
use LocatorAwareTrait;
|
||||
use LogExtendedTrait;
|
||||
|
||||
private const PERIODIC_USER_SETTING_KEY = 'periodic_notification_filters';
|
||||
|
|
Loading…
Reference in New Issue