Fix possible conflict with Laravel helpers.php file autoloading. Fix #330.

Author: yajra

CHANGELOG.md

@@ -8,6 +8,9 @@
 
 ##Change Log
 
+###v6.1.2
+    - Fix possible conflict with Laravel helpers.php file autoloading. Fix #330.
+
 ###v6.1.1
     - Fix ordering when using basic array response. Fix #322.
 

composer.json

@@ -26,9 +26,6 @@
         "phpunit/phpunit": "~4.0"
     },
     "autoload": {
-        "files": [
-          "src/fallback.php"
-        ],
         "psr-4": {
             "Yajra\\Datatables\\": "src/"
         }

src/DatatablesServiceProvider.php

@@ -65,6 +65,10 @@ private function registerCommands()
      */
     public function register()
     {
+        if ($this->isLumen()) {
+            require_once 'fallback.php';
+        }
+
         $this->registerRequiredProviders();
 
         $this->app->singleton('datatables', function ($app) {
@@ -74,6 +78,16 @@ public function register()
         $this->registerAliases();
     }
 
+    /**
+     * Check if app uses Lumen.
+     *
+     * @return bool
+     */
+    private function isLumen()
+    {
+        return str_contains($this->app->version(), 'Lumen');
+    }
+
     /**
      * Register 3rd party providers.
      */