ladybirdweb / import-export

database/migrations/2018_06_25_112242_create_exports_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('exports', function (Blueprint $table) {
+        Schema::create('exports', function(Blueprint $table) {
             $table->increments('id');
             $table->string('file', 255)->nullable();
             $table->string('type', 10);

database/migrations/2018_06_15_103302_create_imports_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('imports', function (Blueprint $table) {
+        Schema::create('imports', function(Blueprint $table) {
             $table->increments('id');
             $table->string('file', 255);
             $table->integer('file_rows');

database/migrations/2018_06_22_045143_create_import_export_logs_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('import_export_logs', function (Blueprint $table) {
+        Schema::create('import_export_logs', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('op_id');
             $table->longText('data');

tests/ImportTest.php

Spacing +26 added lines, -26 removed lines

@@ -19,28 +19,28 @@ 
 
 	protected $import;
 
-	protected function setUp ()
+	protected function setUp()
 	{
 	    parent::setUp();
 
 	    Route::middleware('web')->group(function() {
 
-		    Route::get('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@showImportForm'] );
-		    Route::post('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@uploadImportFile'] );
+		    Route::get('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@showImportForm']);
+		    Route::post('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@uploadImportFile']);
 
-			Route::get('/ticket/import/{id}/map', [ 'as' => 'ticket.import.show.map', 'uses' => 'Ladybirdweb\ImportExport\Import@showColumnsMapForm']);
-			Route::post('/ticket/import/{id}', [ 'as' => 'ticket.import.map', 'uses' => 'Ladybirdweb\ImportExport\Import@storeColumnsMap']);
+			Route::get('/ticket/import/{id}/map', ['as' => 'ticket.import.show.map', 'uses' => 'Ladybirdweb\ImportExport\Import@showColumnsMapForm']);
+			Route::post('/ticket/import/{id}', ['as' => 'ticket.import.map', 'uses' => 'Ladybirdweb\ImportExport\Import@storeColumnsMap']);
 
-			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']
 		]);
 	}
@@ -54,7 +54,7 @@ 
 
 		$response = $this->get('ticket/import');
 
-		$response->assertSee( 'importer' );
+		$response->assertSee('importer');
 	}
 
 	/**
@@ -64,13 +64,13 @@ 
 	{
 		Storage::fake('file');
 
-        $response = $this->json( 'POST', '/ticket/import', [
+        $response = $this->json('POST', '/ticket/import', [
             'file' => UploadedFile::fake()->create('file.csv', 100)
         ]);
 
         $response->assertStatus(200);
 
-        $response->assertJsonFragment( ['status' => 'ready'] );
+        $response->assertJsonFragment(['status' => 'ready']);
 	}
 
 	/**
@@ -80,15 +80,15 @@ 
 	{
 		Storage::fake('file');
 
-        $response = $this->json( 'POST', '/ticket/import', [
+        $response = $this->json('POST', '/ticket/import', [
             'file' => UploadedFile::fake()->image('file.jpg')
         ]);
 
         $response->assertStatus(200);
 
-        $response->assertJsonFragment( ['status' => 'failed'] );
+        $response->assertJsonFragment(['status' => 'failed']);
 
-        $this->assertArrayHasKey( 'errors', Import::getImportErrors() );
+        $this->assertArrayHasKey('errors', Import::getImportErrors());
 	}
 
 	/**
@@ -100,11 +100,11 @@ 
 
 		$id = $this->import->id;
 
-		$response = $this->get('/ticket/import/' . $id . '/map');
+		$response = $this->get('/ticket/import/'.$id.'/map');
 
 		$response->assertStatus(200);
 
-		$response->assertSee( 'Confirm Import' );
+		$response->assertSee('Confirm Import');
 	}
 
 	/**
@@ -114,13 +114,13 @@ 
 	{
 		$id = $this->import->id;
 
-		$response = $this->post( '/ticket/import/' . $id, [
+		$response = $this->post('/ticket/import/'.$id, [
 			'db_column' => ['email', 'name', 'password']
-		] );
+		]);
 
 		$response->assertStatus(200);
 
-		$response->assertSessionMissing( 'errors' );
+		$response->assertSessionMissing('errors');
 	}
 
 	/**
@@ -130,13 +130,13 @@ 
 	{
 		$id = $this->import->id;
 
-		$response = $this->post( '/ticket/import/' . $id, [
+		$response = $this->post('/ticket/import/'.$id, [
 			'db_column' => ['name', 'name', 'name']
-		] );
+		]);
 
 		$response->assertStatus(302);
 
-		$response->assertSessionHas( 'errors' );
+		$response->assertSessionHas('errors');
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 
 		Queue::fake();
 
-		Import::dispatchImportJob( FakeJob::class, $import );
+		Import::dispatchImportJob(FakeJob::class, $import);
 
 		Queue::assertPushedOn('importing', FakeJob::class);
 	}
@@ -158,12 +158,12 @@ 
 	*/
 	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

Spacing +14 added lines, -14 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);
 	}
@@ -98,7 +98,7 @@ 
 	*/
 	public function fail_download_exported_file()
 	{
-		$response = $this->get('/export/' . rand(1, 100) . '/download');
+		$response = $this->get('/export/'.rand(1, 100).'/download');
 
 		$response->assertStatus(404);
 	}

tests/ImportExportLogTest.php

Spacing +9 added lines, -9 removed lines

@@ -15,14 +15,14 @@ 
 
 	protected $import;
 
-	protected function setUp ()
+	protected function setUp()
 	{
 	    parent::setUp();
 
 		$this->import = Import::create([
 			'file' => 'imports/import-1530262997.csv',
 			'file_rows' => 104,
-			'db_cols' => [ 'name', 'email', 'password'],
+			'db_cols' => ['name', 'email', 'password'],
 			'model_map' => ['email', 'name', 'password']
 		]);
 	}
@@ -34,9 +34,9 @@ 
 	{
 		$import = $this->import;
 
-		$result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' );
+		$result = ImportExportLog::logImportError($import, ['data' => 'this is test data'], 'This is not expected');
 
-		$this->assertInstanceOf( ModelImportExportLog::class, $result );
+		$this->assertInstanceOf(ModelImportExportLog::class, $result);
 	}
 
 	/**
@@ -46,14 +46,14 @@ 
 	{
 		$import = $this->import;
 
-		$log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' );
+		$log = ImportExportLog::logImportError($import, ['data' => 'this is test data'], 'This is not expected');
 
-		$log_in_db = ImportExportLog::getLogs( $log->id );
+		$log_in_db = ImportExportLog::getLogs($log->id);
 
-		$this->assertInternalType( 'array', $log_in_db );
+		$this->assertInternalType('array', $log_in_db);
 
-		$this->assertArrayHasKey( 'data', $log_in_db[0] );
+		$this->assertArrayHasKey('data', $log_in_db[0]);
 
-		$this->assertArrayHasKey( 'message', $log_in_db[0] );
+		$this->assertArrayHasKey('message', $log_in_db[0]);
 	}
 }

src/Models/ImportExportLog.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
     */
     public function import()
     {
-    	return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class );
+    	return $this->belongsTo(\Ladybirdweb\ImportExport\Models\Import::class);
     }
 
 
@@ -29,7 +29,7 @@ 
     */
     public function getDataAttribute($value)
     {
-        return unserialize( $value );
+        return unserialize($value);
     }
 
 
@@ -42,7 +42,7 @@ 
     */
     public function setDataAttribute($value)
     {
-        $this->attributes['data'] = serialize( $value );
+        $this->attributes['data'] = serialize($value);
     }
 
 
@@ -55,7 +55,7 @@ 
     */
     public function getMessageAttribute($value)
     {
-        return unserialize( $value );
+        return unserialize($value);
     }
 
 
@@ -68,6 +68,6 @@ 
     */
     public function setMessageAttribute($value)
     {
-        $this->attributes['message'] = serialize( $value );
+        $this->attributes['message'] = serialize($value);
     }
 }

src/Models/Export.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 
 class Export extends Model
 {
-    protected $fillable = [ 'file', 'type', 'query', 'result_rows'];
+    protected $fillable = ['file', 'type', 'query', 'result_rows'];
 
     /**
     * Query accessor
@@ -17,7 +17,7 @@ 
     */
     public function getQueryAttribute($value)
     {
-        return unserialize( $value );
+        return unserialize($value);
     }
 
 
@@ -30,6 +30,6 @@ 
     */
     public function setQueryAttribute($value)
     {
-        $this->attributes['query'] = serialize( $value );
+        $this->attributes['query'] = serialize($value);
     }
 }

src/Models/Import.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
     */
     public function importLogs()
     {
-    	return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' );
+    	return $this->hasMany(\Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id');
     }
 
 
@@ -29,7 +29,7 @@ 
     */
     public function getModelMapAttribute($value)
     {
-        return unserialize( $value );
+        return unserialize($value);
     }
 
 
@@ -42,7 +42,7 @@ 
     */
     public function setModelMapAttribute($value)
     {
-        $this->attributes['model_map'] = serialize( $value );
+        $this->attributes['model_map'] = serialize($value);
     }
 
 
@@ -55,7 +55,7 @@ 
     */
     public function getDbColsAttribute($value)
     {
-        return unserialize( $value );
+        return unserialize($value);
     }
 
 
@@ -68,6 +68,6 @@ 
     */
     public function setDbColsAttribute($value)
     {
-        $this->attributes['db_cols'] = serialize( $value );
+        $this->attributes['db_cols'] = serialize($value);
     }
 }