Skip to content
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

Jump to bottom

Use PHP8's match expression instead of switch #39209

Closed
wants to merge 1 commit into from
Closed

Use PHP8's match expression instead of switch #39209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions tests/lib/Collaboration/Collaborators/GroupPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,16 +466,12 @@ function ($appName, $key, $default) use ($shareWithGroupOnly, $shareeEnumeration
if ($appName !== 'core') {
return $default;
}
switch ($key) {
case 'shareapi_only_share_with_group_members':
return $shareWithGroupOnly ? 'yes' : 'no';
case 'shareapi_allow_share_dialog_user_enumeration':
return $shareeEnumeration ? 'yes' : 'no';
case 'shareapi_allow_group_sharing':
return $groupSharingDisabled ? 'no' : 'yes';
default:
return $default;
}
return match ($key) {
'shareapi_only_share_with_group_members' => $shareWithGroupOnly ? 'yes' : 'no',
'shareapi_allow_share_dialog_user_enumeration' => $shareeEnumeration ? 'yes' : 'no',
'shareapi_allow_group_sharing' => $groupSharingDisabled ? 'no' : 'yes',
default => $default,
};
}
);

Expand Down
139 changes: 66 additions & 73 deletions tests/lib/Group/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,38 +558,36 @@ public function testDisplayNamesInGroupWithOneUserBackend() {
$backend->expects($this->any())
->method('inGroup')
->willReturnCallback(function ($uid, $gid) {
switch ($uid) {
case 'user1': return false;
case 'user2': return true;
case 'user3': return false;
case 'user33': return true;
default:
return null;
}
return match ($uid) {
'user1' => false,
'user2' => false,
'user3' => false,
'user33' => true,
default => null,
};
});

$this->userManager->expects($this->any())
->method('searchDisplayName')
->with('user3')
->willReturnCallback(function ($search, $limit, $offset) {
switch ($offset) {
case 0: return ['user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33')];
case 2: return [];
}
return null;
return match ($offset) {
0 => ['user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33')],
2 => [],
default => null,
};
});
$this->userManager->expects($this->any())
->method('get')
->willReturnCallback(function ($uid) {
switch ($uid) {
case 'user1': return $this->getTestUser('user1');
case 'user2': return $this->getTestUser('user2');
case 'user3': return $this->getTestUser('user3');
case 'user33': return $this->getTestUser('user33');
default:
return null;
}
return match ($uid) {
'user1' => $this->getTestUser('user1'),
'user2' => $this->getTestUser('user2'),
'user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33'),
default => null,
};
});

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache);
Expand All @@ -616,40 +614,38 @@ public function testDisplayNamesInGroupWithOneUserBackendWithLimitSpecified() {
$backend->expects($this->any())
->method('inGroup')
->willReturnCallback(function ($uid, $gid) {
switch ($uid) {
case 'user1': return false;
case 'user2': return true;
case 'user3': return false;
case 'user33': return true;
case 'user333': return true;
default:
return null;
}
return match ($uid) {
'user1' => false,
'user2' => true,
'user3' => false,
'user33' => true,
'user333' => true,
default => null,
};
});

$this->userManager->expects($this->any())
->method('searchDisplayName')
->with('user3')
->willReturnCallback(function ($search, $limit, $offset) {
switch ($offset) {
case 0: return ['user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33')];
case 2: return ['user333' => $this->getTestUser('user333')];
}
return null;
return match ($offset) {
0 => ['user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33')],
2 => ['user333' => $this->getTestUser('user333')],
default => null,
};
});
$this->userManager->expects($this->any())
->method('get')
->willReturnCallback(function ($uid) {
switch ($uid) {
case 'user1': return $this->getTestUser('user1');
case 'user2': return $this->getTestUser('user2');
case 'user3': return $this->getTestUser('user3');
case 'user33': return $this->getTestUser('user33');
case 'user333': return $this->getTestUser('user333');
default:
return null;
}
return match ($uid) {
'user1' => $this->getTestUser('user1'),
'user2' => $this->getTestUser('user2'),
'user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33'),
'user333' => $this->getTestUser('user333'),
default => null,
};
});

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache);
Expand Down Expand Up @@ -677,43 +673,40 @@ public function testDisplayNamesInGroupWithOneUserBackendWithLimitAndOffsetSpeci
$backend->expects($this->any())
->method('inGroup')
->willReturnCallback(function ($uid) {
switch ($uid) {
case 'user1': return false;
case 'user2': return true;
case 'user3': return false;
case 'user33': return true;
case 'user333': return true;
default:
return null;
}
return match ($uid) {
'user1' => false,
'user2' => true,
'user3' => false,
'user33' => true,
'user333' => true,
default => null,
};
});

$this->userManager->expects($this->any())
->method('searchDisplayName')
->with('user3')
->willReturnCallback(function ($search, $limit, $offset) {
switch ($offset) {
case 0:
return [
'user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33'),
'user333' => $this->getTestUser('user333')
];
}
return null;
return match ($offset) {
0 => [
'user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33'),
'user333' => $this->getTestUser('user333')
],
default => null,
};
});
$this->userManager->expects($this->any())
->method('get')
->willReturnCallback(function ($uid) {
switch ($uid) {
case 'user1': return $this->getTestUser('user1');
case 'user2': return $this->getTestUser('user2');
case 'user3': return $this->getTestUser('user3');
case 'user33': return $this->getTestUser('user33');
case 'user333': return $this->getTestUser('user333');
default:
return null;
}
return match ($uid) {
'user1' => $this->getTestUser('user1'),
'user2' => $this->getTestUser('user2'),
'user3' => $this->getTestUser('user3'),
'user33' => $this->getTestUser('user33'),
'user333' => $this->getTestUser('user333'),
default => null,
};
});

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache);
Expand Down
13 changes: 4 additions & 9 deletions tests/lib/User/SessionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,10 @@ public function testLoginValidPasswordEnabled() {
$session->expects($this->exactly(2))
->method('set')
->with($this->callback(function ($key) {
switch ($key) {
case 'user_id':
case 'loginname':
return true;
break;
default:
return false;
break;
}
return match ($key) {
'user_id', 'loginname' => true,
default => false,
};
}, 'foo'));

$managerMethods = get_class_methods(Manager::class);
Expand Down