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

build(deps-dev): bump nextcloud/coding-standard from 1.2.1 to 1.2.3 #878

Merged
merged 2 commits into from
Sep 2, 2024
Merged

build(deps-dev): bump nextcloud/coding-standard from 1.2.1 to 1.2.3 #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd8b8ba
build(deps-dev): bump nextcloud/coding-standard from 1.2.1 to 1.2.3
dependabot[bot] Aug 26, 2024
862ab6d
style(PHP): adjust to updated code style rules
blizzz Sep 2, 2024
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
24 changes: 12 additions & 12 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/GroupBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

class GroupBackend extends ABackend implements IAddToGroupBackend, ICountUsersBackend, ICreateGroupBackend, IDeleteGroupBackend, IGetDisplayNameBackend, IRemoveFromGroupBackend, INamedBackend {

/** @var array */
/** @var array */
private $groupCache = [];

public const TABLE_GROUPS = 'user_saml_groups';
Expand Down
4 changes: 2 additions & 2 deletions lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ public function getSection() {

/**
* @return int whether the form should be rather on the top or bottom of
* the admin section. The forms are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
* the admin section. The forms are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
*
* keep the server setting at the top, right after "server settings"
*/
Expand Down
2 changes: 1 addition & 1 deletion templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<?php foreach ($_['name-id-formats'] as $key => $value): ?>
<option value="<?php p($key) ?>"
<?php if ($value['selected'] ?? false) {
p("selected");
p('selected');
} ?> ><?php p($value['label']) ?></option>
<?php endforeach; ?>
</select>
Expand Down
2 changes: 1 addition & 1 deletion templates/selectUserBackEnd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Util::addScript('user_saml', 'selectUserBackEnd');

/** @var array $_ */
/** @var $l \OCP\IL10N */
/** @var \OCP\IL10N $l */
?>

<div id="saml-select-user-back-end">
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/Command/GetMetadataTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

class GetMetadataTest extends \Test\TestCase {

/** @var GetMetadata|MockObject*/
/** @var GetMetadata|MockObject */
protected $GetMetadata;
/** @var SAMLSettings|MockObject*/
/** @var SAMLSettings|MockObject */
private $samlSettings;

protected function setUp(): void {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Controller/SAMLControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SAMLControllerTest extends TestCase {
private $session;
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
private $userSession;
/** @var SAMLSettings|\PHPUnit_Framework_MockObject_MockObject*/
/** @var SAMLSettings|\PHPUnit_Framework_MockObject_MockObject */
private $samlSettings;
/** @var UserBackend|\PHPUnit_Framework_MockObject_MockObject */
private $userBackend;
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/GroupBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ public function testInGroup() {
foreach ($this->users as $user) {
$result = $this->groupBackend->inGroup($user['uid'], $group['gid']);
if (in_array($group['gid'], $user['groups'])) {
$this->assertTrue($result, sprintf("User %s should be member of group %s", $user['uid'], $group['gid']));
$this->assertTrue($result, sprintf('User %s should be member of group %s', $user['uid'], $group['gid']));
} else {
$this->assertFalse($result, sprintf("User %s should not be member of group %s", $user['uid'], $group['gid']));
$this->assertFalse($result, sprintf('User %s should not be member of group %s', $user['uid'], $group['gid']));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Settings/SectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class SectionTest extends \Test\TestCase {
private $section;
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
private $l10n;
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
private $urlGenerator;

protected function setUp(): void {
Expand Down
Loading