Merge pull request #12 from lextira/update-dependencies

Update dependencies
lextira · Dec 3, 2019 · 0a31a63 · 0a31a63
2 parents 1525fe8 + 6d1ec62
commit 0a31a63
Show file tree

Hide file tree

Showing 27 changed files with 1,418 additions and 825 deletions.
diff --git a/development.docker-compose.yml b/development.docker-compose.yml
@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
     volumes:
-      - ${SOURCE_DIR}/src:/var/www
+      - ${SOURCE_DIR}/web/src:/var/www
     environment:
       - WEB_DOCUMENT_ROOT=/var/www/public
       - WEB_DOCUMENT_INDEX=index.php

diff --git a/web/src/app/Console/Commands/FtpKeyGenerateCommand.php b/web/src/app/Console/Commands/FtpKeyGenerateCommand.php
@@ -5,6 +5,7 @@
 use App\Data\Models\Domain;
 use App\Data\Models\Key;
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 
 class FtpKeyGenerateCommand extends Command
 {
@@ -56,7 +57,7 @@ public function handle()
 
         $key = $this->key->create([
             'domain_id' => $domain->id,
-            'token' => str_random(64),
+            'token' => Str::random(64),
             'description' => $this->argument('description')
         ]);
 

diff --git a/web/src/composer.json b/web/src/composer.json
@@ -6,13 +6,12 @@
     "type": "project",
     "require": {
         "php": "^7.1.3",
-        "darkaonline/l5-swagger": "^5.7",
+        "darkaonline/l5-swagger": "^6.0",
         "fideloper/proxy": "^4.0",
-        "jdavidbakr/laravel-cache-garbage-collector": "^1.0",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "^6.0",
         "laravel/tinker": "^1.0",
-        "lucid-arch/laravel-console": "^5.6",
-        "lucid-arch/laravel-foundation": "^5.6",
+        "lucid-arch/laravel-console": "^6.0",
+        "lucid-arch/laravel-foundation": "^6.0",
         "nicolab/php-ftp-client": "^1.4",
         "prettus/l5-repository": "^2.6",
         "spatie/ssl-certificate": "^1.12"