isLumen() fixes

corcel · Feb 20, 2018 · 7f058a8 · 7f058a8
1 parent e183ebb
commit 7f058a8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/Concerns/Shortcodes.php b/src/Concerns/Shortcodes.php
@@ -71,7 +71,7 @@ private function parseClassShortcodes(ShortcodeFacade $facade)
      */
     private function parseConfigShortcodes(ShortcodeFacade $facade)
     {
-        if (Corcel::isLaravel()) {
+        if (Corcel::isLaravel() || Corcel::isLumen()) {
             $shortcodes = config('corcel.shortcodes', []);
             foreach ($shortcodes as $tag => $class) {
                 $facade->addHandler($tag, [new $class, 'render']);

diff --git a/src/Corcel.php b/src/Corcel.php
@@ -26,6 +26,7 @@ public static function isLaravel()
      */
     public static function isLumen()
     {
-        return preg_match('/Lumen', app()->version()) === 1;
+        return function_exists('app') &&
+            preg_match('/^Lumen/', app()->version()) === 1;
     }
 }
diff --git a/src/Laravel/CorcelServiceProvider.php b/src/Laravel/CorcelServiceProvider.php
@@ -30,7 +30,7 @@ public function boot()
         $this->registerAuthProvider();
         $this->registerMorphMaps();
     }
-    
+
     /**
      * @return void
      */
@@ -46,7 +46,7 @@ private function publishConfigFile()
      */
     private function registerAuthProvider()
     {
-        if (Corcel::isLaravel()) {
+        if (Corcel::isLaravel() || Corcel::isLumen()) {
             Auth::provider('corcel', function ($app, array $config) {
                 return new AuthUserProvider($config);
             });

diff --git a/src/Model.php b/src/Model.php
@@ -175,7 +175,7 @@ protected function setRelationConnection($model)
      */
     public function getConnectionName()
     {
-        if (!isset($this->connection) && Corcel::isLaravel()) {
+        if (!isset($this->connection) && (Corcel::isLaravel() || Corcel::isLumen())) {
             if ($connection = config('corcel.connection')) {
                 $this->connection = $connection;
             }

diff --git a/src/Model/Post.php b/src/Model/Post.php
@@ -143,7 +143,7 @@ protected function getPostInstance(array $attributes)
         if (isset($attributes['post_type']) && $attributes['post_type']) {
             if (isset(static::$postTypes[$attributes['post_type']])) {
                 $class = static::$postTypes[$attributes['post_type']];
-            } elseif (Corcel::isLaravel()) {
+            } elseif (Corcel::isLaravel() || Corcel::isLumen()) {
                 $postTypes = config('corcel.post_types');
                 if (is_array($postTypes) && isset($postTypes[$attributes['post_type']])) {
                     $class = $postTypes[$attributes['post_type']];