Merge pull request #1 from papppeter/make_it_laravel_8_compatible

Make it laravel ^8 compatible

Author: papppeter

composer.json

@@ -1,15 +1,23 @@
 {
   "name": "papppeter/yii2-laravel",
-  "license": "MTI",
+  "license": "MIT",
+  "type": "yii2-extension",
+  "authors": [
+    {
+      "name": "Papp Péter",
+      "email": "[email protected]"
+    }
+  ],
   "repositories": [
 
   ],
   "require": {
-    "php": ">=7.0"
+    "php": ">=7.4",
+    "illuminate/support": "^8.83.11"
   },
   "autoload": {
     "psr-4": {
-      "papppeter\\yii2Laravel\\": ""
+      "papppeter\\yii2Laravel\\": "src/"
     }
   }
 }

Illuminate/Events/Dispatcher.php renamed to src/Illuminate/Events/Dispatcher.php

@@ -19,7 +19,7 @@ class Dispatcher extends Event {
     public function listen($events, $listener)
     {
         foreach ((array) $events as $event) {
-            app()->on($event, $listener);
+            \Yii::$app->on($event, $listener);
         }
     }
 
@@ -31,7 +31,7 @@ public function listen($events, $listener)
      */
     public function hasListeners($eventName)
     {
-        return app()->hasEventHandlers($eventName);
+        return \Yii::$app->hasEventHandlers($eventName);
     }
 
     /**
@@ -68,7 +68,7 @@ public function until($event, $payload = [])
     public function dispatch($event, $payload = [], $halt = false)
     {
         if($event instanceof Event) {
-            return app()->trigger($event->name, $event);
+            return \Yii::$app->trigger($event->name, $event);
         }
 
         list($event, $payload) = $this->parseEventAndPayload(
@@ -81,7 +81,7 @@ public function dispatch($event, $payload = [], $halt = false)
         $event->sender = $payload[1];
         $event->handled = $halt;
 
-        return app()->trigger($name, $event);
+        return \Yii::$app->trigger($name, $event);
     }
 
     /**
@@ -115,7 +115,7 @@ public function flush($event)
      */
     public function forget($event)
     {
-        app()->off($event);
+        \Yii::$app->off($event);
     }
 
     /**

Illuminate/Session/Store.php renamed to src/Illuminate/Session/Store.php

@@ -3,6 +3,7 @@
 
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Support\Arr;
+use yii\base\NotSupportedException;
 
 /**
  *
@@ -166,7 +167,6 @@ public function getHandler()
     public function handlerNeedsRequest()
     {
         return false;
-//        return $this->handler instanceof CookieSessionHandler;
     }
 
     /**
@@ -181,4 +181,29 @@ public function setRequestOnHandler($request)
             $this->handler->setRequest($request);
         }
     }
+
+    public function pull($key, $default = null)
+    {
+        $value = $this->get($key, $default);
+        $this->offsetUnset($key);
+        return $value;
+    }
+
+    public function regenerateToken()
+    {
+        throw new NotSupportedException("pull is not supported.");
+    }
+
+    public function invalidate()
+    {
+        $success = $this->getIsActive();
+        $this->destroy();
+        return $success;
+    }
+
+    public function regenerate($destroy = false)
+    {
+        $this->regenerateID($destroy);
+        return $this->getId();
+    }
 }