Inspection of "changes" - SherifElfadaly/Laravel-Api-Skeleton - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 03841e...c8ea4b )

by Sherif

created 2016-03-31 12:57 UTC

Status

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

@@ -12,71 +12,71 @@
 block discarded – undo
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['settings'])->delete();
 
 		/**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Users model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'settings',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	]
-        	]
-        );
+		 * Insert the permissions related to this module.
+		 */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'settings',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['settings'])->select('id')->lists('id');

Please login to merge, or discard this patch.

Logging/Database/Migrations/2016_01_24_123631_initialize_logging.php 1 patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -12,65 +12,65 @@
 block discarded – undo
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['logs'])->delete();
 
 		 /**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Logs model permissions.
-        		 */
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'logs',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-        	]
-        );
+		  * Insert the permissions related to this module.
+		  */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Logs model permissions.
+				 */
+				[
+				'name'       => 'find',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'logs',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['logs'])->select('id')->lists('id');

Please login to merge, or discard this patch.

src/Modules/Reporting/Database/Migrations/2016_01_24_123631_initialize.php 1 patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

@@ -12,71 +12,71 @@
 block discarded – undo
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['reports'])->delete();
 
 		/**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Reporting model permissions.
-        		 */
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'admin_count',
-	        	'model'      => 'reports',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	]
-        	]
-        );
+		 * Insert the permissions related to this module.
+		 */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Reporting model permissions.
+				 */
+				[
+				'name'       => 'find',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'admin_count',
+				'model'      => 'reports',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['reports'])->select('id')->lists('id');

Please login to merge, or discard this patch.

Modules/Reporting/Database/Migrations/2016_01_19_112603_sampel_report.php 2 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -22,15 +22,15 @@
 block discarded – undo
 			");
 		
 		DB::table('reports')->insert(
-        	[
-	        	[
+			[
+				[
 				'report_name' => 'admin_count',
 				'view_name'   => 'admin_count',
 				'created_at'  => \DB::raw('NOW()'),
 				'updated_at'  => \DB::raw('NOW()')
-	        	]
-        	]
-        );
+				]
+			]
+		);
 	}
 
 	/**

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -12,8 +12,8 @@
 block discarded – undo
 	 */
 	public function up()
 	{
-		DB::statement( "DROP VIEW IF EXISTS admin_count");
-		DB::statement( "CREATE VIEW admin_count AS  
+		DB::statement("DROP VIEW IF EXISTS admin_count");
+		DB::statement("CREATE VIEW admin_count AS  
 			select count(u.id)
 			from users u, groups g ,users_groups ug
 			where

Please login to merge, or discard this patch.

src/Modules/Reporting/Database/Migrations/2016_01_19_112350_reports.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@
 block discarded – undo
 			$table->string('view_name',100);
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -12,10 +12,10 @@
 block discarded – undo
 	 */
 	public function up()
 	{
-		Schema::create('reports', function (Blueprint $table) {
+		Schema::create('reports', function(Blueprint $table) {
 			$table->increments('id');
-			$table->string('report_name',100);
-			$table->string('view_name',100);
+			$table->string('report_name', 100);
+			$table->string('view_name', 100);
 			$table->softDeletes();
 			$table->timestamps();
         });

Please login to merge, or discard this patch.

src/Modules/Reporting/Report.php 2 patches

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
 
 class Report extends Model{
 
-    use SoftDeletes;
+	use SoftDeletes;
 	protected $table    = 'reports';
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
 	protected $hidden   = ['deleted_at'];
@@ -13,22 +13,22 @@  discard block
 block discarded – undo
 	protected $fillable = ['report_name', 'view_name'];
 
 	public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-    }
+	public static function boot()
+	{
+		parent::boot();
+	}
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@
 block discarded – undo
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Report extends Model{
+class Report extends Model {
 
     use SoftDeletes;
 	protected $table    = 'reports';

Please login to merge, or discard this patch.

Database/Migrations/2016_01_24_123631_initialize_notifications.php 1 patch

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

@@ -12,77 +12,77 @@
 block discarded – undo
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['notifications'])->delete();
 
 		/**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Logs model permissions.
-        		 */
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'notified',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'notifyall',
-	        	'model'      => 'notifications',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-        	]
-        );
+		 * Insert the permissions related to this module.
+		 */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Logs model permissions.
+				 */
+				[
+				'name'       => 'find',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'notified',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'notifyall',
+				'model'      => 'notifications',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['notifications'])->select('id')->lists('id');

Please login to merge, or discard this patch.

src/Kernel.php 1 patch

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -7,44 +7,44 @@
 block discarded – undo
 class Kernel extends HttpKernel
 {
 
-    /**
-     * The application's global HTTP middleware stack.
-     *
-     * These middleware are run during every request to your application.
-     *
-     * @var array
-     */
-    protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-    ];
+	/**
+	 * The application's global HTTP middleware stack.
+	 *
+	 * These middleware are run during every request to your application.
+	 *
+	 * @var array
+	 */
+	protected $middleware = [
+		\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+	];
 
-    /**
-     * The application's global HTTP middleware stack.
-     *
-     * @var array
-     */
-    protected $middlewareGroups = [
-        'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            //\App\Http\Middleware\VerifyCsrfToken::class,
-        ],
-        'api' => [
-            'throttle:60,1',
-        ],
-    ];
+	/**
+	 * The application's global HTTP middleware stack.
+	 *
+	 * @var array
+	 */
+	protected $middlewareGroups = [
+		'web' => [
+			\App\Http\Middleware\EncryptCookies::class,
+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+			\Illuminate\Session\Middleware\StartSession::class,
+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,
+			//\App\Http\Middleware\VerifyCsrfToken::class,
+		],
+		'api' => [
+			'throttle:60,1',
+		],
+	];
 
-    /**
-     * The application's route middleware.
-     *
-     * @var array
-     */
-    protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-    ];
+	/**
+	 * The application's route middleware.
+	 *
+	 * @var array
+	 */
+	protected $routeMiddleware = [
+		'auth' => \App\Http\Middleware\Authenticate::class,
+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+		'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+	];
 }

Please login to merge, or discard this patch.

src/Modules/Reporting/Repositories/ReportRepository.php 2 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@
 block discarded – undo
      *
      * @param  array   $conditions array of conditions
      * @param  array   $relations
-     * @param  array   $colunmns
+     * @param  array   $columns
      * @return object
      */
     public function first($conditions, $relations = [], $columns = array('*'))

Please login to merge, or discard this patch.

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -11,60 +11,60 @@
 block discarded – undo
 	 */
 	protected function getModel()
 	{
-        $apiVersion = \Request::header('api-version') ?: 1;
+		$apiVersion = \Request::header('api-version') ?: 1;
 		return 'App\Modules\Reporting\Report';
 	}
 
 	/**
-     * Render the given report db view.
-     * 
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = array('*'))
-    {
+	 * Render the given report db view.
+	 * 
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = array('*'))
+	{
 		$report = call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
 
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            $error = $this->errorHandler->noPermissions();
-            abort($error['status'], $error['message']);
-        }
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			$error = $this->errorHandler->noPermissions();
+			abort($error['status'], $error['message']);
+		}
 
 		if ( ! $report) 
 		{
 			$error = $this->errorHandler->notFound('report');
 			abort($error['status'], $error['message']);
 		}
-        return \DB::table($report->view_name)->get();
-    }
+		return \DB::table($report->view_name)->get();
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $colunmns
-     * @return object
-     */
-    public function first($conditions, $relations = [], $columns = array('*'))
-    {
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $colunmns
+	 * @return object
+	 */
+	public function first($conditions, $relations = [], $columns = array('*'))
+	{
 		$conditions = $this->constructConditions($conditions);
 		$report     = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
         
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            $error = $this->errorHandler->noPermissions();
-            abort($error['status'], $error['message']);
-        }
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			$error = $this->errorHandler->noPermissions();
+			abort($error['status'], $error['message']);
+		}
 		if ( ! $report) 
 		{
 			$error = $this->errorHandler->notFound('report');
 			abort($error['status'], $error['message']);
 		}
-        return \DB::table($report->view_name)->get();  
-    }
+		return \DB::table($report->view_name)->get();  
+	}
 }

Please login to merge, or discard this patch.

		@@ -12,71 +12,71 @@
		block discarded – undo
12	12	*/
13	13	public function up()
14	14	{
15		- /**
16		- * Delete previous permissions.
17		- */
	15	+ /**
	16	+ * Delete previous permissions.
	17	+ */
18	18	DB::table('permissions')->whereIn('model', ['settings'])->delete();
19	19
20	20	/**
21		- * Insert the permissions related to this module.
22		- */
23		- DB::table('permissions')->insert(
24		- [
25		- /**
26		- * Users model permissions.
27		- */
28		- [
29		- 'name' => 'save',
30		- 'model' => 'settings',
31		- 'created_at' => \DB::raw('NOW()'),
32		- 'updated_at' => \DB::raw('NOW()')
33		- ],
34		- [
35		- 'name' => 'find',
36		- 'model' => 'settings',
37		- 'created_at' => \DB::raw('NOW()'),
38		- 'updated_at' => \DB::raw('NOW()')
39		- ],
40		- [
41		- 'name' => 'search',
42		- 'model' => 'settings',
43		- 'created_at' => \DB::raw('NOW()'),
44		- 'updated_at' => \DB::raw('NOW()')
45		- ],
46		- [
47		- 'name' => 'list',
48		- 'model' => 'settings',
49		- 'created_at' => \DB::raw('NOW()'),
50		- 'updated_at' => \DB::raw('NOW()')
51		- ],
52		- [
53		- 'name' => 'findby',
54		- 'model' => 'settings',
55		- 'created_at' => \DB::raw('NOW()'),
56		- 'updated_at' => \DB::raw('NOW()')
57		- ],
58		- [
59		- 'name' => 'first',
60		- 'model' => 'settings',
61		- 'created_at' => \DB::raw('NOW()'),
62		- 'updated_at' => \DB::raw('NOW()')
63		- ],
64		- [
65		- 'name' => 'paginate',
66		- 'model' => 'settings',
67		- 'created_at' => \DB::raw('NOW()'),
68		- 'updated_at' => \DB::raw('NOW()')
69		- ],
70		- [
71		- 'name' => 'paginateby',
72		- 'model' => 'settings',
73		- 'created_at' => \DB::raw('NOW()'),
74		- 'updated_at' => \DB::raw('NOW()')
75		- ]
76		- ]
77		- );
	21	+ * Insert the permissions related to this module.
	22	+ */
	23	+ DB::table('permissions')->insert(
	24	+ [
	25	+ /**
	26	+ * Users model permissions.
	27	+ */
	28	+ [
	29	+ 'name' => 'save',
	30	+ 'model' => 'settings',
	31	+ 'created_at' => \DB::raw('NOW()'),
	32	+ 'updated_at' => \DB::raw('NOW()')
	33	+ ],
	34	+ [
	35	+ 'name' => 'find',
	36	+ 'model' => 'settings',
	37	+ 'created_at' => \DB::raw('NOW()'),
	38	+ 'updated_at' => \DB::raw('NOW()')
	39	+ ],
	40	+ [
	41	+ 'name' => 'search',
	42	+ 'model' => 'settings',
	43	+ 'created_at' => \DB::raw('NOW()'),
	44	+ 'updated_at' => \DB::raw('NOW()')
	45	+ ],
	46	+ [
	47	+ 'name' => 'list',
	48	+ 'model' => 'settings',
	49	+ 'created_at' => \DB::raw('NOW()'),
	50	+ 'updated_at' => \DB::raw('NOW()')
	51	+ ],
	52	+ [
	53	+ 'name' => 'findby',
	54	+ 'model' => 'settings',
	55	+ 'created_at' => \DB::raw('NOW()'),
	56	+ 'updated_at' => \DB::raw('NOW()')
	57	+ ],
	58	+ [
	59	+ 'name' => 'first',
	60	+ 'model' => 'settings',
	61	+ 'created_at' => \DB::raw('NOW()'),
	62	+ 'updated_at' => \DB::raw('NOW()')
	63	+ ],
	64	+ [
	65	+ 'name' => 'paginate',
	66	+ 'model' => 'settings',
	67	+ 'created_at' => \DB::raw('NOW()'),
	68	+ 'updated_at' => \DB::raw('NOW()')
	69	+ ],
	70	+ [
	71	+ 'name' => 'paginateby',
	72	+ 'model' => 'settings',
	73	+ 'created_at' => \DB::raw('NOW()'),
	74	+ 'updated_at' => \DB::raw('NOW()')
	75	+ ]
	76	+ ]
	77	+ );
78	78
79		- /**
	79	+ /**
80	80	* Assign the permissions to the admin group.
81	81	*/
82	82	$permissionIds = DB::table('permissions')->whereIn('model', ['settings'])->select('id')->lists('id');

		@@ -12,65 +12,65 @@
		block discarded – undo
12	12	*/
13	13	public function up()
14	14	{
15		- /**
16		- * Delete previous permissions.
17		- */
	15	+ /**
	16	+ * Delete previous permissions.
	17	+ */
18	18	DB::table('permissions')->whereIn('model', ['logs'])->delete();
19	19
20	20	/**
21		- * Insert the permissions related to this module.
22		- */
23		- DB::table('permissions')->insert(
24		- [
25		- /**
26		- * Logs model permissions.
27		- */
28		- [
29		- 'name' => 'find',
30		- 'model' => 'logs',
31		- 'created_at' => \DB::raw('NOW()'),
32		- 'updated_at' => \DB::raw('NOW()')
33		- ],
34		- [
35		- 'name' => 'search',
36		- 'model' => 'logs',
37		- 'created_at' => \DB::raw('NOW()'),
38		- 'updated_at' => \DB::raw('NOW()')
39		- ],
40		- [
41		- 'name' => 'list',
42		- 'model' => 'logs',
43		- 'created_at' => \DB::raw('NOW()'),
44		- 'updated_at' => \DB::raw('NOW()')
45		- ],
46		- [
47		- 'name' => 'findby',
48		- 'model' => 'logs',
49		- 'created_at' => \DB::raw('NOW()'),
50		- 'updated_at' => \DB::raw('NOW()')
51		- ],
52		- [
53		- 'name' => 'first',
54		- 'model' => 'logs',
55		- 'created_at' => \DB::raw('NOW()'),
56		- 'updated_at' => \DB::raw('NOW()')
57		- ],
58		- [
59		- 'name' => 'paginate',
60		- 'model' => 'logs',
61		- 'created_at' => \DB::raw('NOW()'),
62		- 'updated_at' => \DB::raw('NOW()')
63		- ],
64		- [
65		- 'name' => 'paginateby',
66		- 'model' => 'logs',
67		- 'created_at' => \DB::raw('NOW()'),
68		- 'updated_at' => \DB::raw('NOW()')
69		- ],
70		- ]
71		- );
	21	+ * Insert the permissions related to this module.
	22	+ */
	23	+ DB::table('permissions')->insert(
	24	+ [
	25	+ /**
	26	+ * Logs model permissions.
	27	+ */
	28	+ [
	29	+ 'name' => 'find',
	30	+ 'model' => 'logs',
	31	+ 'created_at' => \DB::raw('NOW()'),
	32	+ 'updated_at' => \DB::raw('NOW()')
	33	+ ],
	34	+ [
	35	+ 'name' => 'search',
	36	+ 'model' => 'logs',
	37	+ 'created_at' => \DB::raw('NOW()'),
	38	+ 'updated_at' => \DB::raw('NOW()')
	39	+ ],
	40	+ [
	41	+ 'name' => 'list',
	42	+ 'model' => 'logs',
	43	+ 'created_at' => \DB::raw('NOW()'),
	44	+ 'updated_at' => \DB::raw('NOW()')
	45	+ ],
	46	+ [
	47	+ 'name' => 'findby',
	48	+ 'model' => 'logs',
	49	+ 'created_at' => \DB::raw('NOW()'),
	50	+ 'updated_at' => \DB::raw('NOW()')
	51	+ ],
	52	+ [
	53	+ 'name' => 'first',
	54	+ 'model' => 'logs',
	55	+ 'created_at' => \DB::raw('NOW()'),
	56	+ 'updated_at' => \DB::raw('NOW()')
	57	+ ],
	58	+ [
	59	+ 'name' => 'paginate',
	60	+ 'model' => 'logs',
	61	+ 'created_at' => \DB::raw('NOW()'),
	62	+ 'updated_at' => \DB::raw('NOW()')
	63	+ ],
	64	+ [
	65	+ 'name' => 'paginateby',
	66	+ 'model' => 'logs',
	67	+ 'created_at' => \DB::raw('NOW()'),
	68	+ 'updated_at' => \DB::raw('NOW()')
	69	+ ],
	70	+ ]
	71	+ );
72	72
73		- /**
	73	+ /**
74	74	* Assign the permissions to the admin group.
75	75	*/
76	76	$permissionIds = DB::table('permissions')->whereIn('model', ['logs'])->select('id')->lists('id');

		@@ -22,15 +22,15 @@
		block discarded – undo
22	22	");
23	23
24	24	DB::table('reports')->insert(
25		- [
26		- [
	25	+ [
	26	+ [
27	27	'report_name' => 'admin_count',
28	28	'view_name' => 'admin_count',
29	29	'created_at' => \DB::raw('NOW()'),
30	30	'updated_at' => \DB::raw('NOW()')
31		- ]
32		- ]
33		- );
	31	+ ]
	32	+ ]
	33	+ );
34	34	}
35	35
36	36	/**

		@@ -12,8 +12,8 @@
		block discarded – undo
12	12	*/
13	13	public function up()
14	14	{
15		- DB::statement( "DROP VIEW IF EXISTS admin_count");
16		- DB::statement( "CREATE VIEW admin_count AS
	15	+ DB::statement("DROP VIEW IF EXISTS admin_count");
	16	+ DB::statement("CREATE VIEW admin_count AS
17	17	select count(u.id)
18	18	from users u, groups g ,users_groups ug
19	19	where

		@@ -18,7 +18,7 @@
		block discarded – undo
18	18	$table->string('view_name',100);
19	19	$table->softDeletes();
20	20	$table->timestamps();
21		- });
	21	+ });
22	22	}
23	23
24	24	/**

		@@ -12,10 +12,10 @@
		block discarded – undo
12	12	*/
13	13	public function up()
14	14	{
15		- Schema::create('reports', function (Blueprint $table) {
	15	+ Schema::create('reports', function(Blueprint $table) {
16	16	$table->increments('id');
17		- $table->string('report_name',100);
18		- $table->string('view_name',100);
	17	+ $table->string('report_name', 100);
	18	+ $table->string('view_name', 100);
19	19	$table->softDeletes();
20	20	$table->timestamps();
21	21	});

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5
6	6	class Report extends Model{
7	7
8		- use SoftDeletes;
	8	+ use SoftDeletes;
9	9	protected $table = 'reports';
10	10	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
11	11	protected $hidden = ['deleted_at'];
		@@ -13,22 +13,22 @@ discard block
		block discarded – undo
13	13	protected $fillable = ['report_name', 'view_name'];
14	14
15	15	public function getCreatedAtAttribute($value)
16		- {
17		- return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
18		- }
	16	+ {
	17	+ return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
	18	+ }
19	19
20		- public function getUpdatedAtAttribute($value)
21		- {
22		- return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
23		- }
	20	+ public function getUpdatedAtAttribute($value)
	21	+ {
	22	+ return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
	23	+ }
24	24
25		- public function getDeletedAtAttribute($value)
26		- {
27		- return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
28		- }
	25	+ public function getDeletedAtAttribute($value)
	26	+ {
	27	+ return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
	28	+ }
29	29
30		- public static function boot()
31		- {
32		- parent::boot();
33		- }
	30	+ public static function boot()
	31	+ {
	32	+ parent::boot();
	33	+ }
34	34	}

		@@ -3,7 +3,7 @@
		block discarded – undo
3	3	use Illuminate\Database\Eloquent\Model;
4	4	use Illuminate\Database\Eloquent\SoftDeletes;
5	5
6		-class Report extends Model{
	6	+class Report extends Model {
7	7
8	8	use SoftDeletes;
9	9	protected $table = 'reports';

		@@ -12,77 +12,77 @@
		block discarded – undo
12	12	*/
13	13	public function up()
14	14	{
15		- /**
16		- * Delete previous permissions.
17		- */
	15	+ /**
	16	+ * Delete previous permissions.
	17	+ */
18	18	DB::table('permissions')->whereIn('model', ['notifications'])->delete();
19	19
20	20	/**
21		- * Insert the permissions related to this module.
22		- */
23		- DB::table('permissions')->insert(
24		- [
25		- /**
26		- * Logs model permissions.
27		- */
28		- [
29		- 'name' => 'find',
30		- 'model' => 'notifications',
31		- 'created_at' => \DB::raw('NOW()'),
32		- 'updated_at' => \DB::raw('NOW()')
33		- ],
34		- [
35		- 'name' => 'search',
36		- 'model' => 'notifications',
37		- 'created_at' => \DB::raw('NOW()'),
38		- 'updated_at' => \DB::raw('NOW()')
39		- ],
40		- [
41		- 'name' => 'list',
42		- 'model' => 'notifications',
43		- 'created_at' => \DB::raw('NOW()'),
44		- 'updated_at' => \DB::raw('NOW()')
45		- ],
46		- [
47		- 'name' => 'findby',
48		- 'model' => 'notifications',
49		- 'created_at' => \DB::raw('NOW()'),
50		- 'updated_at' => \DB::raw('NOW()')
51		- ],
52		- [
53		- 'name' => 'first',
54		- 'model' => 'notifications',
55		- 'created_at' => \DB::raw('NOW()'),
56		- 'updated_at' => \DB::raw('NOW()')
57		- ],
58		- [
59		- 'name' => 'paginate',
60		- 'model' => 'notifications',
61		- 'created_at' => \DB::raw('NOW()'),
62		- 'updated_at' => \DB::raw('NOW()')
63		- ],
64		- [
65		- 'name' => 'paginateby',
66		- 'model' => 'notifications',
67		- 'created_at' => \DB::raw('NOW()'),
68		- 'updated_at' => \DB::raw('NOW()')
69		- ],
70		- [
71		- 'name' => 'notified',
72		- 'model' => 'notifications',
73		- 'created_at' => \DB::raw('NOW()'),
74		- 'updated_at' => \DB::raw('NOW()')
75		- ],
76		- [
77		- 'name' => 'notifyall',
78		- 'model' => 'notifications',
79		- 'created_at' => \DB::raw('NOW()'),
80		- 'updated_at' => \DB::raw('NOW()')
81		- ],
82		- ]
83		- );
	21	+ * Insert the permissions related to this module.
	22	+ */
	23	+ DB::table('permissions')->insert(
	24	+ [
	25	+ /**
	26	+ * Logs model permissions.
	27	+ */
	28	+ [
	29	+ 'name' => 'find',
	30	+ 'model' => 'notifications',
	31	+ 'created_at' => \DB::raw('NOW()'),
	32	+ 'updated_at' => \DB::raw('NOW()')
	33	+ ],
	34	+ [
	35	+ 'name' => 'search',
	36	+ 'model' => 'notifications',
	37	+ 'created_at' => \DB::raw('NOW()'),
	38	+ 'updated_at' => \DB::raw('NOW()')
	39	+ ],
	40	+ [
	41	+ 'name' => 'list',
	42	+ 'model' => 'notifications',
	43	+ 'created_at' => \DB::raw('NOW()'),
	44	+ 'updated_at' => \DB::raw('NOW()')
	45	+ ],
	46	+ [
	47	+ 'name' => 'findby',
	48	+ 'model' => 'notifications',
	49	+ 'created_at' => \DB::raw('NOW()'),
	50	+ 'updated_at' => \DB::raw('NOW()')
	51	+ ],
	52	+ [
	53	+ 'name' => 'first',
	54	+ 'model' => 'notifications',
	55	+ 'created_at' => \DB::raw('NOW()'),
	56	+ 'updated_at' => \DB::raw('NOW()')
	57	+ ],
	58	+ [
	59	+ 'name' => 'paginate',
	60	+ 'model' => 'notifications',
	61	+ 'created_at' => \DB::raw('NOW()'),
	62	+ 'updated_at' => \DB::raw('NOW()')
	63	+ ],
	64	+ [
	65	+ 'name' => 'paginateby',
	66	+ 'model' => 'notifications',
	67	+ 'created_at' => \DB::raw('NOW()'),
	68	+ 'updated_at' => \DB::raw('NOW()')
	69	+ ],
	70	+ [
	71	+ 'name' => 'notified',
	72	+ 'model' => 'notifications',
	73	+ 'created_at' => \DB::raw('NOW()'),
	74	+ 'updated_at' => \DB::raw('NOW()')
	75	+ ],
	76	+ [
	77	+ 'name' => 'notifyall',
	78	+ 'model' => 'notifications',
	79	+ 'created_at' => \DB::raw('NOW()'),
	80	+ 'updated_at' => \DB::raw('NOW()')
	81	+ ],
	82	+ ]
	83	+ );
84	84
85		- /**
	85	+ /**
86	86	* Assign the permissions to the admin group.
87	87	*/
88	88	$permissionIds = DB::table('permissions')->whereIn('model', ['notifications'])->select('id')->lists('id');

		@@ -7,44 +7,44 @@
		block discarded – undo
7	7	class Kernel extends HttpKernel
8	8	{
9	9
10		- /**
11		- * The application's global HTTP middleware stack.
12		- *
13		- * These middleware are run during every request to your application.
14		- *
15		- * @var array
16		- */
17		- protected $middleware = [
18		- \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
19		- ];
	10	+ /**
	11	+ * The application's global HTTP middleware stack.
	12	+ *
	13	+ * These middleware are run during every request to your application.
	14	+ *
	15	+ * @var array
	16	+ */
	17	+ protected $middleware = [
	18	+ \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
	19	+ ];
20	20
21		- /**
22		- * The application's global HTTP middleware stack.
23		- *
24		- * @var array
25		- */
26		- protected $middlewareGroups = [
27		- 'web' => [
28		- \App\Http\Middleware\EncryptCookies::class,
29		- \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
30		- \Illuminate\Session\Middleware\StartSession::class,
31		- \Illuminate\View\Middleware\ShareErrorsFromSession::class,
32		- //\App\Http\Middleware\VerifyCsrfToken::class,
33		- ],
34		- 'api' => [
35		- 'throttle:60,1',
36		- ],
37		- ];
	21	+ /**
	22	+ * The application's global HTTP middleware stack.
	23	+ *
	24	+ * @var array
	25	+ */
	26	+ protected $middlewareGroups = [
	27	+ 'web' => [
	28	+ \App\Http\Middleware\EncryptCookies::class,
	29	+ \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
	30	+ \Illuminate\Session\Middleware\StartSession::class,
	31	+ \Illuminate\View\Middleware\ShareErrorsFromSession::class,
	32	+ //\App\Http\Middleware\VerifyCsrfToken::class,
	33	+ ],
	34	+ 'api' => [
	35	+ 'throttle:60,1',
	36	+ ],
	37	+ ];
38	38
39		- /**
40		- * The application's route middleware.
41		- *
42		- * @var array
43		- */
44		- protected $routeMiddleware = [
45		- 'auth' => \App\Http\Middleware\Authenticate::class,
46		- 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
47		- 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
48		- 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
49		- ];
	39	+ /**
	40	+ * The application's route middleware.
	41	+ *
	42	+ * @var array
	43	+ */
	44	+ protected $routeMiddleware = [
	45	+ 'auth' => \App\Http\Middleware\Authenticate::class,
	46	+ 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
	47	+ 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
	48	+ 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
	49	+ ];
50	50	}

		@@ -46,7 +46,7 @@
		block discarded – undo
46	46	*
47	47	* @param array $conditions array of conditions
48	48	* @param array $relations
49		- * @param array $colunmns
	49	+ * @param array $columns
50	50	* @return object
51	51	*/
52	52	public function first($conditions, $relations = [], $columns = array('*'))

		@@ -11,60 +11,60 @@
		block discarded – undo
11	11	*/
12	12	protected function getModel()
13	13	{
14		- $apiVersion = \Request::header('api-version') ?: 1;
	14	+ $apiVersion = \Request::header('api-version') ?: 1;
15	15	return 'App\Modules\Reporting\Report';
16	16	}
17	17
18	18	/**
19		- * Render the given report db view.
20		- *
21		- * @param integer $id
22		- * @param array $relations
23		- * @param array $columns
24		- * @return object
25		- */
26		- public function find($id, $relations = [], $columns = array('*'))
27		- {
	19	+ * Render the given report db view.
	20	+ *
	21	+ * @param integer $id
	22	+ * @param array $relations
	23	+ * @param array $columns
	24	+ * @return object
	25	+ */
	26	+ public function find($id, $relations = [], $columns = array('*'))
	27	+ {
28	28	$report = call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
29	29
30		- if ( ! \Core::users()->can($report->view_name, 'reports'))
31		- {
32		- $error = $this->errorHandler->noPermissions();
33		- abort($error['status'], $error['message']);
34		- }
	30	+ if ( ! \Core::users()->can($report->view_name, 'reports'))
	31	+ {
	32	+ $error = $this->errorHandler->noPermissions();
	33	+ abort($error['status'], $error['message']);
	34	+ }
35	35
36	36	if ( ! $report)
37	37	{
38	38	$error = $this->errorHandler->notFound('report');
39	39	abort($error['status'], $error['message']);
40	40	}
41		- return \DB::table($report->view_name)->get();
42		- }
	41	+ return \DB::table($report->view_name)->get();
	42	+ }
43	43
44		- /**
45		- * Render the given report db view based on the given
46		- * condition.
47		- *
48		- * @param array $conditions array of conditions
49		- * @param array $relations
50		- * @param array $colunmns
51		- * @return object
52		- */
53		- public function first($conditions, $relations = [], $columns = array('*'))
54		- {
	44	+ /**
	45	+ * Render the given report db view based on the given
	46	+ * condition.
	47	+ *
	48	+ * @param array $conditions array of conditions
	49	+ * @param array $relations
	50	+ * @param array $colunmns
	51	+ * @return object
	52	+ */
	53	+ public function first($conditions, $relations = [], $columns = array('*'))
	54	+ {
55	55	$conditions = $this->constructConditions($conditions);
56	56	$report = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
57	57
58		- if ( ! \Core::users()->can($report->view_name, 'reports'))
59		- {
60		- $error = $this->errorHandler->noPermissions();
61		- abort($error['status'], $error['message']);
62		- }
	58	+ if ( ! \Core::users()->can($report->view_name, 'reports'))
	59	+ {
	60	+ $error = $this->errorHandler->noPermissions();
	61	+ abort($error['status'], $error['message']);
	62	+ }
63	63	if ( ! $report)
64	64	{
65	65	$error = $this->errorHandler->notFound('report');
66	66	abort($error['status'], $error['message']);
67	67	}
68		- return \DB::table($report->view_name)->get();
69		- }
	68	+ return \DB::table($report->view_name)->get();
	69	+ }
70	70	}

SherifElfadaly / Laravel-Api-Skeleton

Push — master ( 03841e...c8ea4b )

Status

Category

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch