search

andywer / laravel-js-localization

Simple, ease-to-use and flexible package for the Laravel web framework. Allows you to use localized messages of the Laravel webapp (see `resources/lang` directory) in your Javascript code.
MIT License
143 stars 51 forks source link

Upgrade to laravel 6.* #67

Closed Matthijsvdorp closed 5 years ago

Matthijsvdorp commented 5 years ago

This PR adds Laravel 6.0 compatibility.

andywer commented 5 years ago

Thanks, @Matthijsvdorp! Can you please check the composer errors in CI?

Matthijsvdorp commented 5 years ago

Hi @andywer, I don't really understand the error messages I'm getting. Never user Mockery before. Everything passes using PHPUnit 7.5 but when using PHPUnit 8.0 some tests fail. I don't think I'll be able to fix this.

krychu90 commented 5 years ago

Hi, I did some research (I never used mockery) and I think you need change all shouldReceive('getFromJson') to shouldReceive('get') in tests/TestCase.php file becouse of: https://laravel.com/docs/6.x/upgrade#get-from-json

I hope this helps to release this update, I am waiting for it 😉

Matthijsvdorp commented 5 years ago

Thank you @krychu90, that did the trick!

Matthijsvdorp commented 5 years ago

@andywer Hi Andy, can you merge this? Thank you!

andywer commented 5 years ago

Ohh, of course! Have fun 👍

krychu90 commented 5 years ago

Shouldn't it be in branch 6.0 or tagged by 6.0?

andywer commented 5 years ago

Yes, but I am only on my iPhone right now...

andywer commented 5 years ago

Shouldn't it be in branch 6.0 or tagged by 6.0?

Done 😉

krychu90 commented 5 years ago

Thanks, but this commit is still in 5.8 branch and will not work with laravel 5.8 (composer requires laravel 6)