TechWilk / rota

public/old/users.php

Spacing +6 added lines, -6 removed lines

@@ -69,10 +69,10 @@ 
         } else {
             $roles .= '</ul>';
         }
-        $roles .= '<p><strong>'.$groupName.'</strong></p>';
+        $roles .= '<p><strong>' . $groupName . '</strong></p>';
         $roles .= '<ul>';
     }
-    $roles .= '<li>'.$row['roleName'].'</li>';
+    $roles .= '<li>' . $row['roleName'] . '</li>';
 }
 $roles .= '</ul>';
 
@@ -119,7 +119,7 @@ 
 					<li>

 						<a class="js-no-link" href="addUser.php?action=edit&user=<?php echo $user->getId() ?>" data-toggle='modal' data-target='#user<?php echo $user->getId() ?>'>

 							<img src="<?php echo getProfileImageUrl($user->getId(), 'large') ?>" alt="User Image">

-							<span class="users-list-name"><?php echo $user->getFirstName().' '.$user->getLastName() ?></span>

+							<span class="users-list-name"><?php echo $user->getFirstName() . ' ' . $user->getLastName() ?></span>

 						</a>

 						<?php if (isAdmin($user->getId())): ?>

 						<span class="label label-warning">Admin</span>

@@ -140,7 +140,7 @@ 
 								<div class="modal-header">

 									<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>

 									<h4 class="modal-title">

-										<?php echo $user->getFirstName().' '.$user->getLastName() ?>

+										<?php echo $user->getFirstName() . ' ' . $user->getLastName() ?>

 										<?php if (isAdmin($user->getId())): ?>

 										<span class="label label-warning">Admin</span>

 										<?php endif ?>

@@ -153,12 +153,12 @@ 
 									</h4>

 								</div>

 								<div class="modal-body">

-									<p><strong>Email address:</strong> <a href="<?php echo $user->getEmail() ? 'mailto:'.$user->getEmail() : '' ?>"><?php echo $user->getEmail() ? $user->getEmail() : 'none' ?></a></p>

+									<p><strong>Email address:</strong> <a href="<?php echo $user->getEmail() ? 'mailto:' . $user->getEmail() : '' ?>"><?php echo $user->getEmail() ? $user->getEmail() : 'none' ?></a></p>

 									<p><strong>Mobile:</strong> <?php echo $user->getMobile() ? $user->getMobile() : 'none' ?></p>

 									<p><strong>Roles:</strong></p>

 									<?php $userRoles = $user->getUserRoles() ?>

 									<ul>

-										<?php echo $userRoles->count() > 0 ? '' : '<li class="text-red">'.$user->getFirstName().' has no roles</li>' ?>

+										<?php echo $userRoles->count() > 0 ? '' : '<li class="text-red">' . $user->getFirstName() . ' has no roles</li>' ?>

 										<?php foreach ($userRoles as $userRole): ?>

 										<li>

 											<?php echo $userRole->getRole()->getGroup()->getName() ?>: <?php echo $userRole->getRole()->getName() ?>

public/index.php

Spacing +7 added lines, -7 removed lines

@@ -6,31 +6,31 @@
     // To help the built-in PHP dev server, check if the request was actually for
     // something which should probably be served as a static file
     $url = parse_url($_SERVER['REQUEST_URI']);
-    $file = __DIR__.$url['path'];
+    $file = __DIR__ . $url['path'];
     if (is_file($file)) {
         return false;
     }
 }
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 // setup Propel (autoload configured though composer)
-require_once __DIR__.'/../generated-conf/config.php';
+require_once __DIR__ . '/../generated-conf/config.php';
 
 session_start();
 
 // Instantiate the app
-$settings = require __DIR__.'/../src/settings.php';
+$settings = require __DIR__ . '/../src/settings.php';
 $app = new \Slim\App($settings);
 
 // Set up dependencies
-require __DIR__.'/../src/dependencies.php';
+require __DIR__ . '/../src/dependencies.php';
 
 // Register middleware
-require __DIR__.'/../src/middleware.php';
+require __DIR__ . '/../src/middleware.php';
 
 // Register routes
-require __DIR__.'/../src/routes.php';
+require __DIR__ . '/../src/routes.php';
 
 // Run app
 $app->run();

generated-migrations/PropelMigration_1494860053.php

Indentation +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function getUpSQL()
     {
         return [
-  'default' => '
+    'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;
@@ -172,7 +172,7 @@ 
     public function getDownSQL()
     {
         return [
-  'default' => '
+    'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;

generated-classes/TechWilk/Rota/Document.php

Spacing +3 added lines, -3 removed lines

@@ -22,16 +22,16 @@
         }
         //$acceptedFileExtensions = ['jpg', 'png', 'jpeg', 'gif', 'docx', 'pdf', 'xlsx', 'pptx'];
         $acceptedFileTypes = ['image/gif', 'image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/excel'];
-        $target_dir = __DIR__.'/../documents/';
+        $target_dir = __DIR__ . '/../documents/';
         $this->setUrl($file->getClientFilename());
         //$fileExtension = pathinfo(basename($file->getName()),PATHINFO_EXTENSION);
 
         // Allow certain file formats only
         if (!in_array($file->getClientMediaType(), $acceptedFileTypes)) {
-            throw new InvalidArgumentException('Sorry, only '.implode(', ', $acceptedFileTypes).' files are allowed.');
+            throw new InvalidArgumentException('Sorry, only ' . implode(', ', $acceptedFileTypes) . ' files are allowed.');
         }
         $this->save();
-        $target_file = $target_dir.$this->getId();
+        $target_file = $target_dir . $this->getId();
 
         // Check if file already exists
         if (file_exists($target_file)) {

generated-classes/TechWilk/Rota/Group.php

Indentation +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
     {
         return EventQuery::create()
             ->useEventPersonQuery()
-              ->useUserRoleQuery()
+                ->useUserRoleQuery()
                 ->useRoleQuery()
-                  ->filterByGroup($this)
+                    ->filterByGroup($this)
+                ->endUse()
                 ->endUse()
-              ->endUse()
             ->endUse()
             ->orderByDate('desc')
             ->findOne();

generated-conf/config.php

Indentation +14 added lines, -14 removed lines

@@ -7,18 +7,18 @@ 
 $serviceContainer->setAdapterClass('default', 'mysql');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
-  'user'       => $config['db']['user'],
-  'password'   => $config['db']['pass'],
-  'attributes' => [
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
+    'user'       => $config['db']['user'],
+    'password'   => $config['db']['pass'],
+    'attributes' => [
     'ATTR_EMULATE_PREPARES' => false,
     'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
+    ],
+    'model_paths' => [
     0 => 'src',
     1 => 'vendor',
-  ],
+    ],
 ]);
 $manager->setName('default');
 $serviceContainer->setConnectionManager('default', $manager);
@@ -26,16 +26,16 @@ 
 $serviceContainer->setAdapterClass('test', 'sqlite');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'sqlite:/var/tmp/test.db',
-  'attributes' => [
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'sqlite:/var/tmp/test.db',
+    'attributes' => [
     'ATTR_EMULATE_PREPARES' => false,
     'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
+    ],
+    'model_paths' => [
     0 => 'src',
     1 => 'vendor',
-  ],
+    ],
 ]);
 $manager->setName('test');
 $serviceContainer->setConnectionManager('test', $manager);

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include __DIR__.'/../config/database.php';
+include __DIR__ . '/../config/database.php';
 $serviceContainer = \Propel\Runtime\Propel::getServiceContainer();
 $serviceContainer->checkVersion('2.0.0-dev');
 
@@ -8,7 +8,7 @@ 
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
   'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
+  'dsn'        => 'mysql:host=' . $config['db']['host'] . ';dbname=' . $config['db']['dbname'],
   'user'       => $config['db']['user'],
   'password'   => $config['db']['pass'],
   'attributes' => [

api-classes/Person.php

Indentation +7 added lines, -7 removed lines

@@ -28,13 +28,13 @@
         $currentTimestamp = $date = strftime('%F %T', time());
 
         $data = [
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
     ];
 
         if (isset($this->notes)) {

Spacing +6 added lines, -6 removed lines

@@ -24,12 +24,12 @@
     public function createInDb(Database $db)
     {
         if (empty($this->name) || empty($this->datetime) || empty($this->series) || empty($this->type) || empty($this->sub_type) || empty($this->location)) {
-            $message = 'Series name ('.$this->name.')';
-            $message .= ' or date ('.$this->datetime.')';
-            $message .= ' or series ('.$this->series.')';
-            $message .= ' or type ('.$this->type.')';
-            $message .= ' or sub_type ('.$this->sub_type.')';
-            $message .= ' or location ('.$this->location.')';
+            $message = 'Series name (' . $this->name . ')';
+            $message .= ' or date (' . $this->datetime . ')';
+            $message .= ' or series (' . $this->series . ')';
+            $message .= ' or type (' . $this->type . ')';
+            $message .= ' or sub_type (' . $this->sub_type . ')';
+            $message .= ' or location (' . $this->location . ')';
             $message .= ' cannot be empty.';
 
             throw new Exception($message);

api-classes/test.php

Spacing +3 added lines, -3 removed lines

@@ -38,14 +38,14 @@
 
 $id = urlencode($id);
 
-$url = 'http://localhost/api/v1/series/'.$id;
+$url = 'http://localhost/api/v1/series/' . $id;
 $response = file_get_contents($url);
 
-echo 'URL: '.$url;
+echo 'URL: ' . $url;
 
 $responseData = json_decode($response, true);
 $data = $responseData['data'];
 
 echo var_dump($responseData);
 
-echo 'series '.$id.': id = '.$data['id'].', name = '.$data['name'].', description = '.$data['description'];
+echo 'series ' . $id . ': id = ' . $data['id'] . ', name = ' . $data['name'] . ', description = ' . $data['description'];

api-classes/Type.php

Indentation +7 added lines, -7 removed lines

@@ -20,8 +20,8 @@ 
         }
 
         $data = [
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
-      ['field' => 'description', 'type' => 'string', 'value' => $this->description],
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
+        ['field' => 'description', 'type' => 'string', 'value' => $this->description],
     ];
 
         $db->insert($this->db_table, $data);
@@ -39,7 +39,7 @@ 
 
         $whereCondition = 'id = '.$id;
         $where = [
-      $whereCondition,
+        $whereCondition,
     ];
 
         if ($db->delete($this->db_table, $where)) {
@@ -59,14 +59,14 @@ 
         }
 
         $columns = [
-      'id',
-      'name',
-      'description',
+        'id',
+        'name',
+        'description',
     ];
 
         $whereCondition = 'id = '.$id;
         $where = [
-      $whereCondition,
+        $whereCondition,
     ];
 
         $result = $db->selectSingle('Type', $this->db_table, $columns, $where);

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
     public function createInDb(Database $db)
     {
         if (empty($this->name) || empty($this->description)) {
-            throw new Exception('Series name ('.$this->name.') or description ('.$this->description.') cannot be empty.');
+            throw new Exception('Series name (' . $this->name . ') or description (' . $this->description . ') cannot be empty.');
         }
 
         $data = [
@@ -37,7 +37,7 @@ 
             $id = $this->id;
         }
 
-        $whereCondition = 'id = '.$id;
+        $whereCondition = 'id = ' . $id;
         $where = [
       $whereCondition,
     ];
@@ -64,7 +64,7 @@ 
       'description',
     ];
 
-        $whereCondition = 'id = '.$id;
+        $whereCondition = 'id = ' . $id;
         $where = [
       $whereCondition,
     ];