Merge pull request #45 from madewithlove/upgrades

Upgrades

composer.json

@@ -18,10 +18,10 @@
         "symfony/yaml": "^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "vimeo/psalm": "^4.4",
-        "psalm/plugin-phpunit": "^0.15.1",
-        "friendsofphp/php-cs-fixer": "^3.8"
+        "phpunit/phpunit": "^10.1",
+        "vimeo/psalm": "^5.9",
+        "psalm/plugin-phpunit": "^0.18",
+        "friendsofphp/php-cs-fixer": "^3.16"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Commands/CheckLicenses.php

@@ -22,10 +22,10 @@ class CheckLicenses extends Command
     protected static $defaultName = 'check';
 
     public function __construct(
-        private UsedLicensesParser $usedLicensesParser,
-        private AllowedLicensesParser $allowedLicensesParser,
-        private DependencyTree $dependencyTree,
-        private TableRenderer $tableRenderer
+        private readonly UsedLicensesParser $usedLicensesParser,
+        private readonly AllowedLicensesParser $allowedLicensesParser,
+        private readonly DependencyTree $dependencyTree,
+        private readonly TableRenderer $tableRenderer
     ) {
         parent::__construct();
     }

src/Commands/CountUsedLicenses.php

@@ -17,7 +17,7 @@ class CountUsedLicenses extends Command
     protected static $defaultName = 'count';
 
     public function __construct(
-        private UsedLicensesParser $usedLicensesParser
+        private readonly UsedLicensesParser $usedLicensesParser
     ) {
         parent::__construct();
     }

src/Commands/GenerateConfig.php

@@ -19,8 +19,8 @@ class GenerateConfig extends Command
     protected static $defaultName = 'generate-config';
 
     public function __construct(
-        private AllowedLicensesParser $allowedLicensesParser,
-        private UsedLicensesParser $usedLicensesParser
+        private readonly AllowedLicensesParser $allowedLicensesParser,
+        private readonly UsedLicensesParser $usedLicensesParser
     ) {
         parent::__construct();
     }

src/Commands/ListAllowedLicenses.php

@@ -16,7 +16,7 @@ class ListAllowedLicenses extends Command
     protected static $defaultName = 'allowed';
 
     public function __construct(
-        private AllowedLicensesParser $allowedLicensesParser
+        private readonly AllowedLicensesParser $allowedLicensesParser
     ) {
         parent::__construct();
     }

src/Commands/ListUsedLicenses.php

@@ -17,7 +17,7 @@ class ListUsedLicenses extends Command
     protected static $defaultName = 'used';
 
     public function __construct(
-        private UsedLicensesParser $usedLicensesParser
+        private readonly UsedLicensesParser $usedLicensesParser
     ) {
         parent::__construct();
     }

src/Composer/DependencyTree.php

@@ -9,8 +9,8 @@
 class DependencyTree
 {
     public function __construct(
-        private DependencyTreeRetriever $retriever,
-        private UsedLicensesParser $parser,
+        private readonly DependencyTreeRetriever $retriever,
+        private readonly UsedLicensesParser $parser,
     ) {
     }
 
@@ -26,7 +26,7 @@ public function getDependencies(bool $noDev): array
             $license = $this->parser->getLicenseForPackage($package['name'], $noDev) ?? '';
             $dependency = new Dependency($package['name'], $license);
             if (isset($package['requires'])) {
-                /** @psalm-suppress MixedArgumentTypeCoercion */
+                /** @psalm-suppress ArgumentTypeCoercion */
                 foreach ($this->getSubDependencies($package['requires']) as $subDependency) {
                     $dependency->addDependency($subDependency);
                 }
@@ -52,7 +52,7 @@ private function getSubDependencies(array $subTree): array
         foreach ($subTree as $subTreeItem) {
             $subDependencies[] = $subTreeItem['name'];
             if (isset($subTreeItem['requires'])) {
-                /** @psalm-suppress MixedArgumentTypeCoercion */
+                /** @psalm-suppress ArgumentTypeCoercion */
                 $subDependencies = array_merge($subDependencies, $this->getSubDependencies($subTreeItem['requires']));
             }
         }

src/Composer/UsedLicensesParser.php

@@ -7,7 +7,7 @@
 class UsedLicensesParser
 {
     public function __construct(
-        private UsedLicensesRetriever $retriever
+        private readonly UsedLicensesRetriever $retriever
     ) {
     }
 

src/Configuration/AllowedLicensesParser.php

@@ -11,7 +11,7 @@ class AllowedLicensesParser
     private const DEFAULT_CONFIG_FILE_NAME = '.allowed-licenses';
 
     public function __construct(
-        private string $workingDirectory
+        private readonly string $workingDirectory
     ) {
     }