Permalink
Browse files

Fix some php7 compats

  • Loading branch information...
1 parent b5783dd commit 5009b5218a890bfde6ef5d60f58070a8791ccd0f @cdujeu cdujeu committed Sep 6, 2016
@@ -51,7 +51,7 @@ class AuthMiddleware
* @param callable|null $next
* @throws PydioException
*/
- public static function handleRequest(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface, callable $next = null){
+ public static function handleRequest(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface $responseInterface, callable $next = null){
$driverImpl = ConfService::getAuthDriverImpl();
PluginsService::getInstance(Context::emptyContext())->setPluginUniqueActiveForType("auth", $driverImpl->getName(), $driverImpl);
@@ -52,7 +52,7 @@ class SessionRepositoryMiddleware
* @param callable|null $next
* @throws PydioException
*/
- public static function handleRequest(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface, callable $next = null) {
+ public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null) {
/** @var ContextInterface $ctx */
$ctx = $requestInterface->getAttribute("ctx");
@@ -261,7 +261,7 @@ public function isWriteable(AJXP_Node $node)
* @param array $repoData
* @throws \Exception
*/
- public function deldir($location, $repoData)
+ public function deldir($location, $repoData, $taskId = NULL)
{
if (is_dir($location)) {
$dirsToRecurse = array();
@@ -52,9 +52,9 @@ class Driver extends FsAccessDriver
* @param $repository
* @param array $options
*/
- public function init($repository, $options = array())
+ public function init(ContextInterface $ctx, $options = array())
{
- parent::init($repository, $options);
+ parent::init($ctx, $options);
}
/**
@@ -57,9 +57,9 @@ class PixlrEditor extends Plugin
/**
* @param ContextInterface $context
*/
- public function init(\Pydio\Core\Model\ContextInterface $context) {
+ public function init(\Pydio\Core\Model\ContextInterface $ctx, $options = []) {
- parent::init($context);
+ parent::init($ctx, $options);
$this->client = new Client([
'base_url' => "https://pixlr.com/editor/"

0 comments on commit 5009b52

Please sign in to comment.