Merge pull request #35 from luukschakenraad/laravel60

barryvdh · web-flow · commit 08c9d5c95ade · 2019-09-06T17:48:50.000+02:00
Add support for Laravel 6.0
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=7",
-        "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x",
+        "illuminate/support": "^5.5|^6",
         "symfony/form": "^3.4|^4",
         "symfony/validator": "^3|^4",
         "symfony/twig-bridge": "^3|^4",
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -60,7 +60,7 @@ public function boot()
             if (empty($id)) {
                 return '';
             }
-            return app('translator')->trans($id, $replace, $locale);
+            return app('translator')->get($id, $replace, $locale);
         }));
         
         // csrf_token needs to be replaced for Laravel

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function boot()`
`60`	`60`	`if (empty($id)) {`
`61`	`61`	`return '';`
`62`	`62`	`}`
`63`		`- return app('translator')->trans($id, $replace, $locale);`
	`63`	`+ return app('translator')->get($id, $replace, $locale);`
`64`	`64`	`}));`
`65`	`65`
`66`	`66`	`// csrf_token needs to be replaced for Laravel`