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');

src/Models/ImportExportLog.php

Indentation +29 added lines, -29 removed lines

@@ -10,23 +10,23 @@ 
 
 
     /**
-    * Relationship with import model
-    *
-    * @return void
-    */
+     * Relationship with import model
+     *
+     * @return void
+     */
     public function import()
     {
-    	return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class );
+        return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class );
     }
 
 
     /**
-    * Model Map accessor
-    *
-    * Unserialize data while retriving.
-    * @param $value
-    * @return string
-    */
+     * Model Map accessor
+     *
+     * Unserialize data while retriving.
+     * @param $value
+     * @return string
+     */
     public function getDataAttribute($value)
     {
         return unserialize( $value );
@@ -34,12 +34,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize data while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize data while storing.
+     * @param $value
+     * @return void
+     */
     public function setDataAttribute($value)
     {
         $this->attributes['data'] = serialize( $value );
@@ -47,12 +47,12 @@ 
 
 
     /**
-    * Model Map accessor
-    *
-    * Unserialize message while retriving.
-    * @param $value
-    * @return string
-    */
+     * Model Map accessor
+     *
+     * Unserialize message while retriving.
+     * @param $value
+     * @return string
+     */
     public function getMessageAttribute($value)
     {
         return unserialize( $value );
@@ -60,12 +60,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize message while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize message while storing.
+     * @param $value
+     * @return void
+     */
     public function setMessageAttribute($value)
     {
         $this->attributes['message'] = serialize( $value );

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

Indentation +12 added lines, -12 removed lines

@@ -9,12 +9,12 @@ 
     protected $fillable = [ 'file', 'type', 'query', 'result_rows'];
 
     /**
-    * Query accessor
-    *
-    * Unserialize query while retriving.
-    * @param $value
-    * @return string
-    */
+     * Query accessor
+     *
+     * Unserialize query while retriving.
+     * @param $value
+     * @return string
+     */
     public function getQueryAttribute($value)
     {
         return unserialize( $value );
@@ -22,12 +22,12 @@ 
 
 
     /**
-    * Query mulator
-    *
-    * Serialize query while storing.
-    * @param $value
-    * @return void
-    */
+     * Query mulator
+     *
+     * Serialize query while storing.
+     * @param $value
+     * @return void
+     */
     public function setQueryAttribute($value)
     {
         $this->attributes['query'] = serialize( $value );

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

Indentation +30 added lines, -30 removed lines

@@ -6,27 +6,27 @@ 
 
 class Import extends Model
 {
-	protected $fillable = ['file', 'file_rows', 'db_cols', 'row_processed'];
+    protected $fillable = ['file', 'file_rows', 'db_cols', 'row_processed'];
 
 
     /**
-    * Relationship with import export log model
-    *
-    * @return void
-    */
+     * Relationship with import export log model
+     *
+     * @return void
+     */
     public function importLogs()
     {
-    	return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' );
+        return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' );
     }
 
 
     /**
-    * Model Map accessor
-    *
-    * Unserialize model map while retriving.
-    * @param $value
-    * @return string
-    */
+     * Model Map accessor
+     *
+     * Unserialize model map while retriving.
+     * @param $value
+     * @return string
+     */
     public function getModelMapAttribute($value)
     {
         return unserialize( $value );
@@ -34,12 +34,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize model map while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize model map while storing.
+     * @param $value
+     * @return void
+     */
     public function setModelMapAttribute($value)
     {
         $this->attributes['model_map'] = serialize( $value );
@@ -47,12 +47,12 @@ 
 
 
     /**
-    * DB cols accessor
-    *
-    * Unserialize model map while retriving.
-    * @param $value
-    * @return string
-    */
+     * DB cols accessor
+     *
+     * Unserialize model map while retriving.
+     * @param $value
+     * @return string
+     */
     public function getDbColsAttribute($value)
     {
         return unserialize( $value );
@@ -60,12 +60,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize model map while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize model map while storing.
+     * @param $value
+     * @return void
+     */
     public function setDbColsAttribute($value)
     {
         $this->attributes['db_cols'] = serialize( $value );

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);
     }
 }

src/ImportExportServiceProvider.php

Spacing +14 added lines, -14 removed lines

@@ -14,27 +14,27 @@ 
     public function boot()
     {
         // Register routes
-        $this->loadRoutesFrom( __DIR__ . '/routes.php' );
+        $this->loadRoutesFrom(__DIR__.'/routes.php');
 
         // Register database migrations
-        $this->loadMigrationsFrom( __DIR__ . '/../database/migrations' );
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
         // Load views
-        $this->loadViewsFrom( __DIR__ . '/../resources/views', 'importexport' );
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'importexport');
 
 
         // $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'ladybirdweb');
 
         // Publishing is only necessary when using the CLI.
-        if ( $this->app->runningInConsole() ) {
+        if ($this->app->runningInConsole()) {
 
             // Publishing the configuration file.
             $this->publishes([
-                __DIR__ . '/../config/import.php' => config_path('ladybirdweb/import-export/import.php'),
+                __DIR__.'/../config/import.php' => config_path('ladybirdweb/import-export/import.php'),
             ], 'import-export.config');
             
             $this->publishes([
-                __DIR__ . '/../config/export.php' => config_path('ladybirdweb/import-export/export.php'),
+                __DIR__.'/../config/export.php' => config_path('ladybirdweb/import-export/export.php'),
             ], 'import-export.config');
 
             // Publishing the views.
@@ -58,21 +58,21 @@ 
     public function register()
     {
         // Merge config
-        $this->mergeConfigFrom( __DIR__ . '/../config/import.php', 'import' );
-        $this->mergeConfigFrom( __DIR__ . '/../config/export.php', 'export' );
+        $this->mergeConfigFrom(__DIR__.'/../config/import.php', 'import');
+        $this->mergeConfigFrom(__DIR__.'/../config/export.php', 'export');
 
         // Register fecades
-        $this->app->singleton( 'import', 'Ladybirdweb\ImportExport\Import' );
-        $this->app->singleton( 'importhandler', 'Ladybirdweb\ImportExport\ImportHandler' );
-        $this->app->singleton( 'importexportlog', 'Ladybirdweb\ImportExport\ImportExportLog' );
+        $this->app->singleton('import', 'Ladybirdweb\ImportExport\Import');
+        $this->app->singleton('importhandler', 'Ladybirdweb\ImportExport\ImportHandler');
+        $this->app->singleton('importexportlog', 'Ladybirdweb\ImportExport\ImportExportLog');
 
-        $this->app->singleton( 'export', 'Ladybirdweb\ImportExport\Export' );
+        $this->app->singleton('export', 'Ladybirdweb\ImportExport\Export');
 
         // Register import controller
-        $this->app->singleton( 'Ladybirdweb\ImportExport\Import' );
+        $this->app->singleton('Ladybirdweb\ImportExport\Import');
 
         // Register import handler
-        $this->app->singleton( 'Ladybirdweb\ImportExport\ImportHandler' );
+        $this->app->singleton('Ladybirdweb\ImportExport\ImportHandler');
         
     }
 

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));
     }
 }