Merge pull request #331 from lptn/bump_dependencies

Bump dependencies

.github/workflows/test.yml

@@ -20,6 +20,7 @@ on:
 jobs:
 
   unit_tests:
+    name: Unit tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -53,7 +54,7 @@ jobs:
         exclude:
           - php: 8.0
             laravel: ^10.0
-    name: P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
+    name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

composer.json

@@ -13,18 +13,18 @@
     "require": {
         "php": "^8.0.2",
         "ext-simplexml": "*",
-        "barryvdh/laravel-ide-helper": "^2.12",
-        "illuminate/config": "^9.48 || ^10.0.0",
-        "illuminate/container": "^9.48 || ^10.0.0",
-        "illuminate/contracts": "^9.48 || ^10.0.0",
-        "illuminate/database": "^9.48 || ^10.0.0",
-        "illuminate/events": "^9.48 || ^10.0.0",
-        "illuminate/http": "^9.48 || ^10.0.0",
-        "illuminate/routing": "^9.48 || ^10.0.0",
-        "illuminate/support": "^9.48 || ^10.0.0",
-        "illuminate/view": "^9.48 || ^10.0.0",
+        "barryvdh/laravel-ide-helper": "^2.13",
+        "illuminate/config": "^9.48 || ^10.0",
+        "illuminate/container": "^9.48 || ^10.0",
+        "illuminate/contracts": "^9.48 || ^10.0",
+        "illuminate/database": "^9.48 || ^10.0",
+        "illuminate/events": "^9.48 || ^10.0",
+        "illuminate/http": "^9.48 || ^10.0",
+        "illuminate/routing": "^9.48 || ^10.0",
+        "illuminate/support": "^9.48 || ^10.0",
+        "illuminate/view": "^9.48 || ^10.0",
         "nikic/php-parser": "^4.13",
-        "orchestra/testbench": "^7.19 || ^8.0.0",
+        "orchestra/testbench": "^7.19 || ^8.0",
         "symfony/console": "^6.0",
         "vimeo/psalm": "^4.30 || ^5.1"
     },
@@ -34,7 +34,7 @@
         "codeception/module-cli": "^2.0",
         "codeception/module-filesystem": "^3.0",
         "codeception/module-phpbrowser": "^3.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6 || ^10.0",
         "ramsey/collection": "^1.3",
         "slevomat/coding-standard": "^8.8",
         "squizlabs/php_codesniffer": "*",

phpunit.xml

@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
-         executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         verbose="true">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    executionOrder="depends,defects"
+    beStrictAboutOutputDuringTests="true"
+    failOnRisky="true"
+    failOnWarning="true"
+    cacheDirectory=".phpunit.cache"
+    requireCoverageMetadata="true"
+    beStrictAboutCoverageMetadata="true">
     <testsuites>
         <testsuite name="default">
             <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
-
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <coverage>
         <include>
             <directory suffix=".php">src</directory>
         </include>

tests/Acceptance/Support/Module.php

@@ -18,7 +18,7 @@
 use OutOfBoundsException;
 use PackageVersions\Versions;
 use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\SkippedTestError;
+use PHPUnit\Framework\SkippedTestSuiteError;
 use RuntimeException;
 
 use function is_array;
@@ -371,7 +371,7 @@ public function haveTheFollowingCode($code): void
     public function haveSomeFuturePsalmThatSupportsThisFeature(string $ref): void
     {
         /** @psalm-suppress InternalClass,InternalMethod */
-        throw new SkippedTestError("Future functionality that Psalm has yet to support: $ref");
+        throw new SkippedTestSuiteError("Future functionality that Psalm has yet to support: $ref");
     }
 
     /**
@@ -387,7 +387,7 @@ public function havePsalmOfACertainVersionRangeBecauseOf(string $operator, strin
 
         if (!$this->packageSatisfiesVersionConstraint('vimeo/psalm', $op . $version)) {
             /** @psalm-suppress InternalClass,InternalMethod */
-            throw new SkippedTestError("This scenario requires Psalm $op $version because of $reason");
+            throw new SkippedTestSuiteError("This scenario requires Psalm $op $version because of $reason");
         }
     }
 
@@ -473,7 +473,7 @@ public function haveADependencySatisfied(string $package, string $versionConstra
         }
 
         /** @psalm-suppress InternalClass,InternalMethod */
-        throw new SkippedTestError("This scenario requires $package to match $versionConstraint");
+        throw new SkippedTestSuiteError("This scenario requires $package to match $versionConstraint");
     }
 
     private function convertToRegexp(string $in): string

tests/Unit/Handlers/Eloquent/Schema/AbstractSchemaAggregatorTest.php → tests/Unit/Handlers/Eloquent/Schema/AbstractSchemaAggregatorTestCase.php

@@ -22,7 +22,7 @@
 use const PHP_VERSION_ID;
 
 /** @covers \Psalm\LaravelPlugin\Handlers\Eloquent\Schema\SchemaAggregator */
-abstract class AbstractSchemaAggregatorTest extends TestCase
+abstract class AbstractSchemaAggregatorTestCase extends TestCase
 {
     final protected function instantiateSchemaAggregator(string $filepath): SchemaAggregator
     {
@@ -55,7 +55,6 @@ final protected function instantiateSchemaAggregator(string $filepath): SchemaAg
         return $schemaAggregator;
     }
 
-
     protected function assertColumnHasType(string $type, SchemaColumn $column): void
     {
         Assert::assertSame($type, $column->type);

tests/Unit/Handlers/Eloquent/Schema/DefaultUserTableTest.php

@@ -7,7 +7,7 @@
 use Psalm\LaravelPlugin\Handlers\Eloquent\Schema\SchemaAggregator;
 
 /** @covers \Psalm\LaravelPlugin\Handlers\Eloquent\Schema\SchemaAggregator */
-final class DefaultUserTableTest extends AbstractSchemaAggregatorTest
+final class DefaultUserTableTest extends AbstractSchemaAggregatorTestCase
 {
     /** @test */
     public function it_detects_all_columns_from_anonymous_class_migration(): void

tests/laravel-test.sh

@@ -10,7 +10,7 @@ rm -rf $APP_INSTALLATION_PATH
 
 echo "Installing Laravel 10"
 # @see https://github.com/laravel/laravel/tags for Laravel versions
-composer create-project laravel/laravel $APP_INSTALLATION_PATH dev-master --quiet --prefer-dist
+composer create-project laravel/laravel $APP_INSTALLATION_PATH 10.0 --quiet --prefer-dist
 cd $APP_INSTALLATION_PATH
 
 echo "Preparing Laravel"
@@ -37,6 +37,7 @@ echo "Preparing Laravel"
 
 echo "Adding package from source"
 composer config repositories.0 '{"type": "path", "url": "../psalm-plugin-laravel"}'
+composer config minimum-stability 'dev'
 COMPOSER_MEMORY_LIMIT=-1 composer require --dev "psalm/plugin-laravel:*" --update-with-all-dependencies
 
 echo "Analyzing Laravel"