ladybirdweb / import-export

src/ImportExportLog.php

Indentation +13 added lines, -13 removed lines

@@ -7,20 +7,20 @@
 class ImportExportLog
 {
     
-	public function logImportError(Import $import, $data, $message)
-	{
-		// Create new log
-		return $import->importLogs()->create([
-			'data' => $data,
-			'message' => $message,
-		]);
-	}
+    public function logImportError(Import $import, $data, $message)
+    {
+        // Create new log
+        return $import->importLogs()->create([
+            'data' => $data,
+            'message' => $message,
+        ]);
+    }
 
 
-	public function getLogs($id)
-	{
-		// Get all logs of a import or export process
-		return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray();
-	}
+    public function getLogs($id)
+    {
+        // Get all logs of a import or export process
+        return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	public function getLogs($id)
 	{
 		// Get all logs of a import or export process
-		return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray();
+		return Import::findOrFail($id)->importLogs()->get(['data', 'message'])->toArray();
 	}
 
 }

src/Export.php

Indentation +13 added lines, -13 removed lines

@@ -9,24 +9,24 @@ 
 class Export
 {
 	
-	public function export(Builder $query, $ext = 'xls')
-	{
-		// Create new export
-		$export = new ModelExport;
+    public function export(Builder $query, $ext = 'xls')
+    {
+        // Create new export
+        $export = new ModelExport;
 
-		$export->type = $ext;
-		$export->query = $query->getModel();
+        $export->type = $ext;
+        $export->query = $query->getModel();
 
-		$export->save();
+        $export->save();
 
-		ExportJob::dispatch( $export )->onQueue( 'exporting' );
+        ExportJob::dispatch( $export )->onQueue( 'exporting' );
 
-		return $export;
-	}
+        return $export;
+    }
 
 
 
-	public function showExportStatus($id)
+    public function showExportStatus($id)
     {
         // Map export instance
         $export = ModelExport::findOrFail( $id );
@@ -50,11 +50,11 @@ 
 
         if ( $export->result_rows > 0 ) {
 
-        	$data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 );
+            $data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 );
 
         } else {
 
-        	$data['progress'] = 0;
+            $data['progress'] = 0;
 
         }
 

Spacing +12 added lines, -12 removed lines

@@ -19,7 +19,7 @@ 
 
 		$export->save();
 
-		ExportJob::dispatch( $export )->onQueue( 'exporting' );
+		ExportJob::dispatch($export)->onQueue('exporting');
 
 		return $export;
 	}
@@ -29,9 +29,9 @@ 
 	public function showExportStatus($id)
     {
         // Map export instance
-        $export = ModelExport::findOrFail( $id );
+        $export = ModelExport::findOrFail($id);
 
-        return view( 'importexport::export.progress', compact( 'id' ) );
+        return view('importexport::export.progress', compact('id'));
     }
 
 
@@ -44,13 +44,13 @@ 
     public function returnExportProgress($id)
     {
         // Map export instance
-        $export = ModelExport::findOrFail( $id );
+        $export = ModelExport::findOrFail($id);
 
         $data['status'] = 200;
 
-        if ( $export->result_rows > 0 ) {
+        if ($export->result_rows > 0) {
 
-        	$data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 );
+        	$data['progress'] = round(($export->row_processed / $export->result_rows) * 100);
 
         } else {
 
@@ -59,23 +59,23 @@ 
         }
 
         // If progress completed return successful imported rows count
-        if ( $data['progress'] == 100 ) {
-            $data['exported'] = route( 'ladybirdweb.export.download', $export->id );
+        if ($data['progress'] == 100) {
+            $data['exported'] = route('ladybirdweb.export.download', $export->id);
         }
 
-        return response()->json( $data );
+        return response()->json($data);
     }
 
 
     public function downloadExportedFile($id)
     {
         // Map export instance
-        $export = ModelExport::findOrFail( $id );
+        $export = ModelExport::findOrFail($id);
 
-        if ( ! file_exists( storage_path( 'app/exports' ) . '/' . $export->file ) || empty( $export->file ) ) {
+        if (!file_exists(storage_path('app/exports').'/'.$export->file) || empty($export->file)) {
             abort(404);
         }
 
-        return response()->download( storage_path( 'app/exports/' . $export->file ) );
+        return response()->download(storage_path('app/exports/'.$export->file));
     }
 }

src/ImportHandler.php

Indentation +10 added lines, -10 removed lines

@@ -8,10 +8,10 @@ 
 class ImportHandler
 {
 	
-	function process(Import $import, callable $callback)
-	{
+    function process(Import $import, callable $callback)
+    {
 
-		// CSV header row show be excluded
+        // CSV header row show be excluded
         $csv_header = true;
 
         // Read csv
@@ -30,21 +30,21 @@ 
 
             } else {
 
-            	// Drop ignore columns
+                // Drop ignore columns
                 $data = array_combine( $import->model_map, $csv_line );
                 unset( $data[''] );
 
                 // Call user callback with data
                 if ( $callback( $data ) ) {
 
-                	// If successful -> update imported rows
-                	$import->row_imported = $import->row_imported + 1;
+                    // If successful -> update imported rows
+                    $import->row_imported = $import->row_imported + 1;
 
                 }
 
-				// Update porcessed rows
-	            $import->row_processed = $processed_row;
-	            $import->save();
+                // Update porcessed rows
+                $import->row_processed = $processed_row;
+                $import->save();
 
                 $processed_row++;
             }
@@ -58,5 +58,5 @@ 
         $import->completed_at = Carbon::now();
         $import->save();
 
-	}
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -15,15 +15,15 @@ 
         $csv_header = true;
 
         // Read csv
-        $file = fopen( storage_path( 'app/' . $import->file ), 'r' );
+        $file = fopen(storage_path('app/'.$import->file), 'r');
 
         // Processed csv rows
         $processed_row = 1;
 
         // Go over csv data line by line
-        while ( $csv_line = fgetcsv( $file ) ) {
+        while ($csv_line = fgetcsv($file)) {
 
-            if ( $csv_header ) {
+            if ($csv_header) {
 
                 // Skip csv header
                 $csv_header = false;
@@ -31,11 +31,11 @@ 
             } else {
 
             	// Drop ignore columns
-                $data = array_combine( $import->model_map, $csv_line );
-                unset( $data[''] );
+                $data = array_combine($import->model_map, $csv_line);
+                unset($data['']);
 
                 // Call user callback with data
-                if ( $callback( $data ) ) {
+                if ($callback($data)) {
 
                 	// If successful -> update imported rows
                 	$import->row_imported = $import->row_imported + 1;
@@ -52,7 +52,7 @@ 
         }
 
         // Close csv file
-        fclose( $file );
+        fclose($file);
 
         // Update import as done
         $import->completed_at = Carbon::now();

src/Jobs/ExportJob.php

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
     public function handle()
     {
         // Custom file path
-        $file_path = date( 'Y/m' );
+        $file_path = date('Y/m');
 
         // Export instance assign to variable
         $export = $this->export;
@@ -47,19 +47,19 @@ 
         $export->save();
 
         // Create export file
-        $excel = Excel::create( 'export-' . date( 'dmYhis' ), function($excel) use ($export) {
+        $excel = Excel::create('export-'.date('dmYhis'), function($excel) use ($export) {
 
             // Create new sheet
-            $excel->sheet( 'export', function($sheet) use ($export) {
+            $excel->sheet('export', function($sheet) use ($export) {
 
                 // Retrive data in chunk
-                $export->query->chunk( 10, function($data) use ($export, $sheet) {
+                $export->query->chunk(10, function($data) use ($export, $sheet) {
 
                     // Process chunk data
-                    foreach ( $data as $row ) {
+                    foreach ($data as $row) {
                         
                         // Append row to sheet
-                        $sheet->appendRow( $row->toArray() );
+                        $sheet->appendRow($row->toArray());
 
                     }
 
@@ -71,10 +71,10 @@ 
 
             });
 
-        })->store( $this->export->type, storage_path( 'app/exports/' . $file_path ), true );
+        })->store($this->export->type, storage_path('app/exports/'.$file_path), true);
 
         // Update export data
-        $export->file = $file_path . '/' . $excel['file'];
+        $export->file = $file_path.'/'.$excel['file'];
         $export->completed_at = Carbon::now();
         $export->save();
 

src/routes.php

Spacing +4 added lines, -4 removed lines

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

src/Import.php

Spacing +31 added lines, -31 removed lines

@@ -26,7 +26,7 @@ 
     {
         $route = $this->upload_route;
 
-        return view( 'importexport::import.import', compact( 'route' ) );
+        return view('importexport::import.import', compact('route'));
     }
 
 
@@ -42,7 +42,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
         ]);
 
@@ -63,18 +63,18 @@ 
             'file' => 'required|mimes:csv,txt'
         ]);
 
-        if ( $validation->fails() ) {
+        if ($validation->fails()) {
             // Set validator errors
             $this->import_errors = $validation->errors();
 
             return ['status' => 'failed'];
         }
 
-        return Plupload::receive('file', function ($file) {
+        return Plupload::receive('file', function($file) {
 
             // Upload file to storage/app/imports
-            $path = Storage::putFileAs( 'imports', $file,
-                'import-' . time() . '.' . $file->getClientOriginalExtension() );           
+            $path = Storage::putFileAs('imports', $file,
+                'import-'.time().'.'.$file->getClientOriginalExtension());           
 
             return ['status' => 'ready', 'path' => $path];
         });
@@ -89,9 +89,9 @@ 
     public function showImportStatus($id)
     {
         // Map import instance
-        $import = ModelImport::findOrFail( $id );
+        $import = ModelImport::findOrFail($id);
 
-        return view( 'importexport::import.progress', compact( 'id' ) );
+        return view('importexport::import.progress', compact('id'));
     }
 
     /**
@@ -103,22 +103,22 @@ 
     public function showColumnsMapForm($id)
     {
         // Map import instance
-        $import = ModelImport::findOrFail( $id );
+        $import = ModelImport::findOrFail($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 > 5 ) break;
+            if ($read_line > 5) break;
 
             $read_line++;
         }
         
-        fclose( $file );
+        fclose($file);
 
         // Get fillable columns
         $db_columns = $import->db_cols;
@@ -126,7 +126,7 @@ 
         // Set post route
         $route = $this->import_map_route;
 
-        return view( 'importexport::import.data_map', compact( 'db_columns', 'csv_data', 'id', 'route' ) );
+        return view('importexport::import.data_map', compact('db_columns', 'csv_data', 'id', 'route'));
     }
 
     /**
@@ -139,7 +139,7 @@ 
     public function storeColumnsMap(Request $request, $id)
     {
         // Map import instance
-        $import = ModelImport::findOrFail( $id );
+        $import = ModelImport::findOrFail($id);
 
         // Get fillable columns
         $db_columns = $import->db_cols;
@@ -149,25 +149,25 @@ 
             'db_column' => [
                 'required',
                 'array',
-                Rule::in( $db_columns ),
-                'size:' . count( $db_columns ),
+                Rule::in($db_columns),
+                'size:'.count($db_columns),
             ],
             'db_column.*' => 'distinct',
             'ignore_col' => 'sometimes|array',
         ],
         [
-            'required' => implode(', ', $db_columns) . ' are the mandatory columns',
-            'in' => implode(', ', $db_columns) . ' are the mandatory columns',
-            'size' => implode(', ', $db_columns) . ' are the mandatory columns',
+            'required' => implode(', ', $db_columns).' are the mandatory columns',
+            'in' => implode(', ', $db_columns).' are the mandatory columns',
+            'size' => implode(', ', $db_columns).' are the mandatory columns',
             'distinct' => 'You can not select one column more than one time',
         ])->validate();
 
         $db_column = $request->db_column;
 
         // Push ignore column to db_column if exists
-        if ( ! is_null( $request->ignore_col ) ) {
-            foreach ( $request->ignore_col as $col_no ) {
-                array_splice( $db_column, $col_no, 0, '');
+        if (!is_null($request->ignore_col)) {
+            foreach ($request->ignore_col as $col_no) {
+                array_splice($db_column, $col_no, 0, '');
             }
         }
 
@@ -179,10 +179,10 @@ 
         return $import;
     }
 
-    public function dispatchImportJob( $job, ModelImport $import)
+    public function dispatchImportJob($job, ModelImport $import)
     {
         // Dispatch import corn job
-        $job::dispatch( $import )->onQueue( 'importing' );
+        $job::dispatch($import)->onQueue('importing');
         
     }
 
@@ -195,7 +195,7 @@ 
     public function removeImport($id)
     {
         // Remove a import from db
-        return ModelImport::findOrFail( $id )->delete();
+        return ModelImport::findOrFail($id)->delete();
     }
 
     /**
@@ -207,17 +207,17 @@ 
     public function returnImportProgress($id)
     {
         // Map import instance
-        $import = ModelImport::findOrFail( $id );
+        $import = ModelImport::findOrFail($id);
 
         $data['status'] = 200;
-        $data['progress'] = round( ( $import->row_processed / $import->file_rows ) * 100 );
+        $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);
     }
 
     /**
@@ -227,7 +227,7 @@ 
      */
     public function getImportErrors()
     {
-        return [ 'errors' => $this->import_errors ];
+        return ['errors' => $this->import_errors];
     }
 
     /**

Braces +3 added lines, -1 removed lines

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