Skip to content

Update to Laravel 6 & 7, + PHP 7.4 compatible #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+7 −9
Open

Update to Laravel 6 & 7, + PHP 7.4 compatible #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
efc49fc
Update to be Laravel 6 compatible.
lauhakari Sep 5, 2019
3ff9d21
Update .travis.yml
lauhakari Mar 9, 2020
c97915a
Update FindCommand.php
lauhakari Mar 9, 2020
10eb505
Update README.md
lauhakari Mar 9, 2020
d85203c
Update README.md
lauhakari Mar 9, 2020
7591e5d
Update with Laravel 7 support.
lauhakari Jun 4, 2020
952bfd5
Reverted custom README changes.
lauhakari Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.4

sudo: true

Expand Down
7 changes: 3 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "themsaid/laravel-langman",
"name": "Themsaid/laravel-langman",
"description": "Manage language files with ease.",
"keywords": ["laravel", "localization", "multilingual"],
"homepage": "https://github.com/themsaid/laravel-langman",
Expand All @@ -13,9 +13,8 @@
],
"require": {
"php": "^5.5.9 || ^7.0",
"illuminate/support": "~5.1",
"illuminate/console": "~5.1",
"illuminate/filesystem": "~5.1"
"illuminate/support": "~5.1 | ^6.0 | ^7.0",
"illuminate/console": "~5.1 | ^6.0 | ^7.0"
},
"require-dev": {
"phpunit/phpunit" : "^4.8 || ^5.0",
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/FindCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ private function tableRows()

foreach ($allLanguages as $languageKey) {
$original[$languageKey] =
isset($values[$languageKey])
(isset($values[$languageKey])
? $values[$languageKey]
: isset($filesContent[$fileName][$languageKey][$key]) ? $filesContent[$fileName][$languageKey][$key] : '';
: isset($filesContent[$fileName][$languageKey][$key])) ? $filesContent[$fileName][$languageKey][$key] : '';
}

// Sort the language values based on language name
Expand Down