Hokan22 / laravel-translator

src/Provider/TranslatorProvider.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
+        $this->mergeConfigFrom(__DIR__ . '/../config/translator.php', 'translator');
 
-        $this->app->singleton('Translator', function () {
+        $this->app->singleton('Translator', function() {
                 return new Translator();
             }
         );
@@ -43,9 +43,9 @@ 
             'config'
         );
 
-        $this->loadMigrationsFrom(__DIR__.'/../migrations/');
-        $this->loadRoutesFrom(__DIR__.'/../resources/routes.php');
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'translator');
+        $this->loadMigrationsFrom(__DIR__ . '/../migrations/');
+        $this->loadRoutesFrom(__DIR__ . '/../resources/routes.php');
+        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'translator');
 
         if ($this->app->runningInConsole()) {
             $this->commands([

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
     /**
      * Register any application services.
      */
-    public function register()
-    {
+    public function register() {
         $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
 
         $this->app->singleton('Translator', function () {
@@ -35,8 +34,7 @@ 
     /**
      * Bootstrap any application services.
      */
-    public function boot()
-    {
+    public function boot() {
         $this->publishes([
                 __DIR__ . '/../config/translator.php' => config_path('translator.php'),
             ],

src/Controllers/TranslatorAdminController.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
         $query = TranslationIdentifier::with('translations');
 
         if ($locale != '') {
-            $query = $query->whereDoesntHave('translations', function ($query) use ($locale)
+            $query = $query->whereDoesntHave('translations', function($query) use ($locale)
                 {
                     $query->where('translations.locale', 'like', $locale);
                 }
@@ -43,12 +43,12 @@ 
         }
 
         if ($search != '') {
-            $query = $query->where(function ($query) use ($search) {
-                $query ->where('identifier',     'LIKE', '%'.$search.'%')
-                    ->orWhere('parameters', 'LIKE', '%'.$search.'%')
-                    ->orWhere('group',      'LIKE', '%'.$search.'%')
-                    ->orWhere('page_name',  'LIKE', '%'.$search.'%')
-                    ->orWhere('description','LIKE', '%'.$search.'%');
+            $query = $query->where(function($query) use ($search) {
+                $query ->where('identifier', 'LIKE', '%' . $search . '%')
+                    ->orWhere('parameters', 'LIKE', '%' . $search . '%')
+                    ->orWhere('group', 'LIKE', '%' . $search . '%')
+                    ->orWhere('page_name', 'LIKE', '%' . $search . '%')
+                    ->orWhere('description', 'LIKE', '%' . $search . '%');
             });
         }
 
@@ -168,7 +168,7 @@ 
      * @param $state string 'enabled|disabled'
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeLiveMode ($state)
+    public function changeLiveMode($state)
     {
         if ($state == 'enable') {
             session(['translation_live_mode' => true]);

Braces +7 added lines, -14 removed lines

@@ -27,16 +27,14 @@ 
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index()
-    {
+    public function index() {
         $search = Input::get('search', '');
         $locale = Input::get('locale', '');
 
         $query = TranslationIdentifier::with('translations');
 
         if ($locale != '') {
-            $query = $query->whereDoesntHave('translations', function ($query) use ($locale)
-                {
+            $query = $query->whereDoesntHave('translations', function ($query) use ($locale) {
                     $query->where('translations.locale', 'like', $locale);
                 }
             );
@@ -73,8 +71,7 @@ 
      * @param integer $id ID of the translation Identifier to edit
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function edit($id)
-    {
+    public function edit($id) {
         $identifier = TranslationIdentifier::findOrFail($id);
 
         $available_locales = TranslatorFacade::getConfigValue('available_locales');
@@ -97,8 +94,7 @@ 
      * @param Request $request Object with the values of the identifier
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postEdit($id, Request $request)
-    {
+    public function postEdit($id, Request $request) {
         TranslationIdentifier::findOrFail($id);
 
         foreach ($request->all() as $key => $value) {
@@ -131,8 +127,7 @@ 
      * @param Request $request Request with multiple values of identifiers to update
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postIdentifier(Request $request)
-    {
+    public function postIdentifier(Request $request) {
         /** @var TranslationIdentifier $translation_identifiers */
         $translation_identifiers = TranslationIdentifier::all()->whereIn('id', array_keys($request->all()));
 
@@ -159,8 +154,7 @@ 
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function test()
-    {
+    public function test() {
         return view('translator::test');
     }
 
@@ -168,8 +162,7 @@ 
      * @param $state string 'enabled|disabled'
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeLiveMode ($state)
-    {
+    public function changeLiveMode ($state) {
         if ($state == 'enable') {
             session(['translation_live_mode' => true]);
         } else {

src/Middleware/TranslatorMiddleware.php

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
      *
      * @todo Validate Browser locale string (https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
      */
-    public function handle(Request $request, Closure $next)
-    {
+    public function handle(Request $request, Closure $next) {
         if (Session::has('locale') || auth()->check()) {
             $locale = Session::has('locale') ? session()->get('locale') : auth()->user()->language;
 

src/Handler/DefaultHandler.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      *
      * @param $locale
      */
-    function __construct($locale){
+    function __construct($locale) {
         $this->locale = $locale;
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return string
      */
-    function getLocale(){
+    function getLocale() {
         return $this->locale;
     }
 
@@ -68,7 +68,7 @@ 
      * @param string $group
      * @return string
      */
-    function getTranslation($identifier, $group){
+    function getTranslation($identifier, $group) {
         return $identifier;
     }
 
@@ -77,7 +77,7 @@ 
      *
      * @return bool
      */
-    function refreshCache(){
+    function refreshCache() {
         return true;
     }
 
@@ -87,7 +87,7 @@ 
      * @param string $group
      * @return array
      */
-    function getAllTranslations($group){
+    function getAllTranslations($group) {
         return [];
     }
 

Braces +14 added lines, -8 removed lines

@@ -16,21 +16,27 @@ 
  *
  * Class TranslationNotFoundException
  */
-class TranslationNotFoundException extends \Exception {}
+class TranslationNotFoundException extends \Exception
+{
+}
 
 /**
  * Custom Exception to distinguish if the Translation Identifier was not found in Cache but could be in DB
  *
  * Class TranslationNotInCacheException
  */
-class TranslationNotInCacheException extends TranslationNotFoundException {}
+class TranslationNotInCacheException extends TranslationNotFoundException
+{
+}
 
 /**
  * Custom Exception thrown when a cache file could not be found
  *
  * Class TranslationCacheNotFound
  */
-class TranslationCacheNotFound extends \Exception {}
+class TranslationCacheNotFound extends \Exception
+{
+}
 
 /**
  * Interface HandlerInterface
@@ -48,7 +54,7 @@ 
      *
      * @param $locale
      */
-    function __construct($locale){
+    function __construct($locale) {
         $this->locale = $locale;
     }
 
@@ -57,7 +63,7 @@ 
      *
      * @return string
      */
-    function getLocale(){
+    function getLocale() {
         return $this->locale;
     }
 
@@ -68,7 +74,7 @@ 
      * @param string $group
      * @return string
      */
-    function getTranslation($identifier, $group){
+    function getTranslation($identifier, $group) {
         return $identifier;
     }
 
@@ -77,7 +83,7 @@ 
      *
      * @return bool
      */
-    function refreshCache(){
+    function refreshCache() {
         return true;
     }
 
@@ -87,7 +93,7 @@ 
      * @param string $group
      * @return array
      */
-    function getAllTranslations($group){
+    function getAllTranslations($group) {
         return [];
     }
 

src/Handler/DatabaseHandler.php

Spacing +6 added lines, -6 removed lines

@@ -42,11 +42,11 @@ 
     {
         if (isset($this->translations[$identifier])) {
             if ($this->translations[$identifier]->translation == null) {
-                throw new TranslationNotFoundException("The translation for identifier '".$identifier."' and locale '".$this->locale."' could not be found");
+                throw new TranslationNotFoundException("The translation for identifier '" . $identifier . "' and locale '" . $this->locale . "' could not be found");
             }
             return $this->translations[$identifier]->translation;
         } else {
-            throw new NotFoundResourceException("The translation identifier '".$identifier."' could not be found");
+            throw new NotFoundResourceException("The translation identifier '" . $identifier . "' could not be found");
         }
     }
 
@@ -58,9 +58,9 @@ 
     public function refreshCache()
     {
         $translations = new TranslationIdentifier();
-        $translations = $translations->leftJoin('translations', function ($join)
+        $translations = $translations->leftJoin('translations', function($join)
             {
-                $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
+                $join->on('translation_identifiers.id', '=', 'translations.translation_identifier_id')
                     ->where('locale', $this->locale);
             }
             )->get();
@@ -98,10 +98,10 @@ 
      */
     function getDatabaseID($identifier)
     {
-        if(isset($this->translations[$identifier])) {
+        if (isset($this->translations[$identifier])) {
             return $this->translations[$identifier]->id;
         } else {
-            throw new NotFoundResourceException("The translation identifier '".$identifier."' could not be found");
+            throw new NotFoundResourceException("The translation identifier '" . $identifier . "' could not be found");
         }
     }
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -22,8 +22,7 @@ 
      *
      * @param string $locale The locale of the translations
      */
-    public function __construct($locale)
-    {
+    public function __construct($locale) {
         parent::__construct($locale);
 
         $this->refreshCache();
@@ -38,8 +37,7 @@ 
      * @throws TranslationNotFoundException
      * @return string returns the found translation for identifier
      */
-    public function getTranslation($identifier, $group)
-    {
+    public function getTranslation($identifier, $group) {
         if (isset($this->translations[$identifier])) {
             if ($this->translations[$identifier]->translation == null) {
                 throw new TranslationNotFoundException("The translation for identifier '".$identifier."' and locale '".$this->locale."' could not be found");
@@ -55,11 +53,9 @@ 
      *
      * @return void
      */
-    public function refreshCache()
-    {
+    public function refreshCache() {
         $translations = new TranslationIdentifier();
-        $translations = $translations->leftJoin('translations', function ($join)
-            {
+        $translations = $translations->leftJoin('translations', function ($join) {
                 $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
                     ->where('locale', $this->locale);
             }
@@ -76,8 +72,7 @@ 
      * @param string $group Group of the translations to return
      * @return array Translations of the given group
      */
-    public function getAllTranslations($group = 'default')
-    {
+    public function getAllTranslations($group = 'default') {
         $return = [];
         foreach (collect($this->translations)->where('group', $group) as $key => $translation) {
             if ($translation->translation == null) {
@@ -96,8 +91,7 @@ 
      * @throws NotFoundResourceException
      * @return integer
      */
-    function getDatabaseID($identifier)
-    {
+    function getDatabaseID($identifier) {
         if(isset($this->translations[$identifier])) {
             return $this->translations[$identifier]->id;
         } else {