Merge pull request #87 from rmariuzzo/feature/laravel-5-4-support

Add test for Laravel 5.4 + minor updates.

Author: rmariuzzo

README.md

@@ -2,6 +2,7 @@
 
 > 🌐 Laravel Localization in JavaScript.
 
+![Laravel 5.4](https://img.shields.io/badge/Laravel-5.4-f4645f.svg)
 ![Laravel 5.3](https://img.shields.io/badge/Laravel-5.3-f4645f.svg)
 ![Laravel 5.2](https://img.shields.io/badge/Laravel-5.2-f4645f.svg)
 ![Laravel 5.1](https://img.shields.io/badge/Laravel-5.1-f4645f.svg)
@@ -16,10 +17,10 @@ This package convert all your localization messages from your Laravel app to Jav
 
 ### Features
 
- - Support Laravel 4.2.x, Laravel 5.0.x, Laravel 5.1.x, Laravel 5.2.x and Laravel 5.3.x.
- - Includes [Lang.js](https://github.com/rmariuzzo/lang.js) (a thin library highly inspired on Laravel's [`Translator`](https://laravel.com/api/5.3/Illuminate/Translation/Translator.html) class).
+ - Support Laravel 4.2, 5.0, 5.1, 5.2, 5.3 and 5.4.
+ - Includes [Lang.js](https://github.com/rmariuzzo/lang.js) (a thin library highly inspired on Laravel's [`Translator`](https://laravel.com/api/5.4/Illuminate/Translation/Translator.html) class).
  - Allow to specify desired lang files to be converted to JS.
- - Lang.js API is based on Laravel's [`Translator`](https://laravel.com/api/5.3/Illuminate/Translation/Translator.html) class. No need to learn a whole API.
+ - Lang.js API is based on Laravel's [`Translator`](https://laravel.com/api/5.4/Illuminate/Translation/Translator.html) class. No need to learn a whole API.
 
 ## Installation
 
@@ -35,7 +36,7 @@ Mariuzzo\LaravelJsLocalization\LaravelJsLocalizationServiceProvider::class
 
 ## Usage
 
-The `Laravel-JS-Localization` package provides a command that generate the JavaScript version of all your messages found at: `app/lang` (Laravel 4) or `resources/lang` (Laravel 5) directory. The resulting JavaScript file will contains all your messages plus [Lang.js](https://github.com/rmariuzzo/lang.js) (a thin library highly inspired on Laravel's [`Translator`](https://laravel.com/api/5.3/Illuminate/Translation/Translator.html) class).
+The `Laravel-JS-Localization` package provides a command that generate the JavaScript version of all your messages found at: `app/lang` (Laravel 4) or `resources/lang` (Laravel 5) directory. The resulting JavaScript file will contains all your messages plus [Lang.js](https://github.com/rmariuzzo/lang.js) (a thin library highly inspired on Laravel's [`Translator`](https://laravel.com/api/5.4/Illuminate/Translation/Translator.html) class).
 
 ### Generating JS messages
 

composer.json

@@ -59,14 +59,16 @@
             "composer install --prefer-dist --no-interaction --working-dir tests/5.0",
             "composer install --prefer-dist --no-interaction --working-dir tests/5.1",
             "composer install --prefer-dist --no-interaction --working-dir tests/5.2",
-            "if [[ `php -v` =~ \"PHP 5.6\" ]]; then composer install --prefer-dist --no-interaction --working-dir tests/5.3; fi"
+            "./tests/5.3/install",
+            "./tests/5.4/install"
         ],
         "test": [
             "./vendor/bin/phpunit --configuration tests/4.2",
             "./vendor/bin/phpunit --configuration tests/5.0",
             "./vendor/bin/phpunit --configuration tests/5.1",
             "./vendor/bin/phpunit --configuration tests/5.2",
-            "if [[ `php -v` =~ \"PHP 5.6\" ]]; then ./vendor/bin/phpunit --configuration tests/5.3; fi"
+            "./tests/5.3/run",
+            "./tests/5.4/run"
         ]
     }
 }

tests/5.3/install

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Get current script directory.
+CWD=`dirname $0`
+
+# Get PHP version.
+PHP_VERSION=`php -v`
+
+# Install dependencies if PHP version is 5.6, 7.0 or HHVM.
+if [[ $PHP_VERSION =~ "PHP 5.6" || $PHP_VERSION =~ "PHP 7.0" || $PHP_VERSION =~ "HHVM" ]] ; then
+    echo "Current working directory is: $CWD"
+    echo "PHP version is: $PHP_VERSION"
+    composer install --prefer-dist --no-interaction --working-dir "$CWD"
+else
+    echo "No installing dependencies for PHP version: $PHP_VERSION"
+fi

tests/5.3/run

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Get current script directory.
+CWD=`dirname $0`
+
+# Get PHP version.
+PHP_VERSION=`php -v`
+
+# Run if PHP version is 5.6, 7.0 or HHVM.
+if [[ $PHP_VERSION =~ "PHP 5.6" || $PHP_VERSION =~ "PHP 7.0" || $PHP_VERSION =~ "HHVM" ]] ; then
+    echo "Current working directory is: $CWD"
+    echo "PHP version is: $PHP_VERSION"
+    "$CWD"/../../vendor/bin/phpunit --configuration "$CWD"
+else
+    echo "No running tests for PHP version: $PHP_VERSION"
+fi

tests/5.4/composer.json

@@ -0,0 +1,18 @@
+{
+    "autoload": {
+        "psr-4": {
+            "Mariuzzo\\LaravelJsLocalization\\": "../../src/Mariuzzo/LaravelJsLocalization/"
+        }
+    },
+    "require": {
+        "php": ">=5.5.9",
+        "illuminate/console": "5.4.*",
+        "illuminate/filesystem": "5.4.*",
+        "tedivm/jshrink": "1.0.*"
+    },
+    "require-dev": {
+        "orchestra/testbench": "3.4.*",
+        "phpunit/phpunit": "~5.7"
+    },
+    "minimum-stability": "dev"
+}

tests/5.4/install

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Get current script directory.
+CWD=`dirname $0`
+
+# Get PHP version.
+PHP_VERSION=`php -v`
+
+# Install dependencies if PHP version is 5.6, 7.0 or HHVM.
+if [[ $PHP_VERSION =~ "PHP 5.6" || $PHP_VERSION =~ "PHP 7.0" || $PHP_VERSION =~ "HHVM" ]] ; then
+    echo "Current working directory is: $CWD"
+    echo "PHP version is: $PHP_VERSION"
+    composer install --prefer-dist --no-interaction --working-dir "$CWD"
+else
+    echo "No installing dependencies for PHP version: $PHP_VERSION"
+fi

tests/5.4/phpunit.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    syntaxCheck="false">
+    <testsuites>
+        <testsuite name="Package">
+            <directory suffix="Test.php">../specs/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

tests/5.4/run

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Get current script directory.
+CWD=`dirname $0`
+echo "Current working directory is: $CWD"
+
+# Get PHP version.
+PHP_VERSION=`php -v`
+echo "PHP version is: $PHP_VERSION"
+
+# Run if PHP version is 5.6, 7.0 or HHVM.
+if [[ $PHP_VERSION =~ "PHP 5.6" || $PHP_VERSION =~ "PHP 7.0" || $PHP_VERSION =~ "HHVM" ]] ; then
+    "$CWD"/vendor/bin/phpunit --configuration "$CWD"
+else
+    echo "No running tests for PHP version: $PHP_VERSION"
+fi