Merge branch 'master' into application-stub

psalm · Mar 17, 2024 · bfcd819 · bfcd819
2 parents a65c2a5 + 4320620
commit bfcd819
Show file tree

Hide file tree

Showing 30 changed files with 100 additions and 1,743 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,7 +8,6 @@
 /tests              export-ignore
 /.editorconfig      export-ignore
 /.php_cs.xml        export-ignore
-/codeception.yml    export-ignore
 /psalm.xml          export-ignore
 /psalm-baseline.xml export-ignore
 /UPGRADING.md       export-ignore
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -58,7 +58,7 @@ jobs:
         exclude:
           - php: 8.1
             laravel: ^11.0
-    name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
+    name: Type P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -78,6 +78,3 @@ jobs:
 
       - name: Run Psalm/Type tests
         run: composer test:type
-
-      - name: Run Acceptance tests
-        run: composer test:acceptance
diff --git a/README.md b/README.md
@@ -31,14 +31,14 @@ Find bugs without the overhead of writing tests!
 
 ## Versions & Dependencies
 
-| Laravel Psalm Plugin | PHP  | Laravel    | Psalm |
-|----------------------|------|------------|-------|
-| 2.10+                | ^8.1 | 10, 11     | 5     |
-| 2.9.x                | ^8.0 | 9, 10, 11  | 4, 5  |
-| 2.7-2.8              | ^8.0 | 9, 10      | 4, 5  |
-| 2.1-2.6              | ^8.0 | 9          | 4, 5  |
-| 2.0.x                | ^8.0 | 8, 9       | 4, 5  |
-| 1.x                  | ^7.1 | 5, 6, 7, 8 | 3, 4  |
+Maintained versions:
+
+| Laravel Psalm Plugin | PHP   | Laravel    | Psalm |
+|----------------------|-------|------------|-------|
+| master               | ^8.1  | 10, 11     | 5     |
+| 2.9.x                | ^8.0  | 9, 10, 11  | 4, 5  |
+| 1.6.x                | >=7.3 | 6, 8       | 4     |
+| 1.4.x                | >=7.2 | 6, 7, 8    | 3, 4  |
 
 See [releases](https://github.com/psalm/psalm-plugin-laravel/releases) for more details about supported PHP, Laravel and Psalm versions.
 

diff --git a/codeception.yml b/codeception.yml
diff --git a/composer.json b/composer.json
@@ -29,11 +29,6 @@
         "vimeo/psalm": "^5.20"
     },
     "require-dev": {
-        "codeception/codeception": "^5.0",
-        "codeception/module-asserts": "^3.0",
-        "codeception/module-cli": "^2.0",
-        "codeception/module-filesystem": "^3.0",
-        "codeception/module-phpbrowser": "^3.0",
         "laravel/framework": "^10.48 || ^11.0",
         "phpunit/phpunit": "^10.5 || ^11.0",
         "phpyh/psalm-tester": "^0.1.0",
@@ -75,13 +70,8 @@
             "@lint",
             "@psalm",
             "@test:unit",
-            "@test:acceptance",
             "@test:type"
         ],
-        "test:acceptance": [
-            "Composer\\Config::disableProcessTimeout",
-            "codecept run --skip-group skip"
-        ],
         "test:type": "phpunit --testsuite=type",
         "test:unit": "phpunit --testsuite=unit"
     }

diff --git a/phpcs.xml b/phpcs.xml
@@ -26,10 +26,6 @@
     <file>tests</file>
     <exclude-pattern>cache/</exclude-pattern>
     <exclude-pattern>tests/_run/</exclude-pattern>
-    <exclude-pattern>tests/Acceptance/_output</exclude-pattern>
-    <exclude-pattern>tests/Acceptance/_run</exclude-pattern>
-    <exclude-pattern>tests/Acceptance/_support</exclude-pattern>
-    <exclude-pattern>tests/Acceptance/Support/</exclude-pattern><!-- This code mostly copy-paste from https://github.com/psalm/codeception-psalm-module and thus may have different coding-style rules -->
     <exclude-pattern>tests/Application/</exclude-pattern>
     <exclude-pattern>tests/Unit/Handlers/Eloquent/Schema/migrations</exclude-pattern>
     <exclude-pattern>tests-app/</exclude-pattern>