Merge pull request #283 from PrestaShop/dependabot/composer/master/ph…

…pstan/phpstan-2.0.1 Bump phpstan/phpstan from 1.12.8 to 2.0.1
PrestaShop · Nov 13, 2024 · fca0b35 · fca0b35
2 parents ea1bf42 + 5cf6732
commit fca0b35
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "phpunit/phpunit": "^9.5",
         "friendsofphp/php-cs-fixer": "^3.59",
         "prestashop/php-coding-standards": "^5",
-        "phpstan/phpstan": "^1",
+        "phpstan/phpstan": "^2",
         "symfony/var-dumper": "^5.4"
     },
     "autoload": {
@@ -25,5 +25,10 @@
          },
          "classmap": ["src"]
     },
-    "license": "MIT"
+    "license": "MIT",
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
+    }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/App/Command/GitHubMonthlyReportCommand.php b/src/App/Command/GitHubMonthlyReportCommand.php
@@ -166,12 +166,12 @@ private function generateReport(InputInterface $input, OutputInterface $output):
                 $this->dateStart,
                 $this->dateEnd,
                 date('F', strtotime($this->dateStart)),
-                $this->results['issues_opened'],
-                $this->results['issues_closed'],
-                $this->results['issues_fixed'],
-                $this->results['prs_opened'],
-                $this->results['prs_closed'],
-                $this->results['prs_merged'],
+                (string) $this->results['issues_opened'],
+                (string) $this->results['issues_closed'],
+                (string) $this->results['issues_fixed'],
+                (string) $this->results['prs_opened'],
+                (string) $this->results['prs_closed'],
+                (string) $this->results['prs_merged'],
                 $this->results['releases'],
                 $this->results['core_prs'],
                 $this->results['other_prs'],

diff --git a/src/App/Command/GithubCQRSEndpointsCommand.php b/src/App/Command/GithubCQRSEndpointsCommand.php
@@ -17,7 +17,7 @@
 class GithubCQRSEndpointsCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 

diff --git a/src/App/Command/GithubCheckModuleCommand.php b/src/App/Command/GithubCheckModuleCommand.php
@@ -16,11 +16,11 @@
 class GithubCheckModuleCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
     /**
-     * @var ModuleChecker;
+     * @var ModuleChecker
      */
     protected $moduleChecker;
 

diff --git a/src/App/Command/GithubCheckPRCommand.php b/src/App/Command/GithubCheckPRCommand.php
@@ -27,23 +27,23 @@ class GithubCheckPRCommand extends Command
     ];
 
     /**
-     * @var Filters;
+     * @var Filters
      */
     protected $filters;
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
     /**
-     * @var array;
+     * @var array
      */
     protected $orderBy;
     /**
-     * @var OutputInterface;
+     * @var OutputInterface
      */
     protected $output;
     /**
-     * @var int;
+     * @var int
      */
     protected $countRows = 0;
 

diff --git a/src/App/Command/GithubCheckRepositoryCommand.php b/src/App/Command/GithubCheckRepositoryCommand.php
@@ -13,7 +13,7 @@
 class GithubCheckRepositoryCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 
@@ -63,8 +63,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $page = 1;
+        /** @var array<array<string, mixed>> $results */
         $results = [];
         do {
+            /** @var array<array<string, mixed>> */
             $repos = $this->github->getClient()->api('organization')->repositories('PrestaShop', $type, $page);
             ++$page;
             $results = array_merge($results, $repos);

diff --git a/src/App/Command/GithubContributorsExportCommand.php b/src/App/Command/GithubContributorsExportCommand.php
@@ -11,7 +11,7 @@
 class GithubContributorsExportCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 
@@ -121,7 +121,7 @@ private function export(InputInterface $input, OutputInterface $output): void
 
                     return '';
                 }, '');
-                $branch = array_reduce($pullRequest['labels'], function (bool $carry, array $item) {
+                $branch = array_reduce($pullRequest['labels'], function (string $carry, array $item) {
                     if (!empty($carry)) {
                         return $carry;
                     }

diff --git a/src/App/Command/GithubContributorsStatsCommand.php b/src/App/Command/GithubContributorsStatsCommand.php
@@ -12,7 +12,7 @@
 class GithubContributorsStatsCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 
@@ -104,7 +104,7 @@ private function process(InputInterface $input, OutputInterface $output): void
                 $pullRequest = $pullRequest['node'];
                 $repository = $pullRequest['repository']['name'];
                 $createdKey = substr($pullRequest['createdAt'], 0, 10);
-                $branch = array_reduce($pullRequest['labels']['nodes'], function (bool $carry, array $item) {
+                $branch = array_reduce($pullRequest['labels']['nodes'], function (string $carry, array $item) {
                     if (!empty($carry)) {
                         return $carry;
                     }

diff --git a/src/App/Command/GithubNotificationsCommand.php b/src/App/Command/GithubNotificationsCommand.php
@@ -13,7 +13,7 @@
 class GithubNotificationsCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 

diff --git a/src/App/Command/GithubReleaseNoteCommand.php b/src/App/Command/GithubReleaseNoteCommand.php
@@ -18,17 +18,17 @@
 class GithubReleaseNoteCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 
     /**
-     * @var OutputInterface;
+     * @var OutputInterface
      */
     protected $output;
 
     /**
-     * @var int;
+     * @var int
      */
     protected $countRows = 0;
 

diff --git a/src/App/Command/GithubStatsCommand.php b/src/App/Command/GithubStatsCommand.php
@@ -14,7 +14,7 @@
 class GithubStatsCommand extends Command
 {
     /**
-     * @var Github;
+     * @var Github
      */
     protected $github;
 

diff --git a/src/App/Service/Github.php b/src/App/Service/Github.php
@@ -13,7 +13,7 @@
 class Github
 {
     /**
-     * @var Client;
+     * @var Client
      */
     protected $client;
 

diff --git a/tests/App/Service/ModuleFetcherTest.php b/tests/App/Service/ModuleFetcherTest.php
@@ -17,7 +17,6 @@ public function testGetModules(array $apiReturn, array $expected)
         $moduleFetcher = new ModuleFetcher($this->getMockGithub($apiReturn));
         $modules = $moduleFetcher->getModules();
 
-        $this->assertIsArray($modules);
         $this->assertEquals($expected, $modules);
     }