Merge branch 'master' into fix-js-null-values

# Conflicts:
#	src/resources/views/crud/fields/repeatable.blade.php

Author: pxpm

README.md

@@ -30,6 +30,7 @@
     <a href="https://backpackforlaravel.com/newsletter">Newsletter</a>
 </p>
 
+
 Quickly build an admin interface for your Eloquent models. Then customize every little detail. Among its features:
 
 - List operation

package-lock.json

@@ -12,11 +12,11 @@
     "devDependencies": {
         "cross-env": "^7.0.3",
         "css-loader": "^5.2.6",
-        "laravel-mix": "^6.0.27",
+        "laravel-mix": "^6.0.29",
         "lodash": "^4.17.21",
         "pace": "0.0.4",
         "resolve-url-loader": "^4.0.0",
-        "sass": "^1.37.0",
+        "sass": "^1.38.2",
         "sass-loader": "^9.0.3",
         "vue-template-compiler": "^2.6.14"
     },
@@ -59,6 +59,6 @@
         "source-sans-pro": "^3.6",
         "summernote": "^0.8.18",
         "sweetalert": "^2.1.2",
-        "tinymce": "^5.8.2"
+        "tinymce": "^5.9.1"
     }
 }

package.json

@@ -21,6 +21,7 @@ class BackpackServiceProvider extends ServiceProvider
         \Backpack\CRUD\app\Console\Commands\CreateUser::class,
         \Backpack\CRUD\app\Console\Commands\PublishBackpackMiddleware::class,
         \Backpack\CRUD\app\Console\Commands\PublishView::class,
+        \Backpack\CRUD\app\Console\Commands\RequireDevTools::class,
     ];
 
     // Indicates if loading of the provider is deferred.
@@ -141,8 +142,7 @@ public function publishFiles()
     /**
      * Define the routes for the application.
      *
-     * @param \Illuminate\Routing\Router $router
-     *
+     * @param  \Illuminate\Routing\Router  $router
      * @return void
      */
     public function setupRoutes(Router $router)
@@ -161,8 +161,7 @@ public function setupRoutes(Router $router)
     /**
      * Load custom routes file.
      *
-     * @param \Illuminate\Routing\Router $router
-     *
+     * @param  \Illuminate\Routing\Router  $router
      * @return void
      */
     public function setupCustomRoutes(Router $router)

src/BackpackServiceProvider.php

@@ -82,10 +82,9 @@ private function sendUsageStats()
      * It spins up a separate process for this, and doesn't listen for a reponse,
      * so it has minimal to no impact on pageload.
      *
-     * @param string $method  HTTP Method to use for the request.
-     * @param string $url     URL to point the request at.
-     * @param array  $payload The data you want sent to the URL.
-     *
+     * @param  string  $method  HTTP Method to use for the request.
+     * @param  string  $url  URL to point the request at.
+     * @param  array  $payload  The data you want sent to the URL.
      * @return void
      */
     private function makeCurlRequest($method, $url, $payload)
@@ -107,10 +106,9 @@ private function makeCurlRequest($method, $url, $payload)
      * geographic location this is usually slower than CURL. However,
      * unlike CURL, it works on most machines, so it's reliable.
      *
-     * @param string $method  HTTP Method to use for the request.
-     * @param string $url     URL to point the request at.
-     * @param array  $payload The data you want sent to the URL.
-     *
+     * @param  string  $method  HTTP Method to use for the request.
+     * @param  string  $url  URL to point the request at.
+     * @param  array  $payload  The data you want sent to the URL.
      * @return void
      */
     private function makeGuzzleRequest($method, $url, $payload)

src/Stats.php

@@ -99,9 +99,9 @@ private function customRoutesFileEndLine($file_lines)
     /**
      * Parse the given file stream and return the line number where a string is found.
      *
-     * @param  string $needle   The string that's being searched for.
-     * @param  array $haystack  The file where the search is being performed.
-     * @return bool|int         The last line number where the string was found. Or false.
+     * @param  string  $needle  The string that's being searched for.
+     * @param  array  $haystack  The file where the search is being performed.
+     * @return bool|int The last line number where the string was found. Or false.
      */
     private function getLastLineNumberThatContains($needle, $haystack)
     {

src/app/Console/Commands/AddCustomRouteContent.php

@@ -65,9 +65,9 @@ public function handle()
     /**
      * Parse the given file stream and return the line number where a string is found.
      *
-     * @param  string $needle   The string that's being searched for.
-     * @param  array $haystack  The file where the search is being performed.
-     * @return bool|int         The last line number where the string was found. Or false.
+     * @param  string  $needle  The string that's being searched for.
+     * @param  array  $haystack  The file where the search is being performed.
+     * @return bool|int The last line number where the string was found. Or false.
      */
     private function getLastLineNumberThatContains($needle, $haystack)
     {

src/app/Console/Commands/AddSidebarContent.php

@@ -57,5 +57,14 @@ public function handle()
 
         $this->progressBar->finish();
         $this->info(' Backpack installation finished.');
+
+        // DevTools
+        $this->box('Did you know about Backpack DevTools?');
+        $this->note('DevTools adds a dead-simple web interface to easily generate Models, Migrations, Seeders, Factories, CRUDs, etc.');
+        $this->note('But it\'s a paid tool. For more info, payment and access, please visit https://backpackforlaravel.com/products/devtools');
+
+        if ($this->confirm('Would you like to install Backpack DevTools?', false)) {
+            $this->call('backpack:require:devtools');
+        }
     }
 }

src/app/Console/Commands/Install.php

@@ -55,8 +55,7 @@ public function handle()
     /**
      * Build the class. Replace Backpack namespace with App one.
      *
-     * @param string $name
-     *
+     * @param  string  $name
      * @return string
      */
     protected function buildClass($name = false)
@@ -70,9 +69,8 @@ protected function buildClass($name = false)
      * Replace the namespace for the given stub.
      * Replace the User model, if it was moved to App\Models\User.
      *
-     * @param string $stub
-     * @param string $name
-     *
+     * @param  string  $stub
+     * @param  string  $name
      * @return $this
      */
     protected function makeReplacements(&$stub)

src/app/Console/Commands/PublishBackpackMiddleware.php

@@ -67,8 +67,7 @@ public function handle()
     /**
      * Take a blade file from the vendor folder and publish it to the resources folder.
      *
-     * @param string $file The filename without extension
-     *
+     * @param  string  $file  The filename without extension
      * @return void
      */
     protected function publishFile($file)