Fixed case and optimized the Service binding and Facade resolution

Author: slakbal

composer.json

@@ -7,7 +7,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Slakbal\\Citrix\\": "src/"
+      "Citrix\\": "src/"
     },
     "files": [
     ]

src/CitrixServiceProvider.php

@@ -12,36 +12,31 @@ class CitrixServiceProvider extends ServiceProvider
      *
      * @var bool
      */
-    protected $defer = false;
+    protected $defer = true;
 
 
     public function register()
     {
         //runtime merge config
         $this->mergeConfigFrom(__DIR__ . '/../config/citrix.php', 'citrix');
         $this->registerGotoWebinar(config('citrix.auth_type'));
-        $this->registerGotoMeeting(config('citrix.auth_type'));
-
+        //$this->registerGotoMeeting(config('citrix.auth_type'));
     }
 
 
-    public function registerGotoWebinar($authType)
+    public function registerGotoWebinar($authType = 'direct')
     {
-        $this->app->singleton('g2webinar', function ($app) use ($authType) {
+        $this->app->singleton(Webinar::class, function ($app) use ($authType) {
             return new Webinar($authType);
         });
-
-        $this->app->alias('g2webinar', Webinar::class);
     }
 
 
-    public function registerGotoMeeting($authType)
+    public function registerGotoMeeting($authType = 'direct')
     {
-        $this->app->singleton('g2meeting', function ($app) use ($authType) {
+        $this->app->singleton(Meeting::class, function ($app) use ($authType) {
             return new Meeting($authType);
         });
-
-        $this->app->alias('g2meeting', Meeting::class);
     }
 
 
@@ -61,8 +56,8 @@ public function boot()
     public function provides()
     {
         return [
-            'g2webinar',
-            'g2meeting',
+            Webinar::class,
+            //Meeting::class,
         ];
     }
 }

src/Meeting.php

@@ -7,9 +7,9 @@
 class Meeting extends CitrixAbstract implements MeetingInterface
 {
 
-    public function __construct($authType)
+    public function __construct($authType = 'direct')
     {
-        parent::__construct($authType);
+        parent::__construct($authType = 'direct');
     }
 
 }

src/Webinar.php

@@ -9,9 +9,9 @@
 class Webinar extends CitrixAbstract implements WebinarInterface
 {
 
-    public function __construct($authType)
+    public function __construct($authType = 'direct')
     {
-        parent::__construct($authType);
+        parent::__construct($authType = 'direct');
     }
 
 

src/facade/GotoMeeting.php

@@ -2,13 +2,14 @@
 
 namespace Slakbal\Citrix\Facade;
 
+use Slakbal\Citrix\Meeting;
 use Illuminate\Support\Facades\Facade;
 
 class GotoMeeting extends Facade
 {
 
     protected static function getFacadeAccessor()
     {
-        return 'g2meeting';
+        return Meeting::class;
     }
 }

src/facade/GotoWebinar.php

@@ -2,13 +2,14 @@
 
 namespace Slakbal\Citrix\Facade;
 
+use Slakbal\Citrix\Webinar;
 use Illuminate\Support\Facades\Facade;
 
 class GotoWebinar extends Facade
 {
 
     protected static function getFacadeAccessor()
     {
-        return 'g2webinar';
+        return Webinar::class;
     }
 }

vendor/autoload.php

@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInit91582d37898a564f45818ec00c84e663::getLoader();