fix tests and update readme

themsaid · Feb 18, 2016 · fcebd1e · fcebd1e
1 parent c975a70
commit fcebd1e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ That's all, you are now good to go.
 
 # Usage
 
-First you need to make sure that the translatable attributes has a mysql field type of TEXT, if you are building the database from a migration file you may do this:
+First you need to make sure that the translatable attributes has a mysql field type of text or json, if you are building the database from a migration file you may do this:
 
 ```php
 <?php
@@ -55,11 +55,13 @@ class Country extends Model
 
     protected $table = 'countries';
     public $translatable = ['name'];
+    public $casts = ['name' => 'array'];
 }
 ```
 
 - Add the `Translatable` trait to your model class
 - Add a public class property `$translatable` as an array that holds the names of the translatable fields in your model.
+- Remember to cast the translatable attribute as 'array' in the `$casts` property of the model.
 
 Now our model has the `name` attribute translatable, so on creating a new Model you may specify the name field as follow:
 

diff --git a/src/MultilingualServiceProvider.php b/src/MultilingualServiceProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Themsaid\Multilingual;
 
 use Illuminate\Support\ServiceProvider;
@@ -17,22 +18,24 @@ public function boot()
         $systemLocales = config('multilingual.locales');
 
         $this->publishes([
-            __DIR__ . '/config/multilingual.php' => config_path('multilingual.php'),
+            __DIR__.'/config/multilingual.php' => config_path('multilingual.php'),
         ]);
 
 
         $this->app['validator']->extendImplicit('translatable_required', function ($attribute, $value, $parameters) use ($systemLocales) {
-            if ( ! is_array($value)) return false;
+            if (! is_array($value)) {
+                return false;
+            }
 
-            // Get only the locales that has a value and exists in
-            // the system locales array
+            // Get only the locales that has a value and exists in the system locales array
             $locales = array_filter(array_keys($value), function ($locale) use ($value, $systemLocales) {
                 return @$value[$locale] && in_array($locale, $systemLocales);
             });
 
             foreach ($systemLocales as $systemLocale) {
-                if ( ! in_array($systemLocale, $locales))
+                if (! in_array($systemLocale, $locales)) {
                     return false;
+                }
             }
 
             return true;
@@ -47,7 +50,7 @@ public function boot()
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__ . '/config/multilingual.php', 'multilingual'
+            __DIR__.'/config/multilingual.php', 'multilingual'
         );
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -36,7 +36,7 @@ public function test_database_setup()
      */
     protected function getEnvironmentSetUp($app)
     {
-        $app['config']->set('multilingual.localed', ['en', 'sp']);
+        $app['config']->set('multilingual.locales', ['en', 'sp']);
         $app['config']->set('multilingual.fallback_locale', 'en');
 
         $app['config']->set('database.default', 'mysql');

diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -7,8 +7,6 @@ class ValidationTest extends TestCase
 {
     public function test_validation_fails_if_required_but_not_provided()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => ''],
             ['name' => 'translatable_required']
@@ -19,8 +17,6 @@ public function test_validation_fails_if_required_but_not_provided()
 
     public function test_validation_fails_if_required_but_empty_array()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => []],
             ['name' => 'translatable_required']
@@ -31,8 +27,6 @@ public function test_validation_fails_if_required_but_empty_array()
 
     public function test_validation_fails_if_required_but_string()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => 'This is not cool'],
             ['name' => 'translatable_required']
@@ -43,8 +37,6 @@ public function test_validation_fails_if_required_but_string()
 
     public function test_validation_fails_if_required_and_has_correct_keys_but_empty_values()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => ['en' => '']],
             ['name' => 'translatable_required']
@@ -55,8 +47,6 @@ public function test_validation_fails_if_required_and_has_correct_keys_but_empty
 
     public function test_validation_fails_if_required_and_has_missing_translations()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => ['en' => 'One']],
             ['name' => 'translatable_required']
@@ -67,8 +57,6 @@ public function test_validation_fails_if_required_and_has_missing_translations()
 
     public function test_validation_fails_if_required_and_has_empty_translations()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => ['en' => 'One', 'sp' => '']],
             ['name' => 'translatable_required']
@@ -79,8 +67,6 @@ public function test_validation_fails_if_required_and_has_empty_translations()
 
     public function test_validation_succeed_if_required_and_OK()
     {
-        config(['multilingual.locales' => ['en','sp']]);
-
         $validator = Validator::make(
             ['name' => ['en' => 'One', 'sp' => 'Uno']],
             ['name' => 'translatable_required']