mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21439 from nextcloud/feature/noid/move-autocomplete-filter-event-to-new-dispatcher-and-class 

Move AutoComplete::filterResults to new event dispatcher and GenericE…
This commit is contained in:
Joas Schilling 2020-07-03 10:03:34 +02:00 committed by GitHub
parent ffc85ad614 35c6b1236f
commit 19e1efd1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/Controller/AutoCompleteController.php
View File

@ -34,17 +34,16 @@ use OCP\AppFramework\OCSController as Controller;
use OCP\Collaboration\AutoComplete\AutoCompleteEvent;
use OCP\Collaboration\AutoComplete\IManager;
use OCP\Collaboration\Collaborators\ISearch;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IRequest;
use OCP\Share;
use OCP\Share\IShare;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class AutoCompleteController extends Controller {
/** @var ISearch */
private $collaboratorSearch;
/** @var IManager */
private $autoCompleteManager;
/** @var EventDispatcherInterface */
/** @var IEventDispatcher */
private $dispatcher;
public function __construct(
@ -52,7 +51,7 @@ class AutoCompleteController extends Controller {
IRequest $request,
ISearch $collaboratorSearch,
IManager $autoCompleteManager,
EventDispatcherInterface $dispatcher
IEventDispatcher $dispatcher
) {
parent::__construct($appName, $request);

2
lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php
View File

@ -26,7 +26,7 @@ declare(strict_types=1);
namespace OCP\Collaboration\AutoComplete;
use Symfony\Component\EventDispatcher\GenericEvent;
use OCP\EventDispatcher\GenericEvent;
/**
* @since 16.0.0

6
tests/Core/Controller/AutoCompleteControllerTest.php
View File

@ -26,9 +26,9 @@ namespace Tests\Core\Controller;
use OC\Core\Controller\AutoCompleteController;
use OCP\Collaboration\AutoComplete\IManager;
use OCP\Collaboration\Collaborators\ISearch;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IRequest;
use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Test\TestCase;
class AutoCompleteControllerTest extends TestCase {
@ -36,7 +36,7 @@ class AutoCompleteControllerTest extends TestCase {
protected $collaboratorSearch;
/** @var IManager|MockObject */
protected $autoCompleteManager;
/** @var EventDispatcherInterface|MockObject */
/** @var IEventDispatcher|MockObject */
protected $dispatcher;
/** @var AutoCompleteController */
protected $controller;
@ -48,7 +48,7 @@ class AutoCompleteControllerTest extends TestCase {
$request = $this->createMock(IRequest::class);
$this->collaboratorSearch = $this->createMock(ISearch::class);
$this->autoCompleteManager = $this->createMock(IManager::class);
$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
$this->dispatcher = $this->createMock(IEventDispatcher::class);
$this->controller = new AutoCompleteController(
'core',