Skip to content

Cleanup psalm issues in DB/ContactsManager and Console #35539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 3 commits into from
Sep 5, 2023
Merged

Cleanup psalm issues in DB/ContactsManager and Console #35539

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e966cfb
Cleanup plsam issues in DB/ContactsManager and Console
CarlSchwan Dec 1, 2022
5c78adb
Fix Exception catching in OC\DB\Adapter
come-nc Sep 4, 2023
637cafc
Fix ContactsManagerTest adressbook mocks having a null key
come-nc Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix ContactsManagerTest adressbook mocks having a null key 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Sep 5, 2023
commit 637cafcf35422fbf1280144ac68c71a3284be74f
27 changes: 27 additions & 0 deletions tests/lib/ContactsManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ public function testDeleteHavePermission() {
->method('delete')
->willReturn('returnMe');

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->delete(1, $addressbook->getKey());
Expand All @@ -128,6 +131,10 @@ public function testDeleteNoPermission() {
$addressbook->expects($this->never())
->method('delete');

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->delete(1, $addressbook->getKey());
$this->assertEquals($result, null);
Expand All @@ -142,6 +149,10 @@ public function testDeleteNoAddressbook() {
$addressbook->expects($this->never())
->method('delete');

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->delete(1, 'noaddressbook');
$this->assertEquals($result, null);
Expand All @@ -161,6 +172,10 @@ public function testCreateOrUpdateHavePermission() {
->method('createOrUpdate')
->willReturn('returnMe');

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->createOrUpdate([], $addressbook->getKey());
$this->assertEquals($result, 'returnMe');
Expand All @@ -179,6 +194,10 @@ public function testCreateOrUpdateNoPermission() {
$addressbook->expects($this->never())
->method('createOrUpdate');

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->createOrUpdate([], $addressbook->getKey());
$this->assertEquals($result, null);
Expand All @@ -193,6 +212,10 @@ public function testCreateOrUpdateNOAdressbook() {
$addressbook->expects($this->never())
->method('createOrUpdate');

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->createOrUpdate([], 'noaddressbook');
$this->assertEquals($result, null);
Expand All @@ -209,6 +232,10 @@ public function testIsEnabledIfSo() {
->disableOriginalConstructor()
->getMock();

$addressbook->expects($this->any())
->method('getKey')
->willReturn('addressbookKey');

$this->cm->registerAddressBook($addressbook);
$result = $this->cm->isEnabled();
$this->assertTrue($result);
Expand Down