fixing some bugs related to laravel 5.3 (#132)

Author: barryvdh

src/Controller.php

@@ -61,6 +61,7 @@ protected function loadLocales()
     {
         //Set the default locale as the first one.
         $locales = Translation::groupBy('locale')->pluck('locale');
+
         if ($locales instanceof Collection) {
             $locales = $locales->all();
         }

src/Manager.php

@@ -96,23 +96,18 @@ public function findTranslations($path = null)
     {
         $path = $path ?: base_path();
         $keys = array();
-        $functions =  array('trans', 'trans_choice', 'Lang::get', 'Lang::choice', 'Lang::trans', 'Lang::transChoice');
-        $functionsInline = array('@lang', '@choice');
-        $pattern =                                         // http://regexr.com/3e38g
-            "(?:".                                         // Start a new group to match:
-                "(?:".implode('|', $functionsInline) .")". // Must start with one of the functions
-                "|".                                       // Or
-                "[^\w|>]".                                 // Must not have an alphanum or _ or > before real method
-                "(?:".implode('|', $functions) .")".       // Must start with one of the functions
-            ")".                                           // Close group
-            "\(".                                          // Match opening parenthese
-            "[\'\"]".                                      // Match " or '
-            "(".                                           // Start a new group to match:
-                "[a-zA-Z0-9_-]+".                          // Must start with group
-                "(?:[.][^\1)]+)+".                         // Be followed by one or more items/keys
-            ")".                                           // Close group
-            "[\'\"]".                                      // Closing quote
-            "[\),]";                                       // Close parentheses or new parameter
+        $functions =  array('trans', 'trans_choice', 'Lang::get', 'Lang::choice', 'Lang::trans', 'Lang::transChoice', '@lang', '@choice');
+        $pattern =                              // See http://regexr.com/392hu
+            "[^\w|>]".                          // Must not have an alphanum or _ or > before real method
+            "(".implode('|', $functions) .")".  // Must start with one of the functions
+            "\(".                               // Match opening parenthese
+            "[\'\"]".                           // Match " or '
+            "(".                                // Start a new group to match:
+                "[a-zA-Z0-9_-]+".               // Must start with group
+                "([.][^\1)]+)+".                // Be followed by one or more items/keys
+            ")".                                // Close group
+            "[\'\"]".                           // Closing quote
+            "[\),]";                            // Close parentheses or new parameter
 
         // Find all PHP + Twig files in the app folder, except for storage
         $finder = new Finder();
@@ -123,7 +118,7 @@ public function findTranslations($path = null)
             // Search the current file for the pattern
             if(preg_match_all("/$pattern/siU", $file->getContents(), $matches)) {
                 // Get all matches
-                foreach ($matches[1] as $key) {
+                foreach ($matches[2] as $key) {
                     $keys[] = $key;
                 }
             }

src/ManagerServiceProvider.php

@@ -4,7 +4,6 @@
 use Illuminate\Support\ServiceProvider;
 
 class ManagerServiceProvider extends ServiceProvider {
-  
 	/**
 	 * Indicates if loading of the provider is deferred.
 	 *