Fix custom alias (#263)

* add failing test

* fix custom alias


Co-authored-by: Kevin Pohl <[email protected]>

Author: 2 people

src/Sentry/Laravel/ServiceProvider.php

@@ -25,7 +25,7 @@ class ServiceProvider extends IlluminateServiceProvider
      */
     public function boot(): void
     {
-        $this->app->make(self::$abstract);
+        $this->app->make(static::$abstract);
 
         if ($this->hasDsnSet()) {
             $this->bindEvents($this->app);
@@ -128,7 +128,7 @@ protected function configureAndRegisterClient(): void
             return Hub::getCurrent();
         });
 
-        $this->app->alias(self::$abstract, HubInterface::class);
+        $this->app->alias(static::$abstract, HubInterface::class);
     }
 
     /**

test/Sentry/ServiceProviderTest.php

@@ -32,6 +32,7 @@ public function testIsBound()
     {
         $this->assertTrue(app()->bound('sentry'));
         $this->assertInstanceOf(Hub::class, app('sentry'));
+        $this->assertSame(app('sentry'), Facade::getFacadeRoot());
     }
 
     /**

test/Sentry/ServiceProviderWithCustomAliasTest.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Sentry\Laravel\Tests;
+
+use Sentry\State\Hub;
+use Sentry\Laravel\Facade;
+use Sentry\Laravel\ServiceProvider;
+
+class ServiceProviderWithCustomAliasTest extends \Orchestra\Testbench\TestCase
+{
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('custom-sentry.dsn', 'http://publickey:[email protected]/123');
+        $app['config']->set('custom-sentry.error_types', E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED);
+    }
+
+    protected function getPackageProviders($app)
+    {
+        return [
+            CustomSentryServiceProvider::class,
+        ];
+    }
+
+    protected function getPackageAliases($app)
+    {
+        return [
+            'CustomSentry' => CustomSentryFacade::class,
+        ];
+    }
+
+    public function testIsBound()
+    {
+        $this->assertTrue(app()->bound('custom-sentry'));
+        $this->assertInstanceOf(Hub::class, app('custom-sentry'));
+        $this->assertSame(app('custom-sentry'), CustomSentryFacade::getFacadeRoot());
+    }
+
+    /**
+     * @depends testIsBound
+     */
+    public function testEnvironment()
+    {
+        $this->assertEquals('testing', app('custom-sentry')->getClient()->getOptions()->getEnvironment());
+    }
+
+    /**
+     * @depends testIsBound
+     */
+    public function testDsnWasSetFromConfig()
+    {
+        /** @var \Sentry\Options $options */
+        $options = app('custom-sentry')->getClient()->getOptions();
+
+        $this->assertEquals('http://sentry.dev', $options->getDsn());
+        $this->assertEquals(123, $options->getProjectId());
+        $this->assertEquals('publickey', $options->getPublicKey());
+        $this->assertEquals('secretkey', $options->getSecretKey());
+    }
+
+    /**
+     * @depends testIsBound
+     */
+    public function testErrorTypesWasSetFromConfig()
+    {
+        $this->assertEquals(
+            E_ALL ^ E_DEPRECATED ^ E_USER_DEPRECATED,
+            app('custom-sentry')->getClient()->getOptions()->getErrorTypes()
+        );
+    }
+}
+
+class CustomSentryServiceProvider extends ServiceProvider
+{
+    public static $abstract = 'custom-sentry';
+}
+
+class CustomSentryFacade extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'custom-sentry';
+    }
+}