Skip to content

Commit

Permalink
Merge pull request #13347 from nextcloud/backport/13346/stable30
Browse files Browse the repository at this point in the history
[stable30] feat(codingstandard): Update coding-standard to 1.3.1
  • Loading branch information
nickvergessen authored Sep 19, 2024
2 parents f878f62 + 7f20f46 commit 3c8e80d
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 14 deletions.
2 changes: 1 addition & 1 deletion lib/Command/Developer/UpdateDocs.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected function getDocumentation(Command $command): string {
$command->getUsages()
),
function ($carry, $usage) {
return $carry.'* `' . $usage . '`' . "\n";
return $carry . '* `' . $usage . '`' . "\n";
}
);
$doc .= $this->describeInputDefinition($command);
Expand Down
1 change: 0 additions & 1 deletion lib/Signaling/Responses/DialOut.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ final class DialOut {
public function __construct(
/** @var non-empty-string|null */
public ?string $callId = null,

public ?DialOutError $error = null,
) {
}
Expand Down
2 changes: 0 additions & 2 deletions lib/Signaling/Responses/DialOutError.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ final class DialOutError {
public function __construct(
/** @var non-empty-string */
public ?string $code,

public ?string $message = null,

/** @var ?array{attendeeId: int} */
public ?array $details = null,
) {
Expand Down
1 change: 0 additions & 1 deletion lib/Signaling/Responses/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ final class Response {
public function __construct(
/** @var non-empty-string */
public string $type,

/** @var DialOut|null */
public ?DialOut $dialOut,
) {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
if (!defined('PHPUNIT_RUN')) {
define('PHPUNIT_RUN', 1);
}
require_once __DIR__.'/../../../../lib/base.php';
require_once __DIR__ . '/../../../../lib/base.php';
\OC::$loader->addValidRoot(\OC::$SERVERROOT . '/tests');
\OC_App::loadApp('spreed');
if (!class_exists('\PHPUnit\Framework\TestCase')) {
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/csfixer/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.62.0",
"nextcloud/coding-standard": "^1.2.3"
"nextcloud/coding-standard": "^1.3.1"
}
}
61 changes: 54 additions & 7 deletions vendor-bin/csfixer/composer.lock

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

0 comments on commit 3c8e80d

Please sign in to comment.