hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests on PHP 5.4

Browse Source
This commit is contained in:
Romain Neutron
2012-09-27 01:46:18 +02:00
parent d4f466ef63
commit 0ac8a9d8ae
107 changed files with 196 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/API/OAuth2/Token.class.php
View File

@@ -65,7 +65,7 @@ class API_OAuth2_Token
* @param API_OAuth2_Account $account
* @return API_OAuth2_Token
*/
public function __construct(appbox &$appbox, API_OAuth2_Account &$account)
public function __construct(appbox $appbox, API_OAuth2_Account $account)
{
$this->appbox = $appbox;
$this->account = $account;
@@ -300,7 +300,7 @@ class API_OAuth2_Token
* @param string $scope
* @return API_OAuth2_Token
*/
public static function create(appbox &$appbox, API_OAuth2_Account &$account, $scope = null)
public static function create(appbox $appbox, API_OAuth2_Account $account, $scope = null)
{
$sql = 'INSERT INTO api_oauth_tokens
(oauth_token, session_id, api_account_id, expires, scope)

8
lib/classes/API/V1/Interface.class.php
View File

@@ -245,7 +245,7 @@ interface API_V1_Interface
* Parameters :
*
*/
public function search_publications(Request $request, User_Adapter &$user);
public function search_publications(Request $request, User_Adapter $user);
/**
* Route : /publications/PUBLICATION_ID/remove/FORMAT/
@@ -267,11 +267,11 @@ interface API_V1_Interface
* PUBLICATION_ID : required INT
*
*/
public function get_publication(Request $request, $publication_id, User_Adapter &$user);
public function get_publication(Request $request, $publication_id, User_Adapter $user);
public function get_publications(Request $request, User_Adapter &$user);
public function get_publications(Request $request, User_Adapter $user);
public function get_feed_entry(Request $request, $entry, User_Adapter &$user);
public function get_feed_entry(Request $request, $entry, User_Adapter $user);
/**
* Route : /users/search/FORMAT/
*

14
lib/classes/API/V1/adapter.class.php
View File

@@ -676,7 +676,7 @@ class API_V1_adapter extends API_V1_Abstract
$reasons = $output = null;
$callback = function($element, $visa, $code) use(&$reasons, &$output) {
$callback = function($element, $visa, $code) use (&$reasons, &$output) {
if ( ! $visa->isValid()) {
$reasons = array();
@@ -1420,7 +1420,7 @@ class API_V1_adapter extends API_V1_Abstract
* @param User_Adapter $user
* @return API_V1_result
*/
public function search_publications(Request $request, User_Adapter &$user)
public function search_publications(Request $request, User_Adapter $user)
{
$result = new API_V1_result($request, $this);
@@ -1455,7 +1455,7 @@ class API_V1_adapter extends API_V1_Abstract
* @param User_Adapter $user
* @return API_V1_result
*/
public function get_publication(Request $request, $publication_id, User_Adapter &$user)
public function get_publication(Request $request, $publication_id, User_Adapter $user)
{
$result = new API_V1_result($request, $this);
@@ -1478,7 +1478,7 @@ class API_V1_adapter extends API_V1_Abstract
return $result;
}
public function get_publications(Request $request, User_Adapter &$user)
public function get_publications(Request $request, User_Adapter $user)
{
$result = new API_V1_result($request, $this);
@@ -1501,7 +1501,7 @@ class API_V1_adapter extends API_V1_Abstract
return $result;
}
public function get_feed_entry(Request $request, $entry_id, User_Adapter &$user)
public function get_feed_entry(Request $request, $entry_id, User_Adapter $user)
{
$result = new API_V1_result($request, $this);
@@ -1644,7 +1644,7 @@ class API_V1_adapter extends API_V1_Abstract
* @param media_subdef $media
* @return array
*/
protected function list_embedable_media(media_subdef &$media, registryInterface &$registry)
protected function list_embedable_media(media_subdef $media, registryInterface $registry)
{
if ( ! $media->is_physically_present()) {
return null;
@@ -1675,7 +1675,7 @@ class API_V1_adapter extends API_V1_Abstract
* @param registryInterface $registry
* @return type
*/
protected function list_permalink(media_Permalink_Adapter &$permalink, registryInterface &$registry)
protected function list_permalink(media_Permalink_Adapter $permalink, registryInterface $registry)
{
return array(
'created_on' => $permalink->get_created_on()->format(DATE_ATOM),