johannaand / CHTMLTable

src/DatabaseModel/CDatabaseModel.php

Doc Comments -1 removed lines

@@ -219,7 +219,6 @@
   /**
    * Execute the query built.
    *
-   * @param string $query custom query.
    *
    * @return $this
    */

Indentation +173 added lines, -173 removed lines

@@ -12,68 +12,68 @@ 
  
     
     
-   /**
-   * Get the table name.
-   *
-   * @return string with the table name.
-   */
-  public function getSource()
-  {
-      return strtolower(implode('', array_slice(explode('\\', get_class($this)), -1)));
-  }  
+    /**
+     * Get the table name.
+     *
+     * @return string with the table name.
+     */
+    public function getSource()
+    {
+        return strtolower(implode('', array_slice(explode('\\', get_class($this)), -1)));
+    }  
   
-  /**
-   * Find and return all.
-   *
-   * @return array
-   */
-  public function findAll()
-  {
-      $this->db->select()
-               ->from($this->getSource());
+    /**
+     * Find and return all.
+     *
+     * @return array
+     */
+    public function findAll()
+    {
+        $this->db->select()
+                ->from($this->getSource());
    
-      $this->db->execute();
-      $this->db->setFetchModeClass(__CLASS__);
-      return $this->db->fetchAll();
-  }
+        $this->db->execute();
+        $this->db->setFetchModeClass(__CLASS__);
+        return $this->db->fetchAll();
+    }
   
-  /**
-   * Get object properties.
-   *
-   * @return array with object properties.
-   */
-  public function getProperties()
-  {
-      $properties = get_object_vars($this);
-      unset($properties['di']);
-      unset($properties['db']);
+    /**
+     * Get object properties.
+     *
+     * @return array with object properties.
+     */
+    public function getProperties()
+    {
+        $properties = get_object_vars($this);
+        unset($properties['di']);
+        unset($properties['db']);
    
-      return $properties;
-  }
+        return $properties;
+    }
   
   
-  /**
-   * Find and return specific.
-   *
-   * @return this
-   */
-  public function find($id)
-  {
+    /**
+     * Find and return specific.
+     *
+     * @return this
+     */
+    public function find($id)
+    {
     $this->db->select()
-             ->from($this->getSource())
-             ->where("id = ?");
+                ->from($this->getSource())
+                ->where("id = ?");
  
     $this->db->execute([$id]);
     return $this->db->fetchInto($this);
-  }
+    }
   
-  /**
-   * Save current object/row.
-   *
-   * @param array $values key/values to save or empty to use object properties.
-   *
-   * @return boolean true or false if saving went okey.
-   */
+    /**
+     * Save current object/row.
+     *
+     * @param array $values key/values to save or empty to use object properties.
+     *
+     * @return boolean true or false if saving went okey.
+     */
     public function save($values = [])
     {
 
@@ -86,150 +86,150 @@ 
     } else {
         return $this->create($values);
     }
-  }
+    }
   
-  /**
-   * Set object properties.
-   *
-   * @param array $properties with properties to set.
-   *
-   * @return void
-   */
-  public function setProperties($properties)
-  {
-      // Update object with incoming values, if any
-      if (!empty($properties)) {
-          foreach ($properties as $key => $val) {
-              $this->$key = $val;
-          }
-      }
-  }
+    /**
+     * Set object properties.
+     *
+     * @param array $properties with properties to set.
+     *
+     * @return void
+     */
+    public function setProperties($properties)
+    {
+        // Update object with incoming values, if any
+        if (!empty($properties)) {
+            foreach ($properties as $key => $val) {
+                $this->$key = $val;
+            }
+        }
+    }
   
-  /**
-   * Create new row.
-   *
-   * @param array $values key/values to save.
-   *
-   * @return boolean true or false if saving went okey.
-   */
-  public function create($values)
-  {
-      $keys   = array_keys($values);
-      $values = array_values($values);
+    /**
+     * Create new row.
+     *
+     * @param array $values key/values to save.
+     *
+     * @return boolean true or false if saving went okey.
+     */
+    public function create($values)
+    {
+        $keys   = array_keys($values);
+        $values = array_values($values);
    
-      $this->db->insert(
-          $this->getSource(),
-          $keys
-      );
+        $this->db->insert(
+            $this->getSource(),
+            $keys
+        );
    
-      $res = $this->db->execute($values);
+        $res = $this->db->execute($values);
    
-      $this->id = $this->db->lastInsertId();
+        $this->id = $this->db->lastInsertId();
    
-      return $res;
-  }
+        return $res;
+    }
   
   
-  /**
-   * Update row.
-   *
-   * @param array $values key/values to save.
-   *
-   * @return boolean true or false if saving went okey.
-   */
-  public function update($values)
-  {
-		$keys   = array_keys($values);
-      $values = array_values($values);
+    /**
+     * Update row.
+     *
+     * @param array $values key/values to save.
+     *
+     * @return boolean true or false if saving went okey.
+     */
+    public function update($values)
+    {
+        $keys   = array_keys($values);
+        $values = array_values($values);
    
-      // Its update, remove id and use as where-clause
-      unset($keys['id']);
-      $values[] = $this->id;
+        // Its update, remove id and use as where-clause
+        unset($keys['id']);
+        $values[] = $this->id;
    
-      $this->db->update(
-          $this->getSource(),
-          $keys,
-          "id = ?"
-      );
+        $this->db->update(
+            $this->getSource(),
+            $keys,
+            "id = ?"
+        );
    
-      return $this->db->execute($values);
-  }
+        return $this->db->execute($values);
+    }
   
-  /**
-   * Delete row.
-   *
-   * @param integer $id to delete.
-   *
-   * @return boolean true or false if deleting went okey.
-   */
-  public function delete($id)
-  {
-      $this->db->delete(
-          $this->getSource(),
-          'id = ?'
-      );
+    /**
+     * Delete row.
+     *
+     * @param integer $id to delete.
+     *
+     * @return boolean true or false if deleting went okey.
+     */
+    public function delete($id)
+    {
+        $this->db->delete(
+            $this->getSource(),
+            'id = ?'
+        );
    
-      return $this->db->execute([$id]);
-  }
+        return $this->db->execute([$id]);
+    }
   
   
-  /**
-   * Build a select-query.
-   *
-   * @param string $columns which columns to select.
-   *
-   * @return $this
-   */
-  public function query($columns = '*')
-  {
-      $this->db->select($columns)
-               ->from($this->getSource());
+    /**
+     * Build a select-query.
+     *
+     * @param string $columns which columns to select.
+     *
+     * @return $this
+     */
+    public function query($columns = '*')
+    {
+        $this->db->select($columns)
+                ->from($this->getSource());
    
-      return $this;
-  }
+        return $this;
+    }
  
-  /**
-   * Build the where part.
-   *
-   * @param string $condition for building the where part of the query.
-   *
-   * @return $this
-   */
-  public function where($condition)
-  {
-      $this->db->where($condition);
+    /**
+     * Build the where part.
+     *
+     * @param string $condition for building the where part of the query.
+     *
+     * @return $this
+     */
+    public function where($condition)
+    {
+        $this->db->where($condition);
    
-      return $this;
-  }  
+        return $this;
+    }  
     
-  /**
-   * Build the where part.
-   *
-   * @param string $condition for building the where part of the query.
-   *
-   * @return $this
-   */
-  public function andWhere($condition)
-  {
-      $this->db->andWhere($condition);
+    /**
+     * Build the where part.
+     *
+     * @param string $condition for building the where part of the query.
+     *
+     * @return $this
+     */
+    public function andWhere($condition)
+    {
+        $this->db->andWhere($condition);
    
-      return $this;
-  }  
+        return $this;
+    }  
   
-  /**
-   * Execute the query built.
-   *
-   * @param string $query custom query.
-   *
-   * @return $this
-   */
-  public function execute($params = [])
-  {
-      $this->db->execute($this->db->getSQL(), $params);
-      $this->db->setFetchModeClass(__CLASS__);
+    /**
+     * Execute the query built.
+     *
+     * @param string $query custom query.
+     *
+     * @return $this
+     */
+    public function execute($params = [])
+    {
+        $this->db->execute($this->db->getSQL(), $params);
+        $this->db->setFetchModeClass(__CLASS__);
    
-      return $this->db->fetchAll();
-  }
+        return $this->db->fetchAll();
+    }
 
 }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
    */
   public function update($values)
   {
-		$keys   = array_keys($values);
+		$keys = array_keys($values);
       $values = array_values($values);
    
       // Its update, remove id and use as where-clause

autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  * @return void
  */
 spl_autoload_register(
-    function ($class) {
+    function($class) {
 
         // project-specific namespace prefix
         //$prefix = 'Foo\\Bar\\';

src/DatabaseModel/Movie.php

Indentation +15 added lines, -15 removed lines

@@ -7,10 +7,10 @@ 
 class Movie extends \Jovis\DatabaseModel\CDatabaseModel
 {
          
-  public function init()
-  {
+    public function init()
+    {
     $this->db->dropTableIfExists('movie')
-                 ->execute();
+                    ->execute();
         
         $this->db->createTable(
                         'movie',
@@ -28,30 +28,30 @@ 
         $this->db->insert(
             'movie',
             ['title', 'director', 'length', 'year']
-         );
+            );
             
-         $this->db->execute(['Kalles drömmar', 'Gustav Andersson', '120', '1977']);
+            $this->db->execute(['Kalles drömmar', 'Gustav Andersson', '120', '1977']);
          
-         $this->db->insert(
+            $this->db->insert(
             'movie',
             ['title', 'director', 'length', 'year']
-         );
+            );
             
-         $this->db->execute(['Gustavs drömmar', 'Kalle Andersson', '101', '2007']);
+            $this->db->execute(['Gustavs drömmar', 'Kalle Andersson', '101', '2007']);
          
-         $this->db->insert(
+            $this->db->insert(
             'movie',
             ['title', 'director', 'length', 'year']
-         );
+            );
             
-         $this->db->execute(['Mammas drömmar', 'Johanna Andersson', '25', '2010']);
+            $this->db->execute(['Mammas drömmar', 'Johanna Andersson', '25', '2010']);
          
-         $this->db->insert(
+            $this->db->insert(
             'movie',
             ['title', 'director', 'length', 'year']
-         );
+            );
             
-         $this->db->execute(['Goda kakor', 'Hannes Andersson', '110', '1954']);
+            $this->db->execute(['Goda kakor', 'Hannes Andersson', '110', '1954']);
             
-  }
+    }
 }

src/HTMLTable/CHTMLTable.php

Indentation +26 added lines, -26 removed lines

@@ -8,23 +8,23 @@ 
 
 class CHTMLTable{ 
   
-  private $data;
+    private $data;
   
-  //tar emot en headline som enkel array och data som tvådimensionell array
-  public function __construct($headline, $data){
+    //tar emot en headline som enkel array och data som tvådimensionell array
+    public function __construct($headline, $data){
     $this->data = $data;
     $this->headline = $headline;
-  }
+    }
  
- /**
-  * skapar en tabell (sträng) med rubriker från den endimensionella 
-  * arrayen $headline och innehåll från
-  * den tvådimensionella arrayen $data array
-  *
-  * @return string $html, sträng innehållande en tabell
-  */
+    /**
+     * skapar en tabell (sträng) med rubriker från den endimensionella 
+     * arrayen $headline och innehåll från
+     * den tvådimensionella arrayen $data array
+     *
+     * @return string $html, sträng innehållande en tabell
+     */
    
-  public function getTable(){
+    public function getTable(){
     
     $table = "";
     
@@ -32,20 +32,20 @@ 
       <table class>
         <tr class='rows'>";
         
-   foreach($this->headline as $h) {
-      $table.= "<th>" . $h ."</th>";
-     }
+    foreach($this->headline as $h) {
+        $table.= "<th>" . $h ."</th>";
+        }
    
-   $table .= "</tr>";
-   foreach($this->data as $d){
-     $table .= "<tr>";  
-     foreach ($d as $v) {
-       $table .= "<td>$v</td>";
-     }
-     $table .= "</tr>";
-   }
-   $table .="</table></div>";
+    $table .= "</tr>";
+    foreach($this->data as $d){
+        $table .= "<tr>";  
+        foreach ($d as $v) {
+        $table .= "<td>$v</td>";
+        }
+        $table .= "</tr>";
+    }
+    $table .="</table></div>";
     
-   return $table;
-  }
+    return $table;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -6,12 +6,12 @@ 
 *
 */
 
-class CHTMLTable{ 
+class CHTMLTable { 
   
   private $data;
   
   //tar emot en headline som enkel array och data som tvådimensionell array
-  public function __construct($headline, $data){
+  public function __construct($headline, $data) {
     $this->data = $data;
     $this->headline = $headline;
   }
@@ -24,7 +24,7 @@ 
   * @return string $html, sträng innehållande en tabell
   */
    
-  public function getTable(){
+  public function getTable() {
     
     $table = "";
     
@@ -32,19 +32,19 @@ 
       <table class>
         <tr class='rows'>";
         
-   foreach($this->headline as $h) {
-      $table.= "<th>" . $h ."</th>";
+   foreach ($this->headline as $h) {
+      $table .= "<th>" . $h . "</th>";
      }
    
    $table .= "</tr>";
-   foreach($this->data as $d){
+   foreach ($this->data as $d) {
      $table .= "<tr>";  
      foreach ($d as $v) {
        $table .= "<td>$v</td>";
      }
      $table .= "</tr>";
    }
-   $table .="</table></div>";
+   $table .= "</table></div>";
     
    return $table;
   }

src/HTMLTable/TableController.php

Indentation +39 added lines, -39 removed lines

@@ -10,63 +10,63 @@
 {
     use \Anax\DI\TInjectable;
       
-   /**
-   * Lists all instances of the model, (databasetable) except for noListing.
-   *
-   * @param $noListing params not to be listed
-   * @param $model model object to list (create an html table from) 
-   *
-   * @return void
-   */
-  public function listAction($noListing = NULL, $model)
-  {
+    /**
+     * Lists all instances of the model, (databasetable) except for noListing.
+     *
+     * @param $noListing params not to be listed
+     * @param $model model object to list (create an html table from) 
+     *
+     * @return void
+     */
+    public function listAction($noListing = NULL, $model)
+    {
 
-      $this->model = $model;
-      $this->model->setDI($this->di);
+        $this->model = $model;
+        $this->model->setDI($this->di);
    
-      $all = $this->model->findAll();
+        $all = $this->model->findAll();
       
-      $aContent;
+        $aContent;
       
-      //gör om arrayen av objekt till en array av arrayer
-      foreach ($all as $key1=>$value) {
+        //gör om arrayen av objekt till en array av arrayer
+        foreach ($all as $key1=>$value) {
         foreach ($value as $key2=>$v){
-          if (!in_array($key2, $noListing)) { //$noListing, parametrar som inte ska vara med
-              $aContent[$key1][$key2] = $v;
-          }
+            if (!in_array($key2, $noListing)) { //$noListing, parametrar som inte ska vara med
+                $aContent[$key1][$key2] = $v;
+            }
+        }
         }
-      }
      
       
-      $aHeading = [];
-      //hittar objektens parametrar/tabellens kolumnnamn och skapar
-      //en ny array av rubriker
-      foreach ($all as $key1=>$value) {
+        $aHeading = [];
+        //hittar objektens parametrar/tabellens kolumnnamn och skapar
+        //en ny array av rubriker
+        foreach ($all as $key1=>$value) {
         foreach ($value as $key2=>$v){
-          if (!in_array($key2, $noListing)) { //$noListing, parametrar som inte ska vara med
-              $aHeading[] = $key2;
-          }
+            if (!in_array($key2, $noListing)) { //$noListing, parametrar som inte ska vara med
+                $aHeading[] = $key2;
+            }
         }
         break;  
-      }
+        }
       
-      $this->chtml = new \Jovis\HTMLTable\CHTMLTable($aHeading, $aContent);
+        $this->chtml = new \Jovis\HTMLTable\CHTMLTable($aHeading, $aContent);
       
-      $htmltable = $this->chtml->getTable();
-      $source = $this->model->getSource();
+        $htmltable = $this->chtml->getTable();
+        $source = $this->model->getSource();
       
    
-      $this->theme->setTitle("Visa alla användare");
-      $this->views->add('table/list-all', [
-          'title' => $source,
-          'htmltable' => $htmltable,
-      ]);
-  }
+        $this->theme->setTitle("Visa alla användare");
+        $this->views->add('table/list-all', [
+            'title' => $source,
+            'htmltable' => $htmltable,
+        ]);
+    }
   
-   public function initAction($model){ //används för att befolka databasen, bara för att testa
+    public function initAction($model){ //används för att befolka databasen, bara för att testa
     $model->setDI($this->di);
     $model->init();
-  }
+    }
 }
 
 ?>

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
       
       //gör om arrayen av objekt till en array av arrayer
       foreach ($all as $key1=>$value) {
-        foreach ($value as $key2=>$v){
+        foreach ($value as $key2=>$v) {
           if (!in_array($key2, $noListing)) { //$noListing, parametrar som inte ska vara med
               $aContent[$key1][$key2] = $v;
           }
@@ -42,7 +42,7 @@ 
       //hittar objektens parametrar/tabellens kolumnnamn och skapar
       //en ny array av rubriker
       foreach ($all as $key1=>$value) {
-        foreach ($value as $key2=>$v){
+        foreach ($value as $key2=>$v) {
           if (!in_array($key2, $noListing)) { //$noListing, parametrar som inte ska vara med
               $aHeading[] = $key2;
           }
@@ -63,7 +63,7 @@ 
       ]);
   }
   
-   public function initAction($model){ //används för att befolka databasen, bara för att testa
+   public function initAction($model) { //används för att befolka databasen, bara för att testa
     $model->setDI($this->di);
     $model->init();
   }

webroot/table.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     ]);
    
     $noListing = array('password', 'Password', 'pwd'); //namn på kolumner vi inte vill ha med i tabellen
-                                                      //sin skrivs ut
+                                                        //sin skrivs ut
 
     
     

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-require __DIR__.'/config_with_app.php'; 
+require __DIR__ . '/config_with_app.php'; 
 
 $app->url->setUrlType(\Anax\Url\CUrl::URL_CLEAN); 
 
 
 // Create services and inject into the app. 
-$di  = new \Anax\DI\CDIFactoryDefault();
+$di = new \Anax\DI\CDIFactoryDefault();
 
 $di->set('TableController', function() use ($di){
             $controller = new \Jovis\HTMLTable\TableController();
@@ -32,10 +32,10 @@ 
 
     $app->theme->setTitle("HTML-tabell");
       
-    $model = new Jovis\DatabaseModel\Movie();  // modellen man vill skriva ut som html-tabell                                                                                                     
+    $model = new Jovis\DatabaseModel\Movie(); // modellen man vill skriva ut som html-tabell                                                                                                     
       
     
-    $app->dispatcher->forward([ //används bara för att skapa tabell och befolka databasen, för test
+    $app->dispatcher->forward([//används bara för att skapa tabell och befolka databasen, för test
         'controller' => 'table',
         'action'     => 'init',
         'params'    => [$model],