alfs18 / ramverk1-projekt

src/DatabaseActiveRecord/ActiveRecordModel.php

Indentation +19 added lines, -19 removed lines

@@ -135,11 +135,11 @@ 
         $this->checkDb();
         $params = is_array($value) ? $value : [$value];
         $this->db->connect()
-                 ->select()
-                 ->from($this ->tableName)
-                 ->where($where)
-                 ->execute($params)
-                 ->fetchInto($this);
+                    ->select()
+                    ->from($this ->tableName)
+                    ->where($where)
+                    ->execute($params)
+                    ->fetchInto($this);
         return $this;
     }
 
@@ -242,8 +242,8 @@ 
         $values  = array_values($properties);
 
         $this->db->connect()
-                 ->insert($this->tableName, $columns)
-                 ->execute($values);
+                    ->insert($this->tableName, $columns)
+                    ->execute($values);
 
         $this->{$this->tableIdColumn} = $this->db->lastInsertId();
     }
@@ -265,9 +265,9 @@ 
         $values[] = $this->{$this->tableIdColumn};
 
         $this->db->connect()
-                 ->update($this->tableName, $columns)
-                 ->where("{$this->tableIdColumn} = ?")
-                 ->execute($values);
+                    ->update($this->tableName, $columns)
+                    ->where("{$this->tableIdColumn} = ?")
+                    ->execute($values);
     }
 
 
@@ -299,9 +299,9 @@ 
         $values = array_merge($values, $values1);
 
         $this->db->connect()
-                 ->update($this->tableName, $columns)
-                 ->where($where)
-                 ->execute($values);
+                    ->update($this->tableName, $columns)
+                    ->where($where)
+                    ->execute($values);
     }
 
 
@@ -321,9 +321,9 @@ 
         $id = $id ?: $this->{$this->tableIdColumn};
 
         $this->db->connect()
-                 ->deleteFrom($this->tableName)
-                 ->where("{$this->tableIdColumn} = ?")
-                 ->execute([$id]);
+                    ->deleteFrom($this->tableName)
+                    ->where("{$this->tableIdColumn} = ?")
+                    ->execute([$id]);
 
         $this->{$this->tableIdColumn} = null;
     }
@@ -352,8 +352,8 @@ 
         $values = is_array($value) ? $value : [$value];
 
         $this->db->connect()
-                 ->deleteFrom($this->tableName)
-                 ->where($where)
-                 ->execute($values);
+                    ->deleteFrom($this->tableName)
+                    ->where($where)
+                    ->execute($values);
     }
 }

Spacing +12 added lines, -12 removed lines

@@ -72,10 +72,10 @@ 
     {
         $properties = get_object_vars($this);
         unset(
-            $properties['tableName'],
-            $properties['db'],
-            $properties['di'],
-            $properties['tableIdColumn']
+            $properties[ 'tableName' ],
+            $properties[ 'db' ],
+            $properties[ 'di' ],
+            $properties[ 'tableIdColumn' ]
         );
         return $properties;
     }
@@ -133,7 +133,7 @@ 
     public function findWhere($where, $value) : object
     {
         $this->checkDb();
-        $params = is_array($value) ? $value : [$value];
+        $params = is_array($value) ? $value : [ $value ];
         $this->db->connect()
                  ->select()
                  ->from($this ->tableName)
@@ -179,7 +179,7 @@ 
     public function findAllWhere($where, $value)
     {
         $this->checkDb();
-        $params = is_array($value) ? $value : [$value];
+        $params = is_array($value) ? $value : [ $value ];
         return $this->db->connect()
                         ->select()
                         ->from($this->tableName)
@@ -237,7 +237,7 @@ 
     {
         $this->checkDb();
         $properties = $this->getProperties();
-        unset($properties[$this->tableIdColumn]);
+        unset($properties[ $this->tableIdColumn ]);
         $columns = array_keys($properties);
         $values  = array_values($properties);
 
@@ -259,10 +259,10 @@ 
     {
         $this->checkDb();
         $properties = $this->getProperties();
-        unset($properties[$this->tableIdColumn]);
+        unset($properties[ $this->tableIdColumn ]);
         $columns = array_keys($properties);
         $values  = array_values($properties);
-        $values[] = $this->{$this->tableIdColumn};
+        $values[ ] = $this->{$this->tableIdColumn};
 
         $this->db->connect()
                  ->update($this->tableName, $columns)
@@ -295,7 +295,7 @@ 
         $values  = array_values($properties);
         $values1 = is_array($value)
             ? $value
-            : [$value];
+            : [ $value ];
         $values = array_merge($values, $values1);
 
         $this->db->connect()
@@ -323,7 +323,7 @@ 
         $this->db->connect()
                  ->deleteFrom($this->tableName)
                  ->where("{$this->tableIdColumn} = ?")
-                 ->execute([$id]);
+                 ->execute([ $id ]);
 
         $this->{$this->tableIdColumn} = null;
     }
@@ -349,7 +349,7 @@ 
     public function deleteWhere($where, $value)
     {
         $this->checkDb();
-        $values = is_array($value) ? $value : [$value];
+        $values = is_array($value) ? $value : [ $value ];
 
         $this->db->connect()
                  ->deleteFrom($this->tableName)

src/DatabaseQueryBuilder/DatabaseQueryBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -21,12 +21,12 @@ 
      */
     public function setDefaultsFromConfiguration()
     {
-        if ($this->options['dsn']) {
-            $dsn = explode(':', $this->options['dsn']);
-            $this->setSQLDialect($dsn[0]);
+        if ($this->options[ 'dsn' ]) {
+            $dsn = explode(':', $this->options[ 'dsn' ]);
+            $this->setSQLDialect($dsn[ 0 ]);
         }
 
-        $this->setTablePrefix($this->options['table_prefix']);
+        $this->setTablePrefix($this->options[ 'table_prefix' ]);
     }
 
 
@@ -39,7 +39,7 @@ 
      *
      * @return self
      */
-    public function execute($query = null, array $params = []) : object
+    public function execute($query = null, array $params = [ ]) : object
     {
         // When using one argument and its array, assume its $params
         if (is_array($query)) {

src/DatabaseQueryBuilder/QueryBuilderTrait.php

Indentation +12 added lines, -12 removed lines

@@ -466,12 +466,12 @@ 
 
 
     /**
-    * Build the group by part.
-    *
-    * @param string $condition for building the group by part of the query.
-    *
-    * @return $this
-    */
+     * Build the group by part.
+     *
+     * @param string $condition for building the group by part of the query.
+     *
+     * @return $this
+     */
     public function groupBy($condition)
     {
         $this->groupby = "GROUP BY " . $condition;
@@ -482,12 +482,12 @@ 
 
 
     /**
-    * Build the order by part.
-    *
-    * @param string $condition for building the where part of the query.
-    *
-    * @return $this
-    */
+     * Build the order by part.
+     *
+     * @param string $condition for building the where part of the query.
+     *
+     * @return $this
+     */
     public function orderBy($condition)
     {
         $this->orderby = "ORDER BY " . $condition;

Spacing +12 added lines, -12 removed lines

@@ -64,14 +64,14 @@ 
     protected function build()
     {
         $sql = $this->start . "\n"
-            . ($this->from    ? $this->from . "\n"    : null)
-            . ($this->join    ? $this->join           : null)
-            . ($this->set     ? $this->set . "\n"     : null)
-            . ($this->where   ? $this->where . "\n"   : null)
+            . ($this->from ? $this->from . "\n" : null)
+            . ($this->join ? $this->join : null)
+            . ($this->set ? $this->set . "\n" : null)
+            . ($this->where ? $this->where . "\n" : null)
             . ($this->groupby ? $this->groupby . "\n" : null)
             . ($this->orderby ? $this->orderby . "\n" : null)
-            . ($this->limit   ? $this->limit . "\n"   : null)
-            . ($this->offset  ? $this->offset . "\n"  : null)
+            . ($this->limit ? $this->limit . "\n" : null)
+            . ($this->offset ? $this->offset . "\n" : null)
             . ";";
 
         return $sql;
@@ -226,9 +226,9 @@ 
 
         $max = count($columns);
         for ($i = 0; $i < $max; $i++) {
-            $cols .= $columns[$i] . ', ';
+            $cols .= $columns[ $i ] . ', ';
 
-            $val = $values[$i];
+            $val = $values[ $i ];
 
             if ($val == '?') {
                 $vals .= $val . ', ';
@@ -282,9 +282,9 @@ 
         $max = count($columns);
         
         for ($i = 0; $i < $max; $i++) {
-            $cols .= "\t" . $columns[$i] . ' = ';
+            $cols .= "\t" . $columns[ $i ] . ' = ';
 
-            $val = $values[$i];
+            $val = $values[ $i ];
             if ($val == '?') {
                 $cols .= $val . ",\n";
             } else {
@@ -549,12 +549,12 @@ 
                 // Create an array of '?' to match number of columns
                 $max = count($columns);
                 for ($i = 0; $i < $max; $i++) {
-                    $values[] = '?';
+                    $values[ ] = '?';
                 }
             }
         }
 
-        return [$columns, $values];
+        return [ $columns, $values ];
     }
 
 

src/User/Answers.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
     {
         $db = $di->get("dbqb");
         $db->connect()
-            ->insert("Answers", ["questionId", "acronym", "answer", "points", "created"])
-            ->execute([$this->questionId, $this->acronym, $this->answer, $this->points, $this->created]);
+            ->insert("Answers", [ "questionId", "acronym", "answer", "points", "created" ])
+            ->execute([ $this->questionId, $this->acronym, $this->answer, $this->points, $this->created ]);
     }
 
 

src/User/HTMLForm/FormElementFile.php

Spacing +2 added lines, -2 removed lines

@@ -17,10 +17,10 @@
      * @param array  $attributes to set to the element. Default is an empty
      *                           array.
      */
-    public function __construct($name, $attributes = [])
+    public function __construct($name, $attributes = [ ])
     {
         parent::__construct($name, $attributes);
-        $this['type'] = 'file';
+        $this[ 'type' ] = 'file';
         $this->UseNameAsDefaultLabel();
     }
 }

src/User/HTMLForm/CreateUserFormExample.php

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
                         "pear"   => "pear",
                         "banana" => "banana",
                     ],
-                    "checked"   => ["potato", "pear"],
+                    "checked"   => [ "potato", "pear" ],
                 ],
 
                 "color" => [
@@ -199,7 +199,7 @@ 
                 "submit" => [
                     "type" => "submit",
                     "value" => "Submit",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );

src/User/HTMLForm/UserLoginFormExample.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
                 "submit" => [
                     "type" => "submit",
                     "value" => "Login",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );

src/User/HTMLForm/CreateQuestionForm.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
                 "submit" => [
                     "type" => "submit",
                     "value" => "Ställ fråga",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );

src/User/HTMLForm/CreateAnswerCommentsForm.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
                 "submit" => [
                     "type" => "submit",
                     "value" => "Skicka",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );