wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15735 from owncloud/fix-visibility

Browse source 
Fix visibility of interfaces in \OCP
This commit is contained in:
Morris Jobke 2015-04-20 14:39:15 +02:00
commit ce2c8533d9
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/appframework/http/request.php
View file

@ -359,7 +359,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @param string $key the key that will be taken from the $_COOKIE array
* @return array the value in the $_COOKIE element
*/
function getCookie($key) {
public function getCookie($key) {
return isset($this->cookies[$key]) ? $this->cookies[$key] : null;
}

4
lib/private/appframework/utility/simplecontainer.php
View file

@ -106,7 +106,7 @@ class SimpleContainer extends \Pimple\Container implements \OCP\IContainer {
* @param string $name
* @param mixed $value
*/
function registerParameter($name, $value) {
public function registerParameter($name, $value) {
$this[$name] = $value;
}
@ -119,7 +119,7 @@ class SimpleContainer extends \Pimple\Container implements \OCP\IContainer {
* @param \Closure $closure the closure to be called on service creation
* @param bool $shared
*/
function registerService($name, \Closure $closure, $shared = true) {
public function registerService($name, \Closure $closure, $shared = true) {
if (isset($this[$name])) {
unset($this[$name]);
}

2
lib/private/avatarmanager.php
View file

@ -38,7 +38,7 @@ class AvatarManager implements IAvatarManager {
* @param string $user the ownCloud user id
* @return \OCP\IAvatar
*/
function getAvatar($user) {
public function getAvatar($user) {
return new Avatar($user);
}
}

6
lib/public/iavatar.php
View file

@ -37,7 +37,7 @@ interface IAvatar {
* @return boolean|\OCP\IImage containing the avatar or false if there's no image
* @since 6.0.0
*/
function get($size = 64);
public function get($size = 64);
/**
* Check if an avatar exists for the user
@ -56,12 +56,12 @@ interface IAvatar {
* @return void
* @since 6.0.0
*/
function set($data);
public function set($data);
/**
* remove the users avatar
* @return void
* @since 6.0.0
*/
function remove();
public function remove();
}

2
lib/public/iavatarmanager.php
View file

@ -38,5 +38,5 @@ interface IAvatarManager {
* @return \OCP\IAvatar
* @since 6.0.0
*/
function getAvatar($user);
public function getAvatar($user);
}

6
lib/public/icontainer.php
View file

@ -47,7 +47,7 @@ interface IContainer {
* @return mixed
* @since 6.0.0
*/
function query($name);
public function query($name);
/**
* A value is stored in the container with it's corresponding name
@ -57,7 +57,7 @@ interface IContainer {
* @return void
* @since 6.0.0
*/
function registerParameter($name, $value);
public function registerParameter($name, $value);
/**
* A service is registered in the container where a closure is passed in which will actually
@ -72,5 +72,5 @@ interface IContainer {
* @return void
* @since 6.0.0
*/
function registerService($name, \Closure $closure, $shared = true);
public function registerService($name, \Closure $closure, $shared = true);
}

18
lib/public/ilogger.php
View file

@ -39,7 +39,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function emergency($message, array $context = array());
public function emergency($message, array $context = array());
/**
* Action must be taken immediately.
@ -49,7 +49,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function alert($message, array $context = array());
public function alert($message, array $context = array());
/**
* Critical conditions.
@ -59,7 +59,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function critical($message, array $context = array());
public function critical($message, array $context = array());
/**
* Runtime errors that do not require immediate action but should typically
@ -70,7 +70,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function error($message, array $context = array());
public function error($message, array $context = array());
/**
* Exceptional occurrences that are not errors.
@ -80,7 +80,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function warning($message, array $context = array());
public function warning($message, array $context = array());
/**
* Normal but significant events.
@ -90,7 +90,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function notice($message, array $context = array());
public function notice($message, array $context = array());
/**
* Interesting events.
@ -100,7 +100,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function info($message, array $context = array());
public function info($message, array $context = array());
/**
* Detailed debug information.
@ -110,7 +110,7 @@ interface ILogger {
* @return null
* @since 7.0.0
*/
function debug($message, array $context = array());
public function debug($message, array $context = array());
/**
* Logs with an arbitrary level.
@ -121,5 +121,5 @@ interface ILogger {
* @return mixed
* @since 7.0.0
*/
function log($level, $message, array $context = array());
public function log($level, $message, array $context = array());
}

4
lib/public/irequest.php
View file

@ -68,7 +68,7 @@ interface IRequest {
* @return string
* @since 6.0.0
*/
function getHeader($name);
public function getHeader($name);
/**
* Lets you access post and get parameters by the index
@ -131,7 +131,7 @@ interface IRequest {
* @return array the value in the $_COOKIE element
* @since 6.0.0
*/
function getCookie($key);
public function getCookie($key);
/**