Sync views and app files with tests

Author: ahmedash95

src/LangmanServiceProvider.php

@@ -25,7 +25,10 @@ public function register()
             return new Manager(
                 new Filesystem(),
                 $this->app['config']['langman.path'],
-                $this->app['config']['view.paths']
+                array_merge(
+                    $this->app['config']['view.paths'],
+                    (array) app_path()
+                )
             );
         });
 

src/Manager.php

@@ -25,23 +25,23 @@ class Manager
     private $path;
 
     /**
-     * the paths to the views files.
+     * the paths to the views,app files.
      *
      * @var array
      */
-    private $viewsPaths;
+    private $allFiles;
 
     /**
      * Manager constructor.
      *
      * @param Filesystem $disk
      * @param string $path
      */
-    public function __construct(Filesystem $disk, $path, array $viewsPaths)
+    public function __construct(Filesystem $disk, $path, array $allFiles)
     {
         $this->disk = $disk;
         $this->path = $path;
-        $this->viewsPaths = $viewsPaths;
+        $this->allFiles = $allFiles;
     }
 
     /**
@@ -274,7 +274,7 @@ public function collectFromViews()
         ;
 
         /** @var \Symfony\Component\Finder\SplFileInfo $file */
-        foreach ($this->disk->allFiles($this->viewsPaths) as $file) {
+        foreach ($this->disk->allFiles($this->allFiles) as $file) {
             if (preg_match_all("/$pattern/siU", $file->getContents(), $matches)) {
                 foreach ($matches[2] as $key) {
                     try {

tests/SyncCommandTest.php

@@ -11,6 +11,20 @@ public function testCommandOutputForFile()
         file_put_contents(__DIR__.'/views_temp/user.blade.php', '{{ trans(\'user.name\') }} {{ trans(\'user.age\') }}');
         mkdir(__DIR__.'/views_temp/user');
         file_put_contents(__DIR__.'/views_temp/user/index.blade.php', "{{ trans('user.city') }} {{ trans('user.code.initial') }}");
+        
+        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'));
+        mkdir(__DIR__.'/app_temp/Http');
+        mkdir(__DIR__.'/app_temp/Http/Controllers');
+        mkdir(__DIR__.'/app_temp/Jobs');
+
+
+        file_put_contents(__DIR__.'/app_temp/Http/Controllers/testController.php', "<?php class testController{ public function index() { return Lang::get('user.first_name'); } }");
+
+        file_put_contents(__DIR__.'/app_temp/Jobs/testJob.php', "<?php class testJob{ public function index() { return Lang::get('user.last_name'); } }");
 
         $this->createTempFiles([
             'en' => ['user' => "<?php\n return ['name' => 'Name'];"],
@@ -26,13 +40,23 @@ public function testCommandOutputForFile()
         $this->assertArrayHasKey('initial', $userENFile['code']);
         $this->assertArrayHasKey('age', $userENFile);
         $this->assertArrayHasKey('city', $userENFile);
+        $this->assertArrayHasKey('first_name', $userENFile);
+        $this->assertArrayHasKey('last_name', $userENFile);
         $this->assertArrayHasKey('name', $userNlFile);
         $this->assertArrayHasKey('initial', $userNlFile['code']);
         $this->assertArrayHasKey('age', $userNlFile);
         $this->assertArrayHasKey('city', $userNlFile);
-
+        $this->assertArrayHasKey('first_name', $userNlFile);
+        $this->assertArrayHasKey('last_name', $userNlFile);
+        
         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'));
     }
 }

tests/TestCase.php

@@ -12,7 +12,13 @@ protected function getPackageProviders($app)
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('langman.path', __DIR__.'/temp');
-        $app['config']->set('view.paths', [__DIR__.'/views_temp']);
+        // here we put the app temp with views path , because the app_path in
+        // service porovider pass wrong app path of laravel, but we need to
+        // check if the app_temp directory exists or not
+        if (!is_dir(__DIR__.'/app_temp')) {
+            mkdir(__DIR__.'/app_temp');
+        }
+        $app['config']->set('view.paths', [__DIR__.'/views_temp',__DIR__.'/app_temp']);
     }
 
     public function setUp()