Skip to content

Commit

Permalink
Merge pull request #49 from elegidoneo/master
Browse files Browse the repository at this point in the history
Compatibilidad de laravel 6.0
  • Loading branch information
IsraelOrtuno authored Sep 4, 2019
2 parents 7955a4a + ac46d5d commit 480b6af
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/vendor
/build
composer.lock
.idea/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Paquete de traducciones en español para Laravel 5. Este paquete te agrega a tu

## Versiones

Para Laravel 5.8 utilizar la versión 1.2+, incluye la validación de contraseña hasta 8 caracteres. Para el resto de versiones utilizar 1.1+.
Para Laravel >=5.8 utilizar la versión 1.2+, incluye la validación de contraseña hasta 8 caracteres. Para el resto de versiones utilizar 1.1+.

Archivos por defecto incluidos en Laravel:

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"license": "MIT",
"require": {
"php": ">=5.6",
"illuminate/support": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0",
"illuminate/console": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0"
"illuminate/support": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0|~6.0.0",
"illuminate/console": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0|~6.0.0"
},
"require-dev": {
"orchestra/testbench": "^3.4",
Expand Down
5 changes: 2 additions & 3 deletions tests/lang/EsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@

class EsTest extends TestCase
{
public function setUp()
public function setUp(): void
{
parent::setUp();

parent::setUp(); // TODO: Change the autogenerated stub
$this->app['config']->set('app.locale', 'es');

Artisan::call('laraveles:install-lang');
Expand Down

0 comments on commit 480b6af

Please sign in to comment.