Merge pull request #327 from djoudi/master

barryvdh · web-flow · commit 9bcb141d410f · 2019-09-05T20:11:18.000+02:00
add laravel 6.0 support
diff --git a/composer.json b/composer.json
@@ -15,10 +15,10 @@
   ],
   "require": {
     "php": ">=7",
-    "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x",
-    "illuminate/translation": "5.5.x|5.6.x|5.7.x|5.8.x",
-    "symfony/finder": "~3.0|~4.0",
-    "tanmuhittin/laravel-google-translate": "^0.11.0"
+    "illuminate/support": "^5.5|^6",
+    "illuminate/translation": "^5.5|^6",
+    "symfony/finder": "^3|^4",
+    "tanmuhittin/laravel-google-translate": "^1.0.1"
   },
   "autoload": {
     "psr-4": {
diff --git a/database/migrations/2014_04_02_193005_create_translations_table.php b/database/migrations/2014_04_02_193005_create_translations_table.php
@@ -15,7 +15,7 @@ public function up()
         Schema::create('ltm_translations', function(Blueprint $table)
         {
 	    $table->collation = 'utf8mb4_bin';
-            $table->increments('id');
+            $table->bigIncrements('id');
             $table->integer('status')->default(0);
             $table->string('locale');
             $table->string('group');

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function up()`
`15`	`15`	`Schema::create('ltm_translations', function(Blueprint $table)`
`16`	`16`	`{`
`17`	`17`	`$table->collation = 'utf8mb4_bin';`
`18`		`- $table->increments('id');`
	`18`	`+ $table->bigIncrements('id');`
`19`	`19`	`$table->integer('status')->default(0);`
`20`	`20`	`$table->string('locale');`
`21`	`21`	`$table->string('group');`