Cleanup some leftover dependecies (#1602)

Author: cleptric

.github/workflows/static-analysis.yaml

@@ -24,7 +24,7 @@ jobs:
         run: composer update --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: composer phpcs
+        run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run
 
   phpstan:
     name: PHPStan
@@ -42,7 +42,7 @@ jobs:
         run: composer update --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: composer phpstan
+        run: vendor/bin/phpstan analyse
 
   psalm:
     name: Psalm
@@ -62,4 +62,4 @@ jobs:
         run: composer update --no-progress --no-interaction --prefer-dist
 
       - name: Run script
-        run: composer psalm
+        run: vendor/bin/psalm

Makefile

@@ -32,14 +32,10 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
         "guzzlehttp/promises": "^1.0|^2.0",
-        "http-interop/http-factory-guzzle": "^1.0",
+        "guzzlehttp/psr7": "^1.8.4|^2.1.1",
         "monolog/monolog": "^1.6|^2.0|^3.0",
-        "nikic/php-parser": "^4.10.3",
-        "php-http/mock-client": "^1.3",
         "phpbench/phpbench": "^1.0",
-        "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.3",
-        "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^8.5.14|^9.4",
         "symfony/phpunit-bridge": "^5.2|^6.0",
         "vimeo/psalm": "^4.17"
@@ -48,7 +44,6 @@
         "monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
     },
     "conflict": {
-        "php-http/client-common": "1.8.0",
         "raven/raven": "*"
     },
     "autoload": {
@@ -68,9 +63,12 @@
         "tests": [
             "vendor/bin/phpunit --verbose"
         ],
-        "phpcs": [
+        "cs-check": [
             "vendor/bin/php-cs-fixer fix --verbose --diff --dry-run"
         ],
+        "cs-fix": [
+            "vendor/bin/php-cs-fixer fix --verbose --diff"
+        ],
         "phpstan": [
             "vendor/bin/phpstan analyse"
         ],
@@ -79,12 +77,7 @@
         ]
     },
     "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "php-http/discovery": false,
-            "phpstan/extension-installer": true
-        }
+        "sort-packages": true
     },
     "prefer-stable": true
 }

composer.json

@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-use Http\Discovery\ClassDiscovery;
-use Http\Discovery\Strategy\MockClientStrategy;
 use Sentry\Breadcrumb;
 use Sentry\Event;
 use Sentry\Tracing\Span;
@@ -12,8 +10,6 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-ClassDiscovery::appendStrategy(MockClientStrategy::class);
-
 // According to the Symfony documentation the proper way to register the mocked
 // functions for a certain class would be to configure the listener in the
 // phpunit.xml file, however in our case it doesn't work because PHPUnit loads