From efc49fca4042a6f997c776059c2c19a8a772be2b Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Thu, 5 Sep 2019 14:44:56 +0200 Subject: [PATCH 1/7] Update to be Laravel 6 compatible. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 580cfe6..fe1349c 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,9 @@ ], "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", + "illuminate/console": "~5.1 | ^6.0", + "illuminate/filesystem": "~5.1 | ^6.0" }, "require-dev": { "phpunit/phpunit" : "^4.8 || ^5.0", From 3ff9d21efc74248b36b110e8662bb7d65c069940 Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Mon, 9 Mar 2020 14:31:16 +0100 Subject: [PATCH 2/7] Update .travis.yml Updated php-versions. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5142c0..e66183d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: php php: - - 5.6 - - 7.0 - - 7.1 + - 7.2 + - 7.4 sudo: true From c97915a592de999d3a99272802f73f1c4685c009 Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Mon, 9 Mar 2020 22:38:41 +0100 Subject: [PATCH 3/7] Update FindCommand.php Fixed PHP 7.4 compatibility, for: ErrorException: Unparenthesized `a ? b : c ? d : e` is deprecated --- src/Commands/FindCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/FindCommand.php b/src/Commands/FindCommand.php index 73cad05..905ffdb 100644 --- a/src/Commands/FindCommand.php +++ b/src/Commands/FindCommand.php @@ -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 From 10eb505921853dfd61f4fe3abc199d80324a9737 Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Mon, 9 Mar 2020 22:46:18 +0100 Subject: [PATCH 4/7] Update README.md Added Travis CI badge. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 48e781f..4f75aa5 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ translation lines with ease. Taking care of a multilingual interface is not a he Laravel Langman
-Build Status -StyleCI +[![Build Status](https://travis-ci.org/lauhakari/laravel-langman.svg?branch=master)](https://travis-ci.org/lauhakari/laravel-langman) + License

From d85203c965cb53fb76cbea566d54269f87652c1f Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Mon, 9 Mar 2020 22:49:14 +0100 Subject: [PATCH 5/7] Update README.md Added Travis CI badge. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4f75aa5..fe1f297 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ translation lines with ease. Taking care of a multilingual interface is not a he

-Laravel Langman +
-[![Build Status](https://travis-ci.org/lauhakari/laravel-langman.svg?branch=master)](https://travis-ci.org/lauhakari/laravel-langman) +Build Status From 7591e5d4b3a5bc9c2e5c732425a52513534d5a00 Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Thu, 4 Jun 2020 17:12:13 +0200 Subject: [PATCH 6/7] Update with Laravel 7 support. --- composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index fe1349c..3f32d1b 100644 --- a/composer.json +++ b/composer.json @@ -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", @@ -13,9 +13,8 @@ ], "require": { "php": "^5.5.9 || ^7.0", - "illuminate/support": "~5.1 | ^6.0", - "illuminate/console": "~5.1 | ^6.0", - "illuminate/filesystem": "~5.1 | ^6.0" + "illuminate/support": "~5.1 | ^6.0 | ^7.0", + "illuminate/console": "~5.1 | ^6.0 | ^7.0" }, "require-dev": { "phpunit/phpunit" : "^4.8 || ^5.0", From 952bfd5bba28aa3d6f91865daf61cde8ce70b38b Mon Sep 17 00:00:00 2001 From: Mikko Lauhakari Date: Thu, 4 Jun 2020 17:14:57 +0200 Subject: [PATCH 7/7] Reverted custom README changes. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fe1f297..48e781f 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ translation lines with ease. Taking care of a multilingual interface is not a he

- +Laravel Langman
-Build Status - +Total Downloads License