Structure update

nelkasovic · Mar 29, 2020 · e9d0779 · e9d0779
1 parent 0bd0962
commit e9d0779
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "LaravelFullCalendar\\ServiceProvider"
+                "LaravelFullCalendar\\FullCalendarServiceProvider"
             ],
             "aliases": {
                 "Calendar": "LaravelFullCalendar\\Facades\\Calendar"

diff --git a/src/Qlick/LaravelFullcalendar/Calendar.php → src/Calendar.php b/src/Qlick/LaravelFullcalendar/Calendar.php → src/Calendar.php
@@ -5,6 +5,7 @@
 use ArrayAccess;
 use DateTime;
 use Illuminate\View\Factory;
+use Illuminate\Support\Str;
 
 class Calendar
 {
@@ -128,7 +129,7 @@ public function getId()
             return $this->id;
         }
 
-        $this->id = str_random(8);
+        $this->id = Str::random(8)
 
         return $this->id;
     }
@@ -268,6 +269,7 @@ protected function replaceCallbackPlaceholders($json, $placeholders)
             $replace[] = $this->getCallbacks()[$name];
         }
 
-        return str_replace($search, $replace, $json);
+        //return str_replace($search, $replace, $json);
+        return Str::replaceArray($search, $replace, $json);
     }
 }
diff --git a/src/Qlick/LaravelFullcalendar/Event.php → src/Event.php b/src/Qlick/LaravelFullcalendar/Event.php → src/Event.php
diff --git a/...k/LaravelFullcalendar/EventCollection.php → src/EventCollection.php b/...k/LaravelFullcalendar/EventCollection.php → src/EventCollection.php
diff --git a/.../LaravelFullcalendar/Facades/Calendar.php → src/Facades/Calendar.php b/.../LaravelFullcalendar/Facades/Calendar.php → src/Facades/Calendar.php
diff --git a/...k/LaravelFullcalendar/ServiceProvider.php → src/FullCalendarServiceProvider.php b/...k/LaravelFullcalendar/ServiceProvider.php → src/FullCalendarServiceProvider.php
@@ -2,9 +2,9 @@
 
 namespace LaravelFullCalendar;
 
-use Illuminate\Support\ServiceProvider as BaseServiceProvider;
+use Illuminate\Support\ServiceProvider;
 
-class ServiceProvider extends BaseServiceProvider
+class FullCalendarServiceProvider extends ServiceProvider
 {
 
     /**
@@ -14,9 +14,16 @@ class ServiceProvider extends BaseServiceProvider
      */
     public function register()
     {
-        $this->app->bind('laravel-full-calendar', function ($app) {
+        /*$this->app->bind('laravel-full-calendar', function ($app) {
             return $app->make('LaravelFullCalendar\Calendar');
+        });*/
+
+        $this->app->singleton('laravel-full-calendar', function ($app) {
+            return new Calendar($app['request']->server());
         });
+
+        $this->app->alias('laravel-full-calendar', Calendar::class);
+
     }
 
     public function boot()
@@ -31,6 +38,7 @@ public function boot()
      */
     public function provides()
     {
-        return ['laravel-full-calendar'];
+        //return ['laravel-full-calendar'];
+        return ['laravel-full-calendar', Calendar::class];
     }
 }
diff --git a/...LaravelFullcalendar/IdentifiableEvent.php → src/IdentifiableEvent.php b/...LaravelFullcalendar/IdentifiableEvent.php → src/IdentifiableEvent.php
diff --git a/...Qlick/LaravelFullcalendar/SimpleEvent.php → src/SimpleEvent.php b/...Qlick/LaravelFullcalendar/SimpleEvent.php → src/SimpleEvent.php