mattheworres / phpdraft

api/Domain/Repositories/LoginUserRepository.php

Spacing +12 added lines, -12 removed lines

@@ -85,11 +85,11 @@ 
 
     $users = array();
 
-    if(!$load_stmt->execute()) {
+    if (!$load_stmt->execute()) {
       throw new \Exception("Unable to load users.");
     }
 
-    while($user = $load_stmt->fetch()) {
+    while ($user = $load_stmt->fetch()) {
       
       $users[] = $this->_ScrubUser($user);
     }
@@ -117,7 +117,7 @@ 
       throw new \Exception("Unable to create user.");
     }
 
-    $user->id = (int) $this->app['db']->lastInsertId();
+    $user->id = (int)$this->app['db']->lastInsertId();
 
     return $user;
   }
@@ -155,7 +155,7 @@ 
 
     $result = $update_stmt->execute();
 
-    if($result == false) {
+    if ($result == false) {
       throw new \Exception("Unable to erase verification key for user.");
     }
 
@@ -166,7 +166,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM users WHERE id = ?");
     $delete_stmt->bindParam(1, $user->id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete user #$user->id");
     }
 
@@ -175,7 +175,7 @@ 
 
   public function NameIsUnique($name, $id = null) {
     $name = strtolower($name);
-    if($id == null) {
+    if ($id == null) {
       $name_stmt = $this->app['db']->prepare("SELECT name FROM users WHERE name LIKE ?");
       $name_stmt->bindParam(1, $name);
     } else {
@@ -184,7 +184,7 @@ 
       $name_stmt->bindParam(2, $id);
     }
 
-    if(!$name_stmt->execute()) {
+    if (!$name_stmt->execute()) {
       throw new \Exception(sprintf('Name %s is invalid', $name));
     }
 
@@ -192,7 +192,7 @@ 
   }
 
   public function EmailExists($email, $id = null) {
-    if($id == null) {
+    if ($id == null) {
       $email_stmt = $this->app['db']->prepare("SELECT email FROM users WHERE email = ?");
       $email_stmt->bindParam(1, $email);
     } else {
@@ -213,7 +213,7 @@ 
     $email_stmt = $this->app['db']->prepare("SELECT email FROM users WHERE email = ? LIMIT 1");
     $email_stmt->bindParam(1, $email);
 
-    if(!$email_stmt->execute()) {
+    if (!$email_stmt->execute()) {
       throw new \Exception(sprintf('Email %s is invalid', $email));
     }
 
@@ -229,11 +229,11 @@ 
 
     $users = array();
 
-    if(!$search_stmt->execute()) {
+    if (!$search_stmt->execute()) {
       throw new \Exception("Unable to load users");
     }
 
-    while($user = $search_stmt->fetch()) {
+    while ($user = $search_stmt->fetch()) {
       unset($user->enabled);
       unset($user->email);
       unset($user->password);
@@ -253,7 +253,7 @@ 
     $verification_stmt->bindParam(1, $email);
     $verification_stmt->bindParam(2, $verificationKey);
 
-    if(!$verification_stmt->execute()) {
+    if (!$verification_stmt->execute()) {
       throw new \Exception('Verification is invalid.');
     }
 

Braces +18 added lines, -12 removed lines

@@ -25,11 +25,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, $email);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    }
 
     return $user;
   }
@@ -43,11 +45,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, $id);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
     return $user;
   }
@@ -61,11 +65,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, $id);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
     unset($user->enabled);
     unset($user->email);

tests/api/Domain/Validators/RoundTimeValidatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class RoundTimeValidatorTest extends TestCase {
   function setUp() {
-    $this->app = require dirname(__FILE__).'/../../../../api/config/_app.php';
+    $this->app = require dirname(__FILE__) . '/../../../../api/config/_app.php';
     $this->roundTimeCreateModel = new RoundTimeCreateModel();
     $this->sut = new RoundTimeValidator($this->app);
   }

tests/api/Domain/Validators/PickValidatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 class PickValidatorTest extends TestCase {
   function setUp() {
-    $this->app = require dirname(__FILE__).'/../../../../api/config/_app.php';
+    $this->app = require dirname(__FILE__) . '/../../../../api/config/_app.php';
     $draftDataRepository = new DraftDataRepository($this->app);
     $this->app['phpdraft.DraftDataRepository'] = $draftDataRepository;
     $this->sut = new PickValidator($this->app);

tests/api/Domain/Validators/ProPlayerValidatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class ProPlayerValidatorTest extends TestCase {
   function setUp() {
-    $this->app = require dirname(__FILE__).'/../../../../api/config/_app.php';
+    $this->app = require dirname(__FILE__) . '/../../../../api/config/_app.php';
     $draftDataRepository = new DraftDataRepository($this->app);
     $this->sut = new ProPlayerValidator($this->app);
     $this->app['phpdraft.DraftDataRepository'] = $draftDataRepository;

tests/api/Domain/Validators/TradeValidatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 class TradeValidatorTest extends TestCase {
   function setUp() {
-    $this->app = require dirname(__FILE__).'/../../../../api/config/_app.php';
+    $this->app = require dirname(__FILE__) . '/../../../../api/config/_app.php';
     $this->draft = new Draft();
     $this->trade = new Trade();
     $this->trade->manager1 = new Manager();

deploy/_package_tasks.php

Indentation +14 added lines, -14 removed lines

@@ -18,7 +18,7 @@ 
     $items_required_for_packaging = [
         'app',
         'db',
-		'deploy',
+    'deploy',
         'gulp'
     ];
 
@@ -95,7 +95,7 @@ 
         'db',
         'deploy',
         'fonts',
-		'images',
+    'images',
         'vendor',
         'js'
     ];
@@ -105,7 +105,7 @@ 
         'composer.json',
         'composer.lock',
         'README.MD',
-		'package.json',
+    'package.json',
         'index.html',
         'web.config'
     ];
@@ -114,7 +114,7 @@ 
     $archivePath = get('phpdraft')['releasePath'];
 
     foreach($phpdraft_release_dirs as $archiveDirectory) {
-		runLocally("7z a $archivePath/$releaseFileName $archiveDirectory");
+    runLocally("7z a $archivePath/$releaseFileName $archiveDirectory");
     }
 
     foreach($phpdraft_release_files as $archiveFile) {
@@ -122,16 +122,16 @@ 
     }
 
     //Hard-coded so we copy a working deploy.php so no one technically needs to edit a single file
-	runLocally("7z a $archivePath/$releaseFileName deploy/deploy.php.release");
-	runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci");
-	runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci");
-	runLocally("7z rn $archivePath/$releaseFileName deploy/deploy.php.release deploy.php");
-	runLocally("7z rn $archivePath/$releaseFileName deploy/appsettings.php.ci appsettings.php");
-	runLocally("7z rn $archivePath/$releaseFileName deploy/phinx.yml.ci phinx.yml");
-
-	//Re-include them in case anyone using this packaged release needs CI versions of these!
-	runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci");
-	runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci");
+  runLocally("7z a $archivePath/$releaseFileName deploy/deploy.php.release");
+  runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci");
+  runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci");
+  runLocally("7z rn $archivePath/$releaseFileName deploy/deploy.php.release deploy.php");
+  runLocally("7z rn $archivePath/$releaseFileName deploy/appsettings.php.ci appsettings.php");
+  runLocally("7z rn $archivePath/$releaseFileName deploy/phinx.yml.ci phinx.yml");
+
+  //Re-include them in case anyone using this packaged release needs CI versions of these!
+  runLocally("7z a $archivePath/$releaseFileName deploy/appsettings.php.ci");
+  runLocally("7z a $archivePath/$releaseFileName deploy/phinx.yml.ci");
 })->setPrivate();
 
 desc('Package resources with 7zip');

Spacing +9 added lines, -9 removed lines

@@ -22,8 +22,8 @@ 
         'gulp'
     ];
 
-    foreach($items_required_for_packaging as $directory) {
-        if(file_exists($directory) !== true) {
+    foreach ($items_required_for_packaging as $directory) {
+        if (file_exists($directory) !== true) {
             writeln("<error>Directory $directory does not exist, cannot package.</error>\n");
             writeln("<error>In order to package a release, you must start with sourcecode from the Github repository, not from a prepackaged release from the Github Releases (you've apparently done it backwards :) )</error>\n");
             throw new \Exception("PHP Draft cannot be packaged for release.");
@@ -32,14 +32,14 @@ 
 
     $yarn_output = runLocally('yarn -v');
 
-    if(strpos($yarn_output, '.') == false) {
+    if (strpos($yarn_output, '.') == false) {
         writeln('<error>Yarn not found on path. Install Yarn globally for commandline use</error>');
         throw new \Exception("PHP Draft cannot be packaged for release");
     }
 
     $sevenZip_output = runLocally('7z');
 
-    if(strpos($sevenZip_output, 'Igor Pavlov') == false) {
+    if (strpos($sevenZip_output, 'Igor Pavlov') == false) {
         writeln('<error>7-Zip not found on path. Install 7-Zip for commandline use</error>');
         throw new \Exception("PHP Draft cannot be packaged for release");
     }
@@ -48,11 +48,11 @@ 
     $resourceFileName = get('phpdraft')['resourceFile'];
     $archivePath = get('phpdraft')['releasePath'];
 
-    if(file_exists("$archivePath/$releaseFileName")) {
+    if (file_exists("$archivePath/$releaseFileName")) {
         throw new \Exception("File $archivePath/$releaseFileName already exists.");
     }
 
-    if(file_exists("$archivePath/$resourceFileName")) {
+    if (file_exists("$archivePath/$resourceFileName")) {
         throw new \Exception("File $archivePath/$resourceFileName already exists.");
     }
 })->setPrivate();
@@ -113,11 +113,11 @@ 
     $releaseFileName = get('phpdraft')['releaseFile'];
     $archivePath = get('phpdraft')['releasePath'];
 
-    foreach($phpdraft_release_dirs as $archiveDirectory) {
+    foreach ($phpdraft_release_dirs as $archiveDirectory) {
 		runLocally("7z a $archivePath/$releaseFileName $archiveDirectory");
     }
 
-    foreach($phpdraft_release_files as $archiveFile) {
+    foreach ($phpdraft_release_files as $archiveFile) {
         runLocally("7z a $archivePath/$releaseFileName $archiveFile");
     }
 
@@ -144,7 +144,7 @@ 
     $resourceFileName = get('phpdraft')['resourceFile'];
     $archivePath = get('phpdraft')['releasePath'];
 
-    foreach($goodResources as $resourceFile) {
+    foreach ($goodResources as $resourceFile) {
         runLocally("7z a $archivePath/$resourceFileName $phpdraft_resource_dir/$resourceFile");
     }
 })->setPrivate();