ladybirdweb / import-export

tests/ImportTest.php

Indentation +95 added lines, -95 removed lines

@@ -15,103 +15,103 @@
 
 class ImportTest extends TestCase
 {
-	use RefreshDatabase;
+    use RefreshDatabase;
 
-	protected $import;
+    protected $import;
 
-	protected function setUp ()
-	{
-	    parent::setUp();
+    protected function setUp ()
+    {
+        parent::setUp();
 
-	    Route::middleware('web')->group(function() {
+        Route::middleware('web')->group(function() {
 		    
-			Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
-
-		});
-
-		Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv');
-
-		$this->import = ModelImport::create([
-			'file' => 'imports/test.csv',
-			'file_rows' => 104,
-			'db_cols' => [ 'name', 'email', 'password'],
-			'model_map' => ['email', 'name', 'password']
-		]);
-	}
-
-	/**
-	* @test
-	*/
-	public function create_new_import_success()
-	{
-		$import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']);
-
-		$this->assertInstanceOf(ModelImport::class, $import);
-	}
-
-	/**
-	* @test
-	*/
-	public function fetch_import()
-	{
-		$import = Import::getImport($this->import->id);
-
-		$this->assertInstanceOf(ModelImport::class, $import);
-	}
-
-	/**
-	* @test
-	*/
-	public function get_few_rows_from_uploaded_file()
-	{
-		$csv_data = Import::getImportFileData($this->import->id);
-
-		$this->assertInternalType( 'array', $csv_data );
-	}
-
-	/**
-	* @test
-	*/
-	public function store_data_map_with_csv_cols()
-	{
-		$import = Import::setDataMap(['email', 'name', 'password'], $this->import->id);
-
-		$this->assertInstanceOf(ModelImport::class, $import);
-	}
-
-	/**
-	* @test
-	*/
-	public function sucess_to_dispatch_given_job_class()
-	{
-		$import = $id = $this->import;
-
-		Queue::fake();
-
-		Import::dispatchImportJob( FakeJob::class, $import );
-
-		Queue::assertPushedOn('importing', FakeJob::class);
-	}
-
-	/**
-	* @test
-	*/
-	public function check_import_progress()
-	{
-		$response = $this->json( 'GET', '/import/1/progress' );
-
-		$response->assertStatus(200);
-
-		$response->assertJsonFragment( ['status' => 200] );
-
-		$response->assertJsonFragment( ['progress'] );
-	}
-
-	/**
-	* @test
-	*/
-	public function remove_import()
-	{
-		$this->assertTrue(Import::removeImport($this->import->id));
-	}
+            Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
+
+        });
+
+        Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv');
+
+        $this->import = ModelImport::create([
+            'file' => 'imports/test.csv',
+            'file_rows' => 104,
+            'db_cols' => [ 'name', 'email', 'password'],
+            'model_map' => ['email', 'name', 'password']
+        ]);
+    }
+
+    /**
+     * @test
+     */
+    public function create_new_import_success()
+    {
+        $import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']);
+
+        $this->assertInstanceOf(ModelImport::class, $import);
+    }
+
+    /**
+     * @test
+     */
+    public function fetch_import()
+    {
+        $import = Import::getImport($this->import->id);
+
+        $this->assertInstanceOf(ModelImport::class, $import);
+    }
+
+    /**
+     * @test
+     */
+    public function get_few_rows_from_uploaded_file()
+    {
+        $csv_data = Import::getImportFileData($this->import->id);
+
+        $this->assertInternalType( 'array', $csv_data );
+    }
+
+    /**
+     * @test
+     */
+    public function store_data_map_with_csv_cols()
+    {
+        $import = Import::setDataMap(['email', 'name', 'password'], $this->import->id);
+
+        $this->assertInstanceOf(ModelImport::class, $import);
+    }
+
+    /**
+     * @test
+     */
+    public function sucess_to_dispatch_given_job_class()
+    {
+        $import = $id = $this->import;
+
+        Queue::fake();
+
+        Import::dispatchImportJob( FakeJob::class, $import );
+
+        Queue::assertPushedOn('importing', FakeJob::class);
+    }
+
+    /**
+     * @test
+     */
+    public function check_import_progress()
+    {
+        $response = $this->json( 'GET', '/import/1/progress' );
+
+        $response->assertStatus(200);
+
+        $response->assertJsonFragment( ['status' => 200] );
+
+        $response->assertJsonFragment( ['progress'] );
+    }
+
+    /**
+     * @test
+     */
+    public function remove_import()
+    {
+        $this->assertTrue(Import::removeImport($this->import->id));
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -19,22 +19,22 @@ 
 
 	protected $import;
 
-	protected function setUp ()
+	protected function setUp()
 	{
 	    parent::setUp();
 
 	    Route::middleware('web')->group(function() {
 		    
-			Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
+			Route::get('/import/{id}/progress', ['as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
 
 		});
 
-		Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv');
+		Storage::putFileAs('imports', new File(storage_path('test/test.csv')), 'test.csv');
 
 		$this->import = ModelImport::create([
 			'file' => 'imports/test.csv',
 			'file_rows' => 104,
-			'db_cols' => [ 'name', 'email', 'password'],
+			'db_cols' => ['name', 'email', 'password'],
 			'model_map' => ['email', 'name', 'password']
 		]);
 	}
@@ -44,7 +44,7 @@ 
 	*/
 	public function create_new_import_success()
 	{
-		$import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']);
+		$import = Import::createImport('imports/test.csv', ['name', 'email', 'password']);
 
 		$this->assertInstanceOf(ModelImport::class, $import);
 	}
@@ -66,7 +66,7 @@ 
 	{
 		$csv_data = Import::getImportFileData($this->import->id);
 
-		$this->assertInternalType( 'array', $csv_data );
+		$this->assertInternalType('array', $csv_data);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 
 		Queue::fake();
 
-		Import::dispatchImportJob( FakeJob::class, $import );
+		Import::dispatchImportJob(FakeJob::class, $import);
 
 		Queue::assertPushedOn('importing', FakeJob::class);
 	}
@@ -98,13 +98,13 @@ 
 	*/
 	public function check_import_progress()
 	{
-		$response = $this->json( 'GET', '/import/1/progress' );
+		$response = $this->json('GET', '/import/1/progress');
 
 		$response->assertStatus(200);
 
-		$response->assertJsonFragment( ['status' => 200] );
+		$response->assertJsonFragment(['status' => 200]);
 
-		$response->assertJsonFragment( ['progress'] );
+		$response->assertJsonFragment(['progress']);
 	}
 
 	/**

tests/ExportTest.php

Indentation +62 added lines, -62 removed lines

@@ -16,90 +16,90 @@
 
 class ExportTest extends TestCase
 {
-	use RefreshDatabase;
+    use RefreshDatabase;
 
-	protected $export;
+    protected $export;
 
-	protected function setUp ()
-	{
-	    parent::setUp();
+    protected function setUp ()
+    {
+        parent::setUp();
 
-	    Route::middleware('web')->group(function() {
+        Route::middleware('web')->group(function() {
 
-			Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']);
+            Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']);
 
-			Route::get( '/export/{id}/download',  [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
+            Route::get( '/export/{id}/download',  [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
 
-		});
+        });
 
-		Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls');
+        Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls');
 
-		$this->export = ModelExport::create([
-			'file' => 'test.xls',
-			'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(),
-			'type' => 'xls'
-		]);
-	}
+        $this->export = ModelExport::create([
+            'file' => 'test.xls',
+            'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(),
+            'type' => 'xls'
+        ]);
+    }
 
-	/**
-	* @test
-	*/
-	public function data_export_initiated_and_dispatched()
-	{
-		Queue::fake();
+    /**
+     * @test
+     */
+    public function data_export_initiated_and_dispatched()
+    {
+        Queue::fake();
 
-		$export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' );
+        $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' );
 
-		$this->assertInstanceOf( ModelExport::class, $export );
+        $this->assertInstanceOf( ModelExport::class, $export );
 
-		Queue::assertPushedOn('exporting', ExportJob::class);
-	}
+        Queue::assertPushedOn('exporting', ExportJob::class);
+    }
 
-	/**
-	* @test
-	*/
-	public function see_export_progress_page()
-	{
-		$response =  $this->get('/ticket/export/' . $this->export->id);
+    /**
+     * @test
+     */
+    public function see_export_progress_page()
+    {
+        $response =  $this->get('/ticket/export/' . $this->export->id);
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertSee('Export');
-	}
+        $response->assertSee('Export');
+    }
 
-	/**
-	* @test
-	*/
-	public function check_export_progress_ajax()
-	{
-		$response = $this->json( 'GET', '/export/' . $this->export->id . '/progress');
+    /**
+     * @test
+     */
+    public function check_export_progress_ajax()
+    {
+        $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress');
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertJsonFragment( ['status' => 200] );
+        $response->assertJsonFragment( ['status' => 200] );
 
-		$response->assertJsonFragment( ['progress'] );
-	}
+        $response->assertJsonFragment( ['progress'] );
+    }
 
-	/**
-	* @test
-	*/
-	public function try_download_exported_file()
-	{
-		$response = $this->get('/export/' . $this->export->id . '/download');
+    /**
+     * @test
+     */
+    public function try_download_exported_file()
+    {
+        $response = $this->get('/export/' . $this->export->id . '/download');
 
-		$response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"');
+        $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"');
 
-		$response->assertStatus(200);
-	}
+        $response->assertStatus(200);
+    }
 
-	/**
-	* @test
-	*/
-	public function fail_download_exported_file()
-	{
-		$response = $this->get('/export/987654321/download');
+    /**
+     * @test
+     */
+    public function fail_download_exported_file()
+    {
+        $response = $this->get('/export/987654321/download');
 
-		$response->assertStatus(404);
-	}
+        $response->assertStatus(404);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -20,23 +20,23 @@ 
 
 	protected $export;
 
-	protected function setUp ()
+	protected function setUp()
 	{
 	    parent::setUp();
 
 	    Route::middleware('web')->group(function() {
 
-			Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']);
+			Route::get('/ticket/export/{id}', ['as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']);
 
-			Route::get( '/export/{id}/download',  [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
+			Route::get('/export/{id}/download', ['as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
 
 		});
 
-		Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls');
+		Storage::putFileAs('exports', new File(storage_path('test/test.csv')), 'test.xls');
 
 		$this->export = ModelExport::create([
 			'file' => 'test.xls',
-			'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(),
+			'query' => \App\Models\User::select(['name', 'email', 'created_at'])->getModel(),
 			'type' => 'xls'
 		]);
 	}
@@ -48,9 +48,9 @@ 
 	{
 		Queue::fake();
 
-		$export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' );
+		$export = Export::export(\App\Models\User::select(['name', 'email', 'created_at']), 'xls');
 
-		$this->assertInstanceOf( ModelExport::class, $export );
+		$this->assertInstanceOf(ModelExport::class, $export);
 
 		Queue::assertPushedOn('exporting', ExportJob::class);
 	}
@@ -60,7 +60,7 @@ 
 	*/
 	public function see_export_progress_page()
 	{
-		$response =  $this->get('/ticket/export/' . $this->export->id);
+		$response = $this->get('/ticket/export/'.$this->export->id);
 
 		$response->assertStatus(200);
 
@@ -72,13 +72,13 @@ 
 	*/
 	public function check_export_progress_ajax()
 	{
-		$response = $this->json( 'GET', '/export/' . $this->export->id . '/progress');
+		$response = $this->json('GET', '/export/'.$this->export->id.'/progress');
 
 		$response->assertStatus(200);
 
-		$response->assertJsonFragment( ['status' => 200] );
+		$response->assertJsonFragment(['status' => 200]);
 
-		$response->assertJsonFragment( ['progress'] );
+		$response->assertJsonFragment(['progress']);
 	}
 
 	/**
@@ -86,9 +86,9 @@ 
 	*/
 	public function try_download_exported_file()
 	{
-		$response = $this->get('/export/' . $this->export->id . '/download');
+		$response = $this->get('/export/'.$this->export->id.'/download');
 
-		$response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"');
+		$response->assertHeader('content-disposition', 'attachment; filename="test.xls"');
 
 		$response->assertStatus(200);
 	}

config/export.php

Indentation +4 added lines, -4 removed lines

@@ -3,13 +3,13 @@
 return [
     // Route for export process ajax
     'export_progress' => [
-    	'url' => '/export/{id}/progress',
-    	'name' => 'ladybirdweb.export.ajax.progress'
+        'url' => '/export/{id}/progress',
+        'name' => 'ladybirdweb.export.ajax.progress'
     ],
 
     // Route for download exported file
     'export_download' => [
-    	'url' => '/export/{id}/download',
-    	'name' => 'ladybirdweb.export.download'
+        'url' => '/export/{id}/download',
+        'name' => 'ladybirdweb.export.download'
     ]
 ];

config/import.php

Indentation +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@
 return [
     // Route for import process ajax
     'import_progress' => [
-    	'url' => '/import/{id}/progress',
-    	'name' => 'ladybirdweb.import.ajax.progress'
+        'url' => '/import/{id}/progress',
+        'name' => 'ladybirdweb.import.ajax.progress'
     ]
 ];

src/routes.php

Spacing +3 added lines, -3 removed lines

@@ -3,12 +3,12 @@
 Route::middleware('web')->group(function() {
 
 // Ajax GET import progress
-Route::get( config( 'import.import_progress.url' ), [ 'as' => config( 'import.import_progress.name' ), 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
+Route::get(config('import.import_progress.url'), ['as' => config('import.import_progress.name'), 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
 
 // Ajax GET export progress
-Route::get( config( 'export.export_progress.url' ), [ 'as' => config( 'export.export_progress.name' ), 'uses' => 'Ladybirdweb\ImportExport\Export@returnExportProgress']);
+Route::get(config('export.export_progress.url'), ['as' => config('export.export_progress.name'), 'uses' => 'Ladybirdweb\ImportExport\Export@returnExportProgress']);
 
 // GET export download
-Route::get( config( 'export.export_download.url' ),  [ 'as' => config( 'export.export_download.name' ), 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
+Route::get(config('export.export_download.url'), ['as' => config('export.export_download.name'), 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
 
 });

src/Import.php

Spacing +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
         // Store file path and model class to db
         $import = ModelImport::create([
             'file' => $path,
-            'file_rows' => count( file( storage_path( 'app/' . $path ) ) ) - 1,
+            'file_rows' => count(file(storage_path('app/'.$path))) - 1,
             'db_cols' => $columns
         ]);
 
@@ -33,28 +33,28 @@ 
      */
     public function getImport($id)
     {
-        return ModelImport::findOrFail( $id );
+        return ModelImport::findOrFail($id);
     }
 
     public function getImportFileData($id, $rows = 5)
     {
         // Get import instance
-        $import = $this->getImport( $id );
+        $import = $this->getImport($id);
         
         // Read 5 rows from csv
         $read_line = 1;
 
-        $file = fopen( storage_path( 'app/' . $import->file ), 'r' );
+        $file = fopen(storage_path('app/'.$import->file), 'r');
 
-        while ( $csv_line = fgetcsv( $file ) ) {
+        while ($csv_line = fgetcsv($file)) {
             $csv_data[] = $csv_line;
 
-            if ( $read_line > $rows ) break;
+            if ($read_line > $rows) break;
 
             $read_line++;
         }
         
-        fclose( $file );
+        fclose($file);
 
         return $csv_data;
     }
@@ -107,11 +107,11 @@ 
         $data['progress'] = round(($import->row_processed / $import->file_rows) * 100);
 
         // If progress completed return successful imported rows count
-        if ( $data['progress'] == 100 ) {
+        if ($data['progress'] == 100) {
             $data['imported'] = $import->row_imported;
         }
 
-        return response()->json( $data );
+        return response()->json($data);
     }
 
 
@@ -124,7 +124,7 @@ 
     public function removeImport($id)
     {
         // Get import instance
-        $import = $this->getImport( $id );
+        $import = $this->getImport($id);
 
         // Remove a import from db
         return $import->delete();

Braces +3 added lines, -1 removed lines

@@ -49,7 +49,9 @@
         while ( $csv_line = fgetcsv( $file ) ) {
             $csv_data[] = $csv_line;
 
-            if ( $read_line > $rows ) break;
+            if ( $read_line > $rows ) {
+                break;
+            }
 
             $read_line++;
         }