MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: Removed integer type hinting in controllers

pull/6120/head
mokaddem 2020-07-07 14:49:09 +02:00
parent 3460af16a7
commit 1c4b3b97e9
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/EventsController.php
View File

@ -4810,7 +4810,7 @@ class EventsController extends AppController
}
// Displays all the cluster relations for the provided event
public function viewClusterRelations(int $eventId)
public function viewClusterRelations($eventId)
{
$event = $this->Event->fetchEvent($this->Auth->user(), array('eventid' => $eventId, 'flatten' => true));
if (empty($event)) {

6
app/Controller/GalaxiesController.php
View File

@ -221,7 +221,7 @@ class GalaxiesController extends AppController
}
}
public function export(int $galaxyId)
public function export($galaxyId)
{
$galaxy = $this->Galaxy->find('first', array(
'recursive' => -1,
@ -542,7 +542,7 @@ class GalaxiesController extends AppController
$this->render('/Events/ajax/ajaxGalaxies');
}
public function forkTree(int $galaxyId)
public function forkTree($galaxyId)
{
$clusters = $this->Galaxy->GalaxyCluster->fetchGalaxyClusters($this->Auth->user(), array('conditions' => array('GalaxyCluster.galaxy_id' => $galaxyId)), $full=true);
if (empty($clusters)) {
@ -565,7 +565,7 @@ class GalaxiesController extends AppController
$this->set('galaxy_id', $galaxyId);
}
public function relationsGraph(int $galaxyId)
public function relationsGraph($galaxyId)
{
$clusters = $this->Galaxy->GalaxyCluster->fetchGalaxyClusters($this->Auth->user(), array('conditions' => array('GalaxyCluster.galaxy_id' => $galaxyId)), $full=true);
if (empty($clusters)) {

6
app/Controller/GalaxyClusterRelationsController.php
View File

@ -77,7 +77,7 @@ class GalaxyClusterRelationsController extends AppController
}
}
public function view(int $id)
public function view($id)
{
if ($this->_isRest()) {
$conditions = array('GalaxyClusterRelation.id' => $id);
@ -178,7 +178,7 @@ class GalaxyClusterRelationsController extends AppController
$this->set('action', 'add');
}
public function edit(int $id)
public function edit($id)
{
$conditions = array('conditions' => array('GalaxyClusterRelation.id' => $id), 'contain' => array('GalaxyClusterRelationTag' => 'Tag'));
$existingRelation = $this->GalaxyClusterRelation->fetchRelations($this->Auth->user(), $conditions);
@ -266,7 +266,7 @@ class GalaxyClusterRelationsController extends AppController
$this->render('add');
}
public function delete(int $id)
public function delete($id)
{
if ($this->request->is('post')) {
$relation = $this->GalaxyClusterRelation->fetchRelations($this->Auth->user(), array('conditions' => array('id' => $id)));

10
app/Controller/GalaxyClustersController.php
View File

@ -15,14 +15,6 @@ class GalaxyClustersController extends AppController
'contain' => array(
'Tag' => array(
'fields' => array('Tag.id'),
/*
'EventTag' => array(
'fields' => array('EventTag.event_id')
),
'AttributeTag' => array(
'fields' => array('AttributeTag.event_id', 'AttributeTag.attribute_id')
)
*/
),
'GalaxyElement' => array(
'conditions' => array('GalaxyElement.key' => 'synonyms'),
@ -31,7 +23,7 @@ class GalaxyClustersController extends AppController
)
);
public function index(int $galaxyId)
public function index($galaxyId)
{
$filters = $this->IndexFilter->harvestParameters(array('context', 'searchall'));
$aclConditions = $this->GalaxyCluster->buildConditions($this->Auth->user());