From 38337a0aaa94d86220cde4f6c33a7b181c9e48eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Mon, 27 Jan 2025 16:24:20 +0100
Subject: [PATCH] Remove `php-standard-library/psalm-plugin`

The `azjezz/psl` dependency was removed in php/pie#42, making this dependency
obsolete.
---
 .github/workflows/continuous-integration.yml |  4 +-
 composer.json                                |  1 -
 composer.lock                                | 56 +-------------------
 psalm.xml.dist                               |  1 -
 4 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index a1ad3c6..7bc59c7 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -32,7 +32,7 @@ jobs:
       # temporarily remove Psalm until ready for PHP 8.4
       - name: remove psalm
         if: matrix.php-versions == '8.4'
-        run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit php-standard-library/psalm-plugin
+        run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit
       - uses: ramsey/composer-install@v3
       - name: Run PHPUnit on Windows
         if: matrix.operating-system == 'windows-latest'
@@ -69,7 +69,7 @@ jobs:
       # temporarily remove Psalm until ready for PHP 8.4
       - name: remove psalm
         if: matrix.php-versions == '8.4'
-        run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit php-standard-library/psalm-plugin
+        run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit
       - uses: ramsey/composer-install@v3
       - name: Run Behat on Windows
         if: matrix.operating-system == 'windows-latest'
diff --git a/composer.json b/composer.json
index f5cca48..d34a6e5 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,6 @@
     "require-dev": {
         "behat/behat": "^3.17",
         "doctrine/coding-standard": "^12.0",
-        "php-standard-library/psalm-plugin": "^2.3",
         "phpunit/phpunit": "^10.5.39",
         "psalm/plugin-phpunit": "^0.19.0",
         "vimeo/psalm": "^5.26.1"
diff --git a/composer.lock b/composer.lock
index 3a753ae..2746705 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d71a5173586deb071e3d24d7c761e9c2",
+    "content-hash": "3e5b020be2a72ed28762d64d89b63795",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -3207,60 +3207,6 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "php-standard-library/psalm-plugin",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-standard-library/psalm-plugin.git",
-                "reference": "bf6d560ae498966150bc66a42e02744b0ee242c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-standard-library/psalm-plugin/zipball/bf6d560ae498966150bc66a42e02744b0ee242c5",
-                "reference": "bf6d560ae498966150bc66a42e02744b0ee242c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1",
-                "vimeo/psalm": ">=5.16"
-            },
-            "conflict": {
-                "azjezz/psl": "<2.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "roave/security-advisories": "dev-master",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "psalm-plugin",
-            "extra": {
-                "psalm": {
-                    "pluginClass": "Psl\\Psalm\\Plugin"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psl\\Psalm\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "azjezz",
-                    "email": "azjezz@protonmail.com"
-                }
-            ],
-            "description": "Psalm plugin for the PHP Standard Library",
-            "support": {
-                "issues": "https://github.com/php-standard-library/psalm-plugin/issues",
-                "source": "https://github.com/php-standard-library/psalm-plugin/tree/2.3.0"
-            },
-            "time": "2023-11-28T12:22:48+00:00"
-        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.2.0",
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 1406f3e..b88a968 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -20,7 +20,6 @@
     </projectFiles>
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-        <pluginClass class="Psl\Psalm\Plugin"/>
     </plugins>
     <issueHandlers>
         <PossiblyUnusedMethod>