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.

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

Upgrade to Doctrine Standard 9 #3

Merged
merged 3 commits into from Oct 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check-cs-checker.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [8.x, 7.4]
php: [8.x]

steps:
- name: Checkout code
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [8.x, 7.4]
php: [8.x]

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -5,6 +5,6 @@
"license": "MIT",
"require": {
"php": "^7.2 || ^8",
"doctrine/coding-standard": "^8"
"doctrine/coding-standard": "^9"
}
}
92 changes: 44 additions & 48 deletions composer.lock

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

14 changes: 7 additions & 7 deletions tests/expected_report.txt
Expand Up @@ -3,16 +3,16 @@ PHP CODE SNIFFER REPORT SUMMARY
----------------------------------------------------------------------
FILE ERRORS WARNINGS
----------------------------------------------------------------------
tests/input/concatenation_spacing.php 56 0
tests/input/concatenation_spacing.php 55 0
tests/input/example-class.php 36 0
tests/input/not_spacing.php 8 0
tests/input/return_type_on_closures.php 28 0
tests/input/return_type_on_methods.php 14 0
tests/input/test-case.php 8 0
tests/input/not_spacing.php 7 0
tests/input/return_type_on_closures.php 27 0
tests/input/return_type_on_methods.php 13 0
tests/input/test-case.php 7 0
----------------------------------------------------------------------
A TOTAL OF 150 ERRORS AND 0 WARNINGS WERE FOUND IN 6 FILES
A TOTAL OF 145 ERRORS AND 0 WARNINGS WERE FOUND IN 6 FILES
----------------------------------------------------------------------
PHPCBF CAN FIX 139 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
PHPCBF CAN FIX 134 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


1 change: 1 addition & 0 deletions tests/fixed/concatenation_spacing.php
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

$string = 'Standards' . 'are awesome';
Expand Down
6 changes: 2 additions & 4 deletions tests/fixed/example-class.php
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace Example;
Expand Down Expand Up @@ -33,10 +34,7 @@ class Example implements IteratorAggregate

private bool $baz;

/**
* @var ControlStructureSniff|int|string|null
*/
private $baxBax;
private ControlStructureSniff|int|string|null $baxBax = null;

public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
{
Expand Down
1 change: 1 addition & 0 deletions tests/fixed/not_spacing.php
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

$test = 1;
Expand Down
1 change: 1 addition & 0 deletions tests/fixed/return_type_on_closures.php
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

static function (): void {
Expand Down
1 change: 1 addition & 0 deletions tests/fixed/return_type_on_methods.php
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace Blah;
Expand Down
1 change: 1 addition & 0 deletions tests/fixed/test-case.php
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace Fancy;
Expand Down