git push origin masterMerge branch 'ahmedash95-master'

Author: themsaid

src/LangmanServiceProvider.php

@@ -23,18 +23,18 @@ public function register()
 
         $this->app->bind(Manager::class, function () {
             return new Manager(
-                new Filesystem(),
+                new Filesystem,
                 $this->app['config']['langman.path'],
-                $this->app['config']['view.paths']
+                array_merge($this->app['config']['view.paths'], [$this->app['path']])
             );
         });
 
         $this->commands([
-            \Themsaid\Langman\Commands\ShowCommand::class,
-            \Themsaid\Langman\Commands\FindCommand::class,
-            \Themsaid\Langman\Commands\TransCommand::class,
             \Themsaid\Langman\Commands\MissingCommand::class,
             \Themsaid\Langman\Commands\RemoveCommand::class,
+            \Themsaid\Langman\Commands\TransCommand::class,
+            \Themsaid\Langman\Commands\ShowCommand::class,
+            \Themsaid\Langman\Commands\FindCommand::class,
             \Themsaid\Langman\Commands\SyncCommand::class,
         ]);
     }

src/Manager.php

@@ -25,23 +25,23 @@ class Manager
     private $path;
 
     /**
-     * the paths to the views files.
+     * The paths to directories where we look for localised strings to sync.
      *
      * @var array
      */
-    private $viewsPaths;
+    private $syncPaths;
 
     /**
      * Manager constructor.
      *
      * @param Filesystem $disk
      * @param string $path
      */
-    public function __construct(Filesystem $disk, $path, array $viewsPaths)
+    public function __construct(Filesystem $disk, $path, array $syncPaths)
     {
         $this->disk = $disk;
         $this->path = $path;
-        $this->viewsPaths = $viewsPaths;
+        $this->syncPaths = $syncPaths;
     }
 
     /**
@@ -261,7 +261,8 @@ public function collectFromViews()
         $functions = ['trans', 'trans_choice', 'Lang::get', 'Lang::choice', 'Lang::trans', 'Lang::transChoice', '@lang', '@choice'];
 
         $pattern =
-            // See http://regexr.com/392hu
+            // See https://regex101.com/r/jS5fX0/1
+            '[^\w]'. // Must not start with any alpha numeric character or underscore
             '('.implode('|', $functions).')'.// Must start with one of the functions
             "\(".// Match opening parentheses
             "[\'\"]".// Match " or '
@@ -274,7 +275,7 @@ public function collectFromViews()
         ;
 
         /** @var \Symfony\Component\Finder\SplFileInfo $file */
-        foreach ($this->disk->allFiles($this->viewsPaths) as $file) {
+        foreach ($this->disk->allFiles($this->syncPaths) as $file) {
             if (preg_match_all("/$pattern/siU", $file->getContents(), $matches)) {
                 foreach ($matches[2] as $key) {
                     try {

tests/SyncCommandTest.php

@@ -34,5 +34,11 @@ public function testCommandOutputForFile()
         array_map('unlink', glob(__DIR__.'/views_temp/user/index.blade.php'));
         array_map('rmdir', glob(__DIR__.'/views_temp/user'));
         array_map('unlink', glob(__DIR__.'/views_temp/user.blade.php'));
+
+        array_map('unlink', glob(__DIR__.'/app_temp/Http/Controllers/testController.php'));
+        array_map('unlink', glob(__DIR__.'/app_temp/Jobs/testJob.php'));
+        array_map('rmdir', glob(__DIR__.'/app_temp/Http/Controllers'));
+        array_map('rmdir', glob(__DIR__.'/app_temp/Http'));
+        array_map('rmdir', glob(__DIR__.'/app_temp/Jobs'));
     }
 }