Fixed static analysers (#205)

Nyholm · web-flow · commit b528c747962a · 2022-05-02T14:33:36.000+02:00
* Fixed static analyers

* Update config files

* PHPStan fixes

* PHP-cs-fixer fixes

* fixes
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -9,54 +9,59 @@ on:
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
-      - name: Set up PHP
-        uses: shivammathur/setup-php@2.7.0
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: 7.4
           coverage: none
+          tools: phpstan:1.4.6, cs2pr
 
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: Download dependencies
-        run: composer install --no-interaction --optimize-autoloader
+        uses: ramsey/composer-install@v1
 
       - name: PHPStan
-        uses: docker://oskarstark/phpstan-ga:0.12.48
-        with:
-          entrypoint: /composer/vendor/bin/phpstan
-          args: analyze --no-progress
+        run: phpstan analyze --no-progress --error-format=checkstyle | cs2pr
 
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: none
+          tools: php-cs-fixer:3.6, cs2pr
+
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga:2.16.4
-        with:
-          args: --dry-run --diff-format udiff
+        run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
 
   psalm:
     name: Psalm
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - name: Set up PHP
-        uses: shivammathur/setup-php@2.7.0
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: 8.1
           coverage: none
+          tools: vimeo/psalm:4.22.0
 
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+
       - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:3.17.2
-        with:
-          args: --no-progress --show-info=false --stats
+        run: psalm --no-progress --output-format=github
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@
 /vendor/
 ###< symfony/framework-bundle ###
 
-.php_cs.cache
+.php-cs-fixer.cache
 
 ###> phpunit/phpunit ###
 /phpunit.xml
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -1,12 +1,11 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->in(__DIR__.'/src')
     ->in(__DIR__.'/tests')
 ;
 
-return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(false)
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         '@Symfony' => true,
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,4 +1,9 @@
 parameters:
     level: 5
+    reportUnmatchedIgnoredErrors: false
     paths:
         - src
+    ignoreErrors:
+        - "#\\\\Entity\\\\.* is never written, only read#"
+        - "#\\\\Entity\\\\.* is never read, only written#"
+        - "#^Property .*\\\\Entity\\\\.* is unused#"
diff --git a/src/Api/Status/Status.php b/src/Api/Status/Status.php
@@ -9,11 +9,11 @@
  */
 final class Status
 {
-    const NEEDS_REVIEW = 'needs_review';
+    public const NEEDS_REVIEW = 'needs_review';
 
-    const NEEDS_WORK = 'needs_work';
+    public const NEEDS_WORK = 'needs_work';
 
-    const WORKS_FOR_ME = 'works_for_me';
+    public const WORKS_FOR_ME = 'works_for_me';
 
-    const REVIEWED = 'reviewed';
+    public const REVIEWED = 'reviewed';
 }
diff --git a/src/Api/Workflow/GithubWorkflowApi.php b/src/Api/Workflow/GithubWorkflowApi.php
@@ -5,7 +5,6 @@
 use App\Model\Repository;
 use Github\Api\Repository\Actions\WorkflowRuns;
 use Github\ResultPager;
-use Psr\Log\LoggerInterface;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -14,13 +13,11 @@ class GithubWorkflowApi implements WorkflowApi
 {
     private ResultPager $resultPager;
     private WorkflowRuns $workflowApi;
-    private LoggerInterface $logger;
 
-    public function __construct(ResultPager $resultPager, WorkflowRuns $workflowApi, LoggerInterface $logger)
+    public function __construct(ResultPager $resultPager, WorkflowRuns $workflowApi)
     {
         $this->resultPager = $resultPager;
         $this->workflowApi = $workflowApi;
-        $this->logger = $logger;
     }
 
     public function approveWorkflowsForPullRequest(Repository $repository, string $headRepository, string $headBranch): void
diff --git a/src/Entity/Task.php b/src/Entity/Task.php
@@ -15,10 +15,10 @@
  */
 class Task
 {
-    const ACTION_CLOSE_STALE = 1;
-    const ACTION_CLOSE_DRAFT = 2;
-    const ACTION_INFORM_CLOSE_STALE = 3;
-    const ACTION_SUGGEST_REVIEWER = 4;
+    public const ACTION_CLOSE_STALE = 1;
+    public const ACTION_CLOSE_DRAFT = 2;
+    public const ACTION_INFORM_CLOSE_STALE = 3;
+    public const ACTION_SUGGEST_REVIEWER = 4;
 
     /**
      * @var int
diff --git a/src/GitHubEvents.php b/src/GitHubEvents.php
@@ -12,68 +12,68 @@
 final class GitHubEvents
 {
     /** @Event('\App\Event\GitHubEvent') */
-    const COMMIT_COMMENT = 'github.commit_comment';
+    public const COMMIT_COMMENT = 'github.commit_comment';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const CREATE = 'github.create';
+    public const CREATE = 'github.create';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const DELETE = 'github.delete';
+    public const DELETE = 'github.delete';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const DEPLOYMENT = 'github.deployment';
+    public const DEPLOYMENT = 'github.deployment';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const DEPLOYMENT_STATUS = 'github.deployment_status';
+    public const DEPLOYMENT_STATUS = 'github.deployment_status';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const FORK = 'github.fork';
+    public const FORK = 'github.fork';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const GOLLUM = 'github.gollum';
+    public const GOLLUM = 'github.gollum';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const ISSUE_COMMENT = 'github.issue_comment';
+    public const ISSUE_COMMENT = 'github.issue_comment';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const ISSUES = 'github.issues';
+    public const ISSUES = 'github.issues';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const MEMBER = 'github.member';
+    public const MEMBER = 'github.member';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const MEMBERSHIP = 'github.membership';
+    public const MEMBERSHIP = 'github.membership';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const PAGE_BUILD = 'github.page_build';
+    public const PAGE_BUILD = 'github.page_build';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const IS_PUBLIC = 'github.public';
+    public const IS_PUBLIC = 'github.public';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const PR_REVIEW_COMMENT = 'github.pull_request_review_comment';
+    public const PR_REVIEW_COMMENT = 'github.pull_request_review_comment';
 
     /** @Event('\App\Event\GithubEvent') */
-    const PULL_REQUEST_REVIEW = 'github.pull_request_review';
+    public const PULL_REQUEST_REVIEW = 'github.pull_request_review';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const PULL_REQUEST = 'github.pull_request';
+    public const PULL_REQUEST = 'github.pull_request';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const PUSH = 'github.push';
+    public const PUSH = 'github.push';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const REPOSITORY = 'github.repository';
+    public const REPOSITORY = 'github.repository';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const RELEASE = 'github.release';
+    public const RELEASE = 'github.release';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const STATUS = 'github.status';
+    public const STATUS = 'github.status';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const TEAM_ADD = 'github.team_add';
+    public const TEAM_ADD = 'github.team_add';
 
     /** @Event('\App\Event\GitHubEvent') */
-    const WATCH = 'github.watch';
+    public const WATCH = 'github.watch';
 }
diff --git a/src/Subscriber/AllowEditFromMaintainerSubscriber.php b/src/Subscriber/AllowEditFromMaintainerSubscriber.php
@@ -3,7 +3,6 @@
 namespace App\Subscriber;
 
 use App\Api\Issue\IssueApi;
-use App\Api\PullRequest\PullRequestApi;
 use App\Event\GitHubEvent;
 use App\GitHubEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -14,12 +13,10 @@
 class AllowEditFromMaintainerSubscriber implements EventSubscriberInterface
 {
     private $commentsApi;
-    private $pullRequestApi;
 
-    public function __construct(IssueApi $commentsApi, PullRequestApi $pullRequestApi)
+    public function __construct(IssueApi $commentsApi)
     {
         $this->commentsApi = $commentsApi;
-        $this->pullRequestApi = $pullRequestApi;
     }
 
     public function onPullRequest(GitHubEvent $event)
diff --git a/tests/Api/Label/GithubLabelApiTest.php b/tests/Api/Label/GithubLabelApiTest.php
@@ -16,9 +16,9 @@
  */
 class GithubLabelApiTest extends TestCase
 {
-    const USER_NAME = 'weaverryan';
+    public const USER_NAME = 'weaverryan';
 
-    const REPO_NAME = 'carson';
+    public const REPO_NAME = 'carson';
 
     /**
      * @var Labels|MockObject
diff --git a/tests/Api/Status/GitHubStatusApiTest.php b/tests/Api/Status/GitHubStatusApiTest.php
@@ -15,9 +15,9 @@
  */
 class GitHubStatusApiTest extends TestCase
 {
-    const USER_NAME = 'weaverryan';
+    public const USER_NAME = 'weaverryan';
 
-    const REPO_NAME = 'carson';
+    public const REPO_NAME = 'carson';
 
     /**
      * @var GithubLabelApi|MockObject

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@`
`9`	`9`	`*/`
`10`	`10`	`final class Status`
`11`	`11`	`{`
`12`		`- const NEEDS_REVIEW = 'needs_review';`
	`12`	`+ public const NEEDS_REVIEW = 'needs_review';`
`13`	`13`
`14`		`- const NEEDS_WORK = 'needs_work';`
	`14`	`+ public const NEEDS_WORK = 'needs_work';`
`15`	`15`
`16`		`- const WORKS_FOR_ME = 'works_for_me';`
	`16`	`+ public const WORKS_FOR_ME = 'works_for_me';`
`17`	`17`
`18`		`- const REVIEWED = 'reviewed';`
	`18`	`+ public const REVIEWED = 'reviewed';`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use App\Model\Repository;`
`6`	`6`	`use Github\Api\Repository\Actions\WorkflowRuns;`
`7`	`7`	`use Github\ResultPager;`
`8`		`-use Psr\Log\LoggerInterface;`
`9`	`8`
`10`	`9`	`/**`
`11`	`10`	`* @author Tobias Nyholm <[email protected]>`
`@@ -14,13 +13,11 @@ class GithubWorkflowApi implements WorkflowApi`
`14`	`13`	`{`
`15`	`14`	`private ResultPager $resultPager;`
`16`	`15`	`private WorkflowRuns $workflowApi;`
`17`		`- private LoggerInterface $logger;`
`18`	`16`
`19`		`- public function __construct(ResultPager $resultPager, WorkflowRuns $workflowApi, LoggerInterface $logger)`
	`17`	`+ public function __construct(ResultPager $resultPager, WorkflowRuns $workflowApi)`
`20`	`18`	`{`
`21`	`19`	`$this->resultPager = $resultPager;`
`22`	`20`	`$this->workflowApi = $workflowApi;`
`23`		`- $this->logger = $logger;`
`24`	`21`	`}`
`25`	`22`
`26`	`23`	`public function approveWorkflowsForPullRequest(Repository $repository, string $headRepository, string $headBranch): void`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace App\Subscriber;`
`4`	`4`
`5`	`5`	`use App\Api\Issue\IssueApi;`
`6`		`-use App\Api\PullRequest\PullRequestApi;`
`7`	`6`	`use App\Event\GitHubEvent;`
`8`	`7`	`use App\GitHubEvents;`
`9`	`8`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`@@ -14,12 +13,10 @@`
`14`	`13`	`class AllowEditFromMaintainerSubscriber implements EventSubscriberInterface`
`15`	`14`	`{`
`16`	`15`	`private $commentsApi;`
`17`		`- private $pullRequestApi;`
`18`	`16`
`19`		`- public function __construct(IssueApi $commentsApi, PullRequestApi $pullRequestApi)`
	`17`	`+ public function __construct(IssueApi $commentsApi)`
`20`	`18`	`{`
`21`	`19`	`$this->commentsApi = $commentsApi;`
`22`		`- $this->pullRequestApi = $pullRequestApi;`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`public function onPullRequest(GitHubEvent $event)`