Bump PHP SDK to 4.0 (#793)

Co-authored-by: Alex Bouma <[email protected]>

Author: cleptric

composer.json

@@ -23,8 +23,7 @@
     "require": {
         "php": "^7.2 | ^8.0",
         "illuminate/support": "^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
-        "sentry/sentry": "^3.20.1",
-        "sentry/sdk": "^3.4",
+        "sentry/sentry": "^4.0",
         "symfony/psr-http-message-bridge": "^1.0 | ^2.0",
         "nyholm/psr7": "^1.0"
     },
@@ -74,11 +73,5 @@
         }
     },
     "prefer-stable": true,
-    "minimum-stability": "dev",
-    "config": {
-        "allow-plugins": {
-            "kylekatarnls/update-helper": false,
-            "php-http/discovery": false
-        }
-    }
+    "minimum-stability": "dev"
 }

src/Sentry/Laravel/ServiceProvider.php

@@ -12,7 +12,6 @@
 use Laravel\Lumen\Application as Lumen;
 use RuntimeException;
 use Sentry\ClientBuilder;
-use Sentry\ClientBuilderInterface;
 use Sentry\Event;
 use Sentry\EventHint;
 use Sentry\Integration as SdkIntegration;
@@ -216,7 +215,7 @@ protected function registerAboutCommandIntegration(): void
      */
     protected function configureAndRegisterClient(): void
     {
-        $this->app->bind(ClientBuilderInterface::class, function () {
+        $this->app->bind(ClientBuilder::class, function () {
             $basePath = base_path();
             $userConfig = $this->getUserConfig();
 
@@ -280,8 +279,8 @@ protected function configureAndRegisterClient(): void
         });
 
         $this->app->singleton(HubInterface::class, function () {
-            /** @var \Sentry\ClientBuilderInterface $clientBuilder */
-            $clientBuilder = $this->app->make(ClientBuilderInterface::class);
+            /** @var \Sentry\ClientBuilder $clientBuilder */
+            $clientBuilder = $this->app->make(ClientBuilder::class);
 
             $options = $clientBuilder->getOptions();
 

test/Sentry/ClientBuilderDecoratorTest.php

@@ -2,15 +2,15 @@
 
 namespace Sentry\Laravel\Tests;
 
-use Sentry\ClientBuilderInterface;
+use Sentry\ClientBuilder;
 
 class ClientBuilderDecoratorTest extends TestCase
 {
     protected function defineEnvironment($app): void
     {
         parent::defineEnvironment($app);
 
-        $app->extend(ClientBuilderInterface::class, function (ClientBuilderInterface $clientBuilder) {
+        $app->extend(ClientBuilder::class, function (ClientBuilder $clientBuilder) {
             $clientBuilder->getOptions()->setEnvironment('from_service_container');
 
             return $clientBuilder;

test/Sentry/ServiceProviderTest.php

@@ -12,7 +12,7 @@ class ServiceProviderTest extends TestCase
 {
     protected function defineEnvironment($app): void
     {
-        $app['config']->set('sentry.dsn', 'https://publickey:secretkey@sentry.dev/123');
+        $app['config']->set('sentry.dsn', 'https://[email protected]/123');
         $app['config']->set('sentry.error_types', E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED);
     }
 
@@ -56,7 +56,6 @@ public function testDsnWasSetFromConfig(): void
         $this->assertEquals('https://sentry.dev', $options->getDsn()->getScheme() . '://' . $options->getDsn()->getHost());
         $this->assertEquals(123, $options->getDsn()->getProjectId());
         $this->assertEquals('publickey', $options->getDsn()->getPublicKey());
-        $this->assertEquals('secretkey', $options->getDsn()->getSecretKey());
     }
 
     /**

test/Sentry/ServiceProviderWithCustomAliasTest.php

@@ -11,7 +11,7 @@ class ServiceProviderWithCustomAliasTest extends TestCase
 {
     protected function defineEnvironment($app): void
     {
-        $app['config']->set('custom-sentry.dsn', 'http://publickey:secretkey@sentry.dev/123');
+        $app['config']->set('custom-sentry.dsn', 'http://[email protected]/123');
         $app['config']->set('custom-sentry.error_types', E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED);
     }
 
@@ -55,7 +55,6 @@ public function testDsnWasSetFromConfig(): void
         $this->assertEquals('http://sentry.dev', $options->getDsn()->getScheme() . '://' . $options->getDsn()->getHost());
         $this->assertEquals(123, $options->getDsn()->getProjectId());
         $this->assertEquals('publickey', $options->getDsn()->getPublicKey());
-        $this->assertEquals('secretkey', $options->getDsn()->getSecretKey());
     }
 
     /**

test/Sentry/TestCase.php

@@ -58,7 +58,7 @@ protected function defineEnvironment($app): void
             });
 
             if ($config->get('sentry_test.override_dsn') !== true) {
-                $config->set('sentry.dsn', 'https://publickey:secretkey@sentry.dev/123');
+                $config->set('sentry.dsn', 'https://[email protected]/123');
             }
 
             foreach ($this->setupConfig as $key => $value) {