openinfra/openstackid-resources
Code Issues Proposed changes

Fix on Null exception

Browse Source 
fixed null exception on default parameter on get events

Change-Id: I543f97112b84e3774de7a1903a4ea34886e661a8
This commit is contained in:
Sebastian Marcet 2016-03-08 09:03:20 -03:00
parent 798cf733de
commit 37c982c958
6 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/apis/protected/summit/strategies/RetrieveAllPublishedSummitEventsStrategy.php
View File

@ -24,12 +24,12 @@ final class RetrieveAllPublishedSummitEventsStrategy extends RetrieveAllSummitEv
{
/**
* @param int $page
* @param int $per_page
* @param Filter $filter
* @param $page
* @param $per_page
* @param Filter|null $filter
* @return array
*/
public function retrieveEventsFromSource($page, $per_page, Filter $filter)
public function retrieveEventsFromSource($page, $per_page, Filter $filter = null)
{
return $this->event_repository->getAllPublishedByPage($page, $per_page, $filter);
}

8
app/Http/Controllers/apis/protected/summit/strategies/RetrieveAllSummitEventsBySummitStrategy.php
View File

@ -24,12 +24,12 @@ final class RetrieveAllSummitEventsBySummitStrategy extends RetrieveSummitEvents
{
/**
* @param int $page
* @param int $per_page
* @param Filter $filter
* @param $page
* @param $per_page
* @param Filter|null $filter
* @return array
*/
public function retrieveEventsFromSource($page, $per_page, Filter $filter)
public function retrieveEventsFromSource($page, $per_page, Filter $filter = null)
{
return $this->summit->events($page, $per_page, $filter);
}

8
app/Http/Controllers/apis/protected/summit/strategies/RetrieveAllSummitEventsStrategy.php
View File

@ -38,12 +38,12 @@ class RetrieveAllSummitEventsStrategy extends RetrieveSummitEventsStrategy
}
/**
* @param int $page
* @param int $per_page
* @param Filter $filter
* @param $page
* @param $per_page
* @param Filter|null $filter
* @return array
*/
public function retrieveEventsFromSource($page, $per_page, Filter $filter)
public function retrieveEventsFromSource($page, $per_page, Filter $filter = null)
{
return $this->event_repository->getAllByPage($page, $per_page, $filter);
}

8
app/Http/Controllers/apis/protected/summit/strategies/RetrievePublishedSummitEventsBySummitStrategy.php
View File

@ -24,12 +24,12 @@ final class RetrievePublishedSummitEventsBySummitStrategy extends RetrieveSummit
{
/**
* @param int $page
* @param int $per_page
* @param Filter $filter
* @param $page
* @param $per_page
* @param Filter|null $filter
* @return array
*/
public function retrieveEventsFromSource($page, $per_page, Filter $filter)
public function retrieveEventsFromSource($page, $per_page, Filter $filter = null)
{
return $this->summit->schedule($page, $per_page, $filter);
}

8
app/Http/Controllers/apis/protected/summit/strategies/RetrieveSummitEventsStrategy.php
View File

@ -112,12 +112,12 @@ abstract class RetrieveSummitEventsStrategy
}
/**
* @param int $page
* @param int $per_page
* @param Filter $filter
* @param $page
* @param $per_page
* @param Filter|null $filter
* @return array
*/
abstract public function retrieveEventsFromSource($page, $per_page, Filter $filter);
abstract public function retrieveEventsFromSource($page, $per_page, Filter $filter = null);
/**
* @return array

35
tests/OAuth2SummitApiTest.php
View File

@ -327,7 +327,7 @@ class OAuth2SummitApiTest extends ProtectedApiTest
}
public function testCurrentSummitEvents()
public function testCurrentSummitEventsWithFilter()
{
$params = array
(
@ -365,6 +365,39 @@ class OAuth2SummitApiTest extends ProtectedApiTest
$this->assertTrue(!is_null($events));
}
public function testCurrentSummitEvents()
{
$params = array
(
'id' => 'current',
'expand' => 'feedback' ,
);
$headers = array
(
"HTTP_Authorization" => " Bearer " .$this->access_token,
"CONTENT_TYPE" => "application/json"
);
$response = $this->action
(
"GET",
"OAuth2SummitApiController@getEvents",
$params,
array(),
array(),
array(),
$headers
);
$content = $response->getContent();
$this->assertResponseStatus(200);
$events = json_decode($content);
$this->assertTrue(!is_null($events));
}
public function testCurrentSummitEventsBySummitType()
{
$params = array