Browse Source

Move AutoComplete::filterResults to new event dispatcher and GenericEvent

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v20.0.0beta1
Joas Schilling 4 years ago
parent
commit
35c6b1236f
No account linked to committer's email address

+ 3
- 4
core/Controller/AutoCompleteController.php View File

use OCP\Collaboration\AutoComplete\AutoCompleteEvent; use OCP\Collaboration\AutoComplete\AutoCompleteEvent;
use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\AutoComplete\IManager;
use OCP\Collaboration\Collaborators\ISearch; use OCP\Collaboration\Collaborators\ISearch;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IRequest; use OCP\IRequest;
use OCP\Share;
use OCP\Share\IShare; use OCP\Share\IShare;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;


class AutoCompleteController extends Controller { class AutoCompleteController extends Controller {
/** @var ISearch */ /** @var ISearch */
private $collaboratorSearch; private $collaboratorSearch;
/** @var IManager */ /** @var IManager */
private $autoCompleteManager; private $autoCompleteManager;
/** @var EventDispatcherInterface */
/** @var IEventDispatcher */
private $dispatcher; private $dispatcher;


public function __construct( public function __construct(
IRequest $request, IRequest $request,
ISearch $collaboratorSearch, ISearch $collaboratorSearch,
IManager $autoCompleteManager, IManager $autoCompleteManager,
EventDispatcherInterface $dispatcher
IEventDispatcher $dispatcher
) { ) {
parent::__construct($appName, $request); parent::__construct($appName, $request);



+ 1
- 1
lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php View File



namespace OCP\Collaboration\AutoComplete; namespace OCP\Collaboration\AutoComplete;


use Symfony\Component\EventDispatcher\GenericEvent;
use OCP\EventDispatcher\GenericEvent;


/** /**
* @since 16.0.0 * @since 16.0.0

+ 3
- 3
tests/Core/Controller/AutoCompleteControllerTest.php View File

use OC\Core\Controller\AutoCompleteController; use OC\Core\Controller\AutoCompleteController;
use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\AutoComplete\IManager;
use OCP\Collaboration\Collaborators\ISearch; use OCP\Collaboration\Collaborators\ISearch;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IRequest; use OCP\IRequest;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Test\TestCase; use Test\TestCase;


class AutoCompleteControllerTest extends TestCase { class AutoCompleteControllerTest extends TestCase {
protected $collaboratorSearch; protected $collaboratorSearch;
/** @var IManager|MockObject */ /** @var IManager|MockObject */
protected $autoCompleteManager; protected $autoCompleteManager;
/** @var EventDispatcherInterface|MockObject */
/** @var IEventDispatcher|MockObject */
protected $dispatcher; protected $dispatcher;
/** @var AutoCompleteController */ /** @var AutoCompleteController */
protected $controller; protected $controller;
$request = $this->createMock(IRequest::class); $request = $this->createMock(IRequest::class);
$this->collaboratorSearch = $this->createMock(ISearch::class); $this->collaboratorSearch = $this->createMock(ISearch::class);
$this->autoCompleteManager = $this->createMock(IManager::class); $this->autoCompleteManager = $this->createMock(IManager::class);
$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
$this->dispatcher = $this->createMock(IEventDispatcher::class);


$this->controller = new AutoCompleteController( $this->controller = new AutoCompleteController(
'core', 'core',

Loading…
Cancel
Save