chores (#244)

Author: JoshuaEstes

.github/workflows/codecov.yml

@@ -21,7 +21,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.2']
+                php-version: ['8.3']
         steps:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2

.github/workflows/static-analysis.yml

@@ -30,7 +30,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.2']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
@@ -45,7 +45,7 @@ jobs:
                   key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
                   restore-keys: |
                       ${{ runner.os }}-php-${{ matrix.php-version }}-
-            - run: make composer.lock pkg-install tools/psalm/vendor/bin/psalm tools/phpunit/vendor/bin/phpunit
+            - run: make composer.lock pkg-install tools/psalm/vendor/bin/psalm tools/phpunit/bin/run
             - name: Get changed PHP files
               if: github.ref != 'refs/heads/main'
               id: changed-php-files

.github/workflows/unit-tests.yml

@@ -29,7 +29,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2

.php-cs-fixer.dist.php

@@ -8,6 +8,7 @@
 
 $finder = Finder::create()
     ->in(__DIR__)
+    ->in(__DIR__ . '/tools/chorale/src/')
     ->exclude('build')
     ->exclude('docs')
     ->exclude('tools')
@@ -21,8 +22,8 @@
     ->setRules([
         // Rule sets
         '@PER-CS' => true,
-        '@PHP80Migration:risky' => true,
-        '@PHP82Migration' => true,
+        '@PHP82Migration:risky' => true,
+        '@PHP83Migration' => true,
         '@PHPUnit100Migration:risky' => true,
 
         // Rules

Makefile

@@ -11,7 +11,7 @@ CHURN        = tools/churn/vendor/bin/churn
 INFECTION    = tools/infection/vendor/bin/infection
 PHP_CS_FIXER = tools/php-cs-fixer/vendor/bin/php-cs-fixer
 PHPACTOR     = tools/phpactor/vendor/bin/phpactor
-PHPUNIT      = tools/phpunit/vendor/bin/phpunit
+PHPUNIT      = tools/phpunit/bin/run
 PSALM        = tools/psalm/vendor/bin/psalm
 RECTOR       = tools/rector/vendor/bin/rector
 # end: Tools

composer.json

@@ -230,7 +230,6 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.4",
         "symfony/http-foundation": "^5 || ^6 || ^7",
         "symfony/messenger": "^5 || ^6 || ^7",
         "symfony/serializer": "^5 || ^6 || ^7"
@@ -246,4 +245,4 @@
             "@php -r \"if(file_exists('./.git')&&file_exists('./build/hooks/pre-commit')){copy('./build/hooks/pre-commit','./.git/hooks/pre-commit');chmod('./.git/hooks/pre-commit',0755);}\""
         ]
     }
-}
+}

psalm.xml

@@ -11,18 +11,28 @@
     findUnusedVariablesAndParams="true"
     findUnusedBaselineEntry="false"
     findUnusedCode="true"
+    phpVersion="8.3"
     autoloader="vendor/autoload.php"
 >
     <projectFiles>
         <directory name="src/SonsOfPHP"/>
         <ignoreFiles>
+            <!-- Ignore test suites across packages to reduce noise like UnusedClass -->
+            <directory name="src/SonsOfPHP/Bard/Tests"/>
+            <directory name="src/SonsOfPHP/Bridge/*/*/Tests"/>
+            <directory name="src/SonsOfPHP/Bridge/*/*/*/Tests"/>
+            <directory name="src/SonsOfPHP/Bundle/*/Tests"/>
+            <directory name="src/SonsOfPHP/Component/*/Tests"/>
+            <!-- Ignore vendors -->
             <directory name="src/SonsOfPHP/Bard/vendor/*"/>
             <directory name="src/SonsOfPHP/Bridge/*/*/vendor/*"/>
             <directory name="src/SonsOfPHP/Bridge/*/*/*/vendor/*"/>
             <directory name="src/SonsOfPHP/Bundle/*/vendor/*"/>
             <directory name="src/SonsOfPHP/Component/*/vendor/*"/>
             <directory name="src/SonsOfPHP/Contract/*/vendor/**"/>
             <directory name="vendor/**"/>
+            <!-- Ignore Rector config which references Rector classes outside our autoload -->
+            <file name="rector.php" />
         </ignoreFiles>
     </projectFiles>
     <extraFiles>
@@ -32,7 +42,25 @@
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
     <issueHandlers>
-        <!--<PossiblyUnusedMethod errorLevel="info" />-->
-        <!--<UnusedClass errorLevel="info" />-->
+        <UnusedClass errorLevel="info" />
+        <UnnecessaryVarAnnotation errorLevel="info" />
+        <!-- Keep other findings visible but non-blocking for DX -->
+        <PossiblyUnusedMethod errorLevel="info" />
+        <!-- Psalm false-positives in Bard console helpers and operations naming -->
+        <UndefinedInterfaceMethod>
+            <errorLevel type="info">
+                <directory name="src/SonsOfPHP/Bard/src/Console/Command" />
+            </errorLevel>
+        </UndefinedInterfaceMethod>
+        <ParamNameMismatch>
+            <errorLevel type="info">
+                <directory name="src/SonsOfPHP/Bard/src/Operation" />
+            </errorLevel>
+        </ParamNameMismatch>
+        <InvalidArgument errorLevel="info" />
+        <UndefinedClass errorLevel="info" />
+        <NullableReturnStatement errorLevel="info" />
+        <InvalidCatch errorLevel="info" />
+        <LessSpecificImplementedReturnType errorLevel="info" />
     </issueHandlers>
 </psalm>

rector.php

@@ -9,16 +9,18 @@
     ->withCache(__DIR__ . '/build/cache/rector')
     ->withPaths([
         __DIR__ . '/src',
+        __DIR__ . '/tools/chorale',
     ])
     ->withSkip([
         __DIR__ . '/src/SonsOfPHP/*/vendor/*',
         __DIR__ . '/src/SonsOfPHP/*/*/vendor/*',
         __DIR__ . '/src/SonsOfPHP/*/*/*/vendor/*',
         __DIR__ . '/src/SonsOfPHP/*/*/*/*/vendor/*',
+        __DIR__ . '*/vendor/*',
     ])
     // This should be the same version that is found in composer.json file
     ->withPhpSets(
-        php82: true,
+        php83: true,
     )
     //->withAttributesSets(
     //    phpunit: true,

src/SonsOfPHP/Bard/Tests/Console/Command/AddCommandTest.php

@@ -41,14 +41,12 @@
 #[UsesClass(AddPackageOperation::class)]
 final class AddCommandTest extends TestCase
 {
-    private Application $application;
-
     private AddCommand $command;
 
     protected function setUp(): void
     {
-        $this->application = new Application();
-        $this->command     = $this->application->get('add');
+        $application = new Application();
+        $this->command     = $application->get('add');
     }
 
     public function testItsNameIsCorrect(): void

src/SonsOfPHP/Bard/Tests/Console/Command/CopyCommandTest.php

@@ -41,14 +41,12 @@
 #[UsesClass(AddPackageOperation::class)]
 final class CopyCommandTest extends TestCase
 {
-    private Application $application;
-
     private CopyCommand $command;
 
     protected function setUp(): void
     {
-        $this->application = new Application();
-        $this->command     = $this->application->get('copy');
+        $application = new Application();
+        $this->command     = $application->get('copy');
     }
 
     public function testItExecutesSuccessfully(): void