Saluki / Barmate

app/Console/Commands/DatabaseFaker.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
         $this->info('This command will truncate all your Barmate data.');
         $this->info("Use this command only for testing purposes.\n");
 
-        if( $this->confirm('Are you sure you want to continue? ', false)==false )
+        if ($this->confirm('Are you sure you want to continue? ', false) == false)
         {
             $this->info('Command aborted');
             return 1;
@@ -62,20 +62,20 @@ 
 
     private function seedUsers($groupId)
     {
-        for($i=0; $i<self::NB_USERS; $i++)
+        for ($i = 0; $i<self::NB_USERS; $i++)
         {
             $firstName = $this->faker->firstName;
             $lastName = $this->faker->lastName;
             $email = strtolower($firstName.'.'.$lastName.'@'.$this->faker->domainName);
 
-            User::create([  'firstname'         => $firstName,
+            User::create(['firstname'         => $firstName,
                             'lastname'          => $lastName,
                             'group_id'          => $groupId,
                             'email'             => $email,
                             'password_hash'     => Hash::make('password'),
-                            'role'              => ( $i%2 == 0 ) ? 'USER' : 'MNGR',
+                            'role'              => ($i % 2 == 0) ? 'USER' : 'MNGR',
                             'inscription_date'  => $this->faker->dateTime,
-                            'is_active'         => ( $i%5 == 0 ) ? false : true ]);
+                            'is_active'         => ($i % 5 == 0) ? false : true]);
         }
 
         $this->info('Added '.self::NB_USERS.' users to the application with password \'password\'.');
@@ -88,20 +88,20 @@ 
         $categories = ['Saison', 'Gueuze', 'Tripel', 'Witbier', 'Dubbel'];
         shuffle($categories);
 
-        foreach($categories as $categoryName)
+        foreach ($categories as $categoryName)
         {
             $category = Categories::create(['group_id'          => $groupId,
                                             'category_title'    => $categoryName]);
 
             $nbProducts = rand(1, self::MAX_NB_PRODUCTS);
 
-            for($i=1; $i<=$nbProducts; $i++)
+            for ($i = 1; $i<=$nbProducts; $i++)
             {
                 Products::create(['category_id' => $category->category_id,
                                     'product_name' => $categoryName.''.$i,
                                     'description' => '',
                                     'price' => rand(1, 4),
-                                    'quantity' => rand(24,48)]);
+                                    'quantity' => rand(24, 48)]);
             }
         }
 

app/Http/Controllers/AccountController.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
         try {
             $this->userRepository->updateAccount(auth()->id(), $request->all());
         }
-        catch(ValidationException $e) {
+        catch (ValidationException $e) {
             return redirect('app/account')->with('error', $e->getMessageBag()->first());
         }
-        catch(RepositoryException $e) {
+        catch (RepositoryException $e) {
             return redirect('app/account')->with('error', 'Could not update settings: '.strtolower($e->getMessage()));
         }
 

app/Http/Controllers/CashController.php

Spacing +10 added lines, -10 removed lines

@@ -117,27 +117,27 @@ 
     private function approximateDuration(Carbon $oldSnapshotTime, Carbon $nextSnapshotTime)
     {
         $years = $oldSnapshotTime->diffInYears($nextSnapshotTime);
-        if( $years > 0 ) {
+        if ($years>0) {
             return ($years == 1) ? "1 year" : "$years years";
         }
 
         $months = $oldSnapshotTime->diffInMonths($nextSnapshotTime);
-        if($months > 0 ) {
+        if ($months>0) {
             return ($months == 1) ? "1 month" : "$months months";
         }
 
         $days = $oldSnapshotTime->diffInDays($nextSnapshotTime);
-        if ($days > 0) {
+        if ($days>0) {
             return ($days == 1) ? "1 day" : "$days days";
         }
 
         $hours = $oldSnapshotTime->diffInHours($nextSnapshotTime);
-        if ($hours > 0) {
+        if ($hours>0) {
             return ($hours == 1) ? "1 hour" : "$hours hours";
         }
 
         $minutes = $oldSnapshotTime->diffInMinutes($nextSnapshotTime);
-        if($minutes > 0) {
+        if ($minutes>0) {
             return ($minutes == 1) ? "1 minute" : "$minutes minutes";
         }
 
@@ -164,12 +164,12 @@ 
         try {
             $this->detailsRepository->store($operationData);
         } catch (RepositoryException $e) {
-            return Redirect::to('app/cash/register-operation')->with('error', 'Could not save operation: ' . $e->getMessage())
+            return Redirect::to('app/cash/register-operation')->with('error', 'Could not save operation: '.$e->getMessage())
                 ->withInput();
         }
 
-        $message = ($amount < 0) ? 'removed ' . abs($amount) . '&euro; from drawer' : 'added ' . $amount . '&euro; in drawer';
-        return Redirect::to('app/cash')->with('success', 'Cash operation saved: ' . $message);
+        $message = ($amount<0) ? 'removed '.abs($amount).'&euro; from drawer' : 'added '.$amount.'&euro; in drawer';
+        return Redirect::to('app/cash')->with('success', 'Cash operation saved: '.$message);
     }
 
     public function snapshotForm()
@@ -184,7 +184,7 @@ 
         try {
             $this->snapshotRepository->store(Input::all());
         } catch (RepositoryException $e) {
-            return Redirect::to('app/cash/new-snapshot')->with('error', 'Error while creating snapshot: ' . $e->getMessage())
+            return Redirect::to('app/cash/new-snapshot')->with('error', 'Error while creating snapshot: '.$e->getMessage())
                 ->withInput();
         }
 
@@ -215,7 +215,7 @@ 
             DB::commit();
 
         } catch (RepositoryException $e) {
-            return redirect('app/cash')->with('error', 'An error occurred: ' . strtolower($e->getMessage()));
+            return redirect('app/cash')->with('error', 'An error occurred: '.strtolower($e->getMessage()));
         }
 
         return redirect('app/cash')->with('success', "Snapshot item removed");

app/Http/Controllers/CategoryController.php

Spacing +25 added lines, -25 removed lines

@@ -18,7 +18,7 @@ 
 	{
 		$categoriesFromGroup = Categories::allAPI();
 
-		return Response::json( $categoriesFromGroup, 200);
+		return Response::json($categoriesFromGroup, 200);
 	}
 
 	/**
@@ -33,8 +33,8 @@ 
     		'description'  => ''
     	]);
 
-    	if( $validator->fails() ) {
-    		return Response::json( ['code'=>1, 'error'=>'Validation failed'], 400);
+    	if ($validator->fails()) {
+    		return Response::json(['code'=>1, 'error'=>'Validation failed'], 400);
     	}
 
 		$category = new Categories();
@@ -43,12 +43,12 @@ 
 		$category->description = Input::get('description');
 		$category->is_active = true;
 
-		if( !$category->save() ) {
+		if (!$category->save()) {
 
-			return Response::json( ['code'=>2, 'error'=>'Database error'], 400);
+			return Response::json(['code'=>2, 'error'=>'Database error'], 400);
 		}
 
-    	return Response::json( ['id' => DB::getPdo()->lastInsertId() ], 200);
+    	return Response::json(['id' => DB::getPdo()->lastInsertId()], 200);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 */
 	public function show($id)
 	{
-		if( !$this->isID($id) )
-			return Response::json( ['code'=>1, 'error'=>'Parameter must be an integer'], 400);
+		if (!$this->isID($id))
+			return Response::json(['code'=>1, 'error'=>'Parameter must be an integer'], 400);
 
 		$category = Categories::fromGroup()->find($id);
 
-		if( $category == null )
+		if ($category == null)
 			return Response::json();
 
 		return Response::json($category, 200);
@@ -85,27 +85,27 @@ 
     		'description'  => ''
     	]);
 
-    	if( $validator->fails() ) {
-    		return Response::json( ['code'=>3, 'error'=>'Validation failed'], 400);
+    	if ($validator->fails()) {
+    		return Response::json(['code'=>3, 'error'=>'Validation failed'], 400);
     	}
 
-		if( !$this->isID($id) )
+		if (!$this->isID($id))
 			return Response::json(['code'=>1, 'error'=>'Parameter must be numeric'], 400);
 
 		$category = Categories::fromGroup()->find($id);
 
-		if( $category == null )
-			return Response::json( ['code'=>2, 'error'=>'Category not found'] , 400);
+		if ($category == null)
+			return Response::json(['code'=>2, 'error'=>'Category not found'], 400);
 
 		$category->category_title = Input::get('title');
 		$category->description = Input::get('description');
 
-		if( !$category->save() ) {
+		if (!$category->save()) {
 
-			return Response::json( ['code'=>2, 'error'=>'Database error'], 400);
+			return Response::json(['code'=>2, 'error'=>'Database error'], 400);
 		}
 
-    	return Response::json( [], 200);
+    	return Response::json([], 200);
 	}
 
 
@@ -117,27 +117,27 @@ 
 	 */
 	public function destroy($id)
 	{
-		if( !$this->isID($id) )
+		if (!$this->isID($id))
 			return Response::json(['code'=>1, 'error'=>'Parameter must be numeric'], 400);
 
 		$category = Categories::fromGroup()->find($id);
 		
-		if( $category == null )
-			return Response::json( ['code'=>2, 'error'=>'Category not found'], 400);
+		if ($category == null)
+			return Response::json(['code'=>2, 'error'=>'Category not found'], 400);
 
 		$products = Categories::find($id)->products()->get();
 
-		if( count($products) != 0 )
-			return Response::json( ['code'=>3, 'error'=>'Category not empty'], 400);
+		if (count($products) != 0)
+			return Response::json(['code'=>3, 'error'=>'Category not empty'], 400);
 
 		try {
 			$category->delete();
 		}
-		catch(\Exception $e) {
-			return Response::json( ['code'=>4, 'error'=>'Database error'], 400);
+		catch (\Exception $e) {
+			return Response::json(['code'=>4, 'error'=>'Database error'], 400);
 		}
 
-    	return Response::json( [], 200);
+    	return Response::json([], 200);
 	}
 
 	private function isID($id) {

app/Http/Controllers/InstallController.php

Spacing +23 added lines, -23 removed lines

@@ -37,7 +37,7 @@ 
             'TOKENIZER_EXTENSION' => false,
             'WRITE_ACCESS' => false];
 
-        if ($this->getPhpVersionId() >= self::REQUIRED_PHP_VERSION_ID) {
+        if ($this->getPhpVersionId()>=self::REQUIRED_PHP_VERSION_ID) {
             $requirements['PHP_VERSION'] = true;
         }
 
@@ -142,7 +142,7 @@ 
 
     public function checkEnvironmentFile(Request $request)
     {
-        if (file_exists(base_path() . '/.env')) {
+        if (file_exists(base_path().'/.env')) {
             return redirect('install/account');
         }
 
@@ -174,34 +174,34 @@ 
     {
         $configArray = session(self::CONFIG_KEY);
 
-        $configContent = 'APP_ENV=production' . PHP_EOL;
-        $configContent .= 'APP_DEBUG=false' . PHP_EOL;
-        $configContent .= 'APP_URL=' . $configArray['app_url'] . '' . PHP_EOL;
-        $configContent .= 'APP_KEY=' . $configArray['app_key'] . '' . PHP_EOL;
-        $configContent .= 'APP_TIMEZONE=' . $configArray['app_timezone'] . '' . PHP_EOL;
+        $configContent = 'APP_ENV=production'.PHP_EOL;
+        $configContent .= 'APP_DEBUG=false'.PHP_EOL;
+        $configContent .= 'APP_URL='.$configArray['app_url'].''.PHP_EOL;
+        $configContent .= 'APP_KEY='.$configArray['app_key'].''.PHP_EOL;
+        $configContent .= 'APP_TIMEZONE='.$configArray['app_timezone'].''.PHP_EOL;
 
-        $configContent .= 'DB_DRIVER=mysql' . PHP_EOL;
-        $configContent .= 'DB_HOST=' . $configArray['db_hostname'] . '' . PHP_EOL;
-        $configContent .= 'DB_DATABASE=' . $configArray['db_name'] . '' . PHP_EOL;
-        $configContent .= 'DB_USERNAME=' . $configArray['db_username'] . '' . PHP_EOL;
-        $configContent .= 'DB_PASSWORD=' . $configArray['db_password'] . '' . PHP_EOL;
+        $configContent .= 'DB_DRIVER=mysql'.PHP_EOL;
+        $configContent .= 'DB_HOST='.$configArray['db_hostname'].''.PHP_EOL;
+        $configContent .= 'DB_DATABASE='.$configArray['db_name'].''.PHP_EOL;
+        $configContent .= 'DB_USERNAME='.$configArray['db_username'].''.PHP_EOL;
+        $configContent .= 'DB_PASSWORD='.$configArray['db_password'].''.PHP_EOL;
 
-        $configContent .= 'MAIL_DRIVER=smtp' . PHP_EOL;
-        $configContent .= 'MAIL_HOST=mailtrap.io' . PHP_EOL;
-        $configContent .= 'MAIL_PORT=2525' . PHP_EOL;
-        $configContent .= 'MAIL_USERNAME=null' . PHP_EOL;
-        $configContent .= 'MAIL_PASSWORD=null' . PHP_EOL;
+        $configContent .= 'MAIL_DRIVER=smtp'.PHP_EOL;
+        $configContent .= 'MAIL_HOST=mailtrap.io'.PHP_EOL;
+        $configContent .= 'MAIL_PORT=2525'.PHP_EOL;
+        $configContent .= 'MAIL_USERNAME=null'.PHP_EOL;
+        $configContent .= 'MAIL_PASSWORD=null'.PHP_EOL;
 
-        $configContent .= 'CACHE_DRIVER=file' . PHP_EOL;
-        $configContent .= 'SESSION_DRIVER=file' . PHP_EOL;
-        $configContent .= 'QUEUE_DRIVER=sync' . PHP_EOL;
+        $configContent .= 'CACHE_DRIVER=file'.PHP_EOL;
+        $configContent .= 'SESSION_DRIVER=file'.PHP_EOL;
+        $configContent .= 'QUEUE_DRIVER=sync'.PHP_EOL;
 
 
         if (!is_writable(base_path())) {
             throw new Exception('Could not create the configuration file');
         }
 
-        $fileHandle = fopen(base_path() . '/.env', "w");
+        $fileHandle = fopen(base_path().'/.env', "w");
         fwrite($fileHandle, $configContent);
         fclose($fileHandle);
     }
@@ -211,7 +211,7 @@ 
         $request->session()->forget(self::CONFIG_KEY);
 
         try {
-            unlink(base_path() . '/' . self::INSTALLATION_FILE);
+            unlink(base_path().'/'.self::INSTALLATION_FILE);
             return view('install.finished');
         } catch (\ErrorException $e) {
             return view('install.finished')->with('lockError', true);
@@ -231,7 +231,7 @@ 
     private function hasDatabaseAccess($hostname, $username, $password, $database)
     {
         try {
-            (new PDO("mysql:host=$hostname;dbname=$database", $username, $password))->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);;
+            (new PDO("mysql:host=$hostname;dbname=$database", $username, $password))->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); ;
         } catch (PDOException $e) {
             return false;
         }

app/Http/Controllers/LoginController.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 
         $email = $request->input('email');
                 
-        if( $validator->fails() )
+        if ($validator->fails())
         {
             return redirect('/')->with('error', 'Your credentials have an invalid format')
                                 ->with('email', $email);
@@ -51,7 +51,7 @@ 
                                 ->with('email', $email);
         }
                         
-        if( !Hash::check(Input::get('password'), $user->password_hash) ) 
+        if (!Hash::check(Input::get('password'), $user->password_hash)) 
         {
             return redirect('/')->with('error', 'The email and password you entered don\'t match')
                                 ->with('email', $email);

app/Http/Controllers/ProductController.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
         if (is_null($product)) {
             return response()->json(['code' => RepositoryException::RESOURCE_NOT_FOUND,
-                'message' => 'Product with ID ' . $id . ' not found'], 404);
+                'message' => 'Product with ID '.$id.' not found'], 404);
         }
 
         return response()->json($this->repository->APIFormat($product), 200);

app/Http/Controllers/SnapshotController.php

Spacing +3 added lines, -3 removed lines

@@ -18,13 +18,13 @@
 	public function index()
 	{
 		$snapshots = $this->repository->all();
-		return Response::json( $this->repository->APIFormat($snapshots), 200);
+		return Response::json($this->repository->APIFormat($snapshots), 200);
 	}
 
 	public function store()
 	{		
-		$snapshot = $this->repository->store( Input::all() );
-		return Response::json( ['id' => $snapshot->id], 200);
+		$snapshot = $this->repository->store(Input::all());
+		return Response::json(['id' => $snapshot->id], 200);
 	}
 
 	public function show($id)

app/Http/Controllers/StatsController.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
         $this->productRepository = $productRepository;
     }
 
-    public function dashboard($interval=self::DEFAULT_INTERVAL)
+    public function dashboard($interval = self::DEFAULT_INTERVAL)
     {
         $intervalData = $this->extractIntervalData($interval);
 
@@ -48,18 +48,18 @@ 
         $type = substr($intervalString, -1);
         $nb = intval(substr($intervalString, 0, -1));
 
-        if( $type=='h' )
+        if ($type == 'h')
         {
-            if( $nb>24 )
+            if ($nb>24)
             {
                 $nb = 24;
             }
 
             return CarbonInterval::hours($nb);
         }
-        elseif( $type=='d' )
+        elseif ($type == 'd')
         {
-            if( $nb>30 )
+            if ($nb>30)
             {
                 $nb = 30;
             }
@@ -78,10 +78,10 @@ 
      */
     private function getTitleFromInterval(CarbonInterval $interval)
     {
-        if( $interval->h>0 )
+        if ($interval->h>0)
             return 'Last '.$interval->h.' hours';
 
-        if( $interval->d>0 )
+        if ($interval->d>0)
             return 'Last '.$interval->d.' days';
 
         return 'Last '.$interval->forHumans();