rdorado / site-analyzer

src/Persistence.php

Spacing +108 added lines, -108 removed lines

@@ -20,34 +20,34 @@ 
  * @copyright 2018 Ruben Dorado
  * @license   http://www.opensource.org/licenses/MIT The MIT License
  */
-class Persistence{
+class Persistence {
 
     /*
      * @param Configuration $config
      *
      * @return PDO
      */
-    public static function getPDO($config){
+    public static function getPDO($config) {
         $options = array(
             PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
         );
         
-        if($config->getDsn()){
-            try{
-                return new PDO($config->getDsn(),$config->getUser(),$config->getPassword(),$options);
+        if ($config->getDsn()) {
+            try {
+                return new PDO($config->getDsn(), $config->getUser(), $config->getPassword(), $options);
             }
-            catch(Exception $e){                
-                if(!$config->getUseOnMemoryDB()){
+            catch (Exception $e) {                
+                if (!$config->getUseOnMemoryDB()) {
                     throw new Exception("Could not create a db connection. Check permissions, configuration, and documentation. ".$e->getMessage());
                 }
             }
         }
         
-        if($config->getUseOnMemoryDB()){
-            try{
-                return new PDO("sqlite::memory:",$options);
+        if ($config->getUseOnMemoryDB()) {
+            try {
+                return new PDO("sqlite::memory:", $options);
             }
-            catch(Exception $e){
+            catch (Exception $e) {
                 throw new Exception("Could not create a db connection. Check permissions, configuration, and documentation. ".$e->getMessage());                
             }
         }
@@ -61,8 +61,8 @@ 
      * @param $config Configuration
      *
      */
-    public static function crateDatabase($pdo, $config){
-        try{
+    public static function crateDatabase($pdo, $config) {
+        try {
 
             $db_hit_table = $config->getHitTableName();
             $db_options_table = $config->getOptionsTableName();           
@@ -78,7 +78,7 @@ 
             $stmt = $pdo->prepare("CREATE TABLE $db_url_table (id VARCHAR(255), url VARCHAR(255), count INT)");
             $stmt->execute();
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Could not create the database. ".$e->getMessage());
         }        
         return true;
@@ -91,7 +91,7 @@ 
      * @param $config Configuration
      *
      */
-    public static function deleteDatabase($pdo, $config){
+    public static function deleteDatabase($pdo, $config) {
         $resp = true;
         
         $db_hit_table = $config->getHitTableName();
@@ -113,14 +113,14 @@ 
      * @param $config Configuration
      *
      */
-    private static function dropTable($pdo, $tableName){
-        try{
+    private static function dropTable($pdo, $tableName) {
+        try {
             
             $stmt = $pdo->prepare("DROP TABLE $tableName");
             $stmt->execute();
            
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Problem deleting the table $tableName. ".$e->getMessage());
         }
         return true;
@@ -132,16 +132,16 @@ 
      * @param $config Configuration
      *
      */
-    public static function checkTables($pdo, $config){
+    public static function checkTables($pdo, $config) {
         $resp = true;      
-        try{
+        try {
             
             $resp = $resp && Persistence::checkHitTable($pdo, $config);
             $resp = $resp && Persistence::checkOptionsTable($pdo, $config);
             $resp = $resp && Persistence::checkFromTable($pdo, $config);
             $resp = $resp && Persistence::checkUrlTable($pdo, $config);
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             return false;
         }        
         return $resp;
@@ -152,14 +152,14 @@ 
      * @param $pdo PDO
      * @param $config Configuration
      */
-    public static function checkFromTable($pdo, $config){
-        try{
+    public static function checkFromTable($pdo, $config) {
+        try {
             $db_from_table = $config->getFromTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_from_table WHERE 1==0");
             $stmt->execute();
             
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             return false;
         }
         return true;
@@ -169,13 +169,13 @@ 
      * @param $pdo PDO
      * @param $config Configuration
      */
-    public static function checkUrlTable($pdo, $config){
-        try{
+    public static function checkUrlTable($pdo, $config) {
+        try {
             $db_url_table = $config->getUrlTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_url_table WHERE 1==0");
             $stmt->execute();            
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             return false;
         }
         return true;
@@ -187,13 +187,13 @@ 
      * @param $pdo PDO
      * @param $config Configuration
      */
-    public static function checkOptionsTable($pdo, $config){
-        try{
+    public static function checkOptionsTable($pdo, $config) {
+        try {
             $db_options_table = $config->getOptionsTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_options_table WHERE 1==0");
             $stmt->execute();
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             return false;
         }
         return true;
@@ -203,13 +203,13 @@ 
      * @param $pdo PDO
      * @param $config Configuration
      */
-    public static function checkHitTable($pdo, $config){
-        try{
+    public static function checkHitTable($pdo, $config) {
+        try {
             $db_hit_table = $config->getHitTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_hit_table WHERE 1==0");
             $stmt->execute();            
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             return false;
         }
         return true;        
@@ -221,7 +221,7 @@ 
      * @param $config Configuration
      *
      */
-    public static function updateCount($pdo, $config, $options=[]){
+    public static function updateCount($pdo, $config, $options = []) {
 
         $db_hit_table = $config->getHitTableName();
         $db_options_table = $config->getOptionsTableName();
@@ -232,54 +232,54 @@ 
         $store_time = true;
         $store_user = true;
         
-        if(array_key_exists('url', $options)){
+        if (array_key_exists('url', $options)) {
             $url = $options['url'];
         }
-        else if(array_key_exists('HTTP_HOST',$_SERVER)){
+        else if (array_key_exists('HTTP_HOST', $_SERVER)) {
             $url = "http://".$_SERVER['HTTP_HOST'];
-            if(array_key_exists('REQUEST_URI',$_SERVER)){
-                $url=$url.$_SERVER['REQUEST_URI'];
+            if (array_key_exists('REQUEST_URI', $_SERVER)) {
+                $url = $url.$_SERVER['REQUEST_URI'];
             }               
         }
-        else{
+        else {
             $url = "No Info";
         }
 
-        if($config->getRemoveQueryString()){
+        if ($config->getRemoveQueryString()) {
             $url = preg_replace('/\?.*/', '', $url);
         }
         
-        if(array_key_exists('id', $options)){
+        if (array_key_exists('id', $options)) {
             $id = $options['id'];
         }
-        else{
+        else {
             $id = $url;
         }
 
         $stmt = $pdo->prepare("UPDATE $db_hit_table SET count = count + 1 WHERE id = ?");
         $stmt->execute([$id]);
-        if( $stmt->rowCount() == 0 ){
+        if ($stmt->rowCount()==0) {
             $stmt = $pdo->prepare("INSERT INTO $db_hit_table (id, count) VALUES (?, 1)");
             $stmt->execute([$id]);
         }
 
         $stmt = $pdo->prepare("UPDATE $db_url_table SET count = count + 1 WHERE id = ? and url = ?");
         $stmt->execute([$id, $url]);
-        if( $stmt->rowCount() == 0 ){
+        if ($stmt->rowCount()==0) {
             $stmt = $pdo->prepare("INSERT INTO $db_url_table (id, url, count) VALUES (?, ?, 1)");
             $stmt->execute([$id, $url]);
         }
         
         
-        if($store_from){
+        if ($store_from) {
                         
-            if(array_key_exists('from_id', $options)){
+            if (array_key_exists('from_id', $options)) {
                 $ids = [$options['from_id']];
             }
-            else{
+            else {
                 $from_url = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 'No referer info';
-                $ids = Persistence::findHitIdsByUrl($pdo,$config,$from_url); 
-                if(count($ids)==0){
+                $ids = Persistence::findHitIdsByUrl($pdo, $config, $from_url); 
+                if (count($ids)==0) {
                     $stmt = $pdo->prepare("INSERT INTO $db_url_table (id, url, count) VALUES (?, ?, 1)");
                     $stmt->execute([$from_url, $from_url]);
                     $ids = [$from_url];
@@ -288,7 +288,7 @@ 
             foreach ($ids as $from_id) {
                 $stmt = $pdo->prepare("UPDATE $db_from_table SET count = count + 1 WHERE id = ? and from_id = ?");
                 $stmt->execute([$id, $from_id]);
-                if( $stmt->rowCount() == 0 ){
+                if ($stmt->rowCount()==0) {
                     $stmt = $pdo->prepare("INSERT INTO $db_from_table (id, from_id, count) VALUES (?, ?, 1)");
                     $stmt->execute([$id, $from_id]);
                 }
@@ -296,13 +296,13 @@ 
         }
                     
         $user = null;
-        if($store_user){
-            if(array_key_exists('user', $options)){
+        if ($store_user) {
+            if (array_key_exists('user', $options)) {
                 $user = $options['user'];
             }    
         }
         
-        if($store_time || $store_user){
+        if ($store_time || $store_user) {
             $stmt = $pdo->prepare("INSERT INTO $db_options_table (id, time, user) VALUES (?, ?, ?)");
             $stmt->execute([$id, time(), $user]);
         }
@@ -317,19 +317,19 @@ 
      * @param $config Configuration
      *
      */
-    public static function findHitIdsByUrl($pdo, $config, $url){
+    public static function findHitIdsByUrl($pdo, $config, $url) {
         $resp = [];
-        try{
+        try {
             
             $dbtable = $config->getUrlTableName();
             $stmt = $pdo->prepare("SELECT id,url,count FROM $dbtable WHERE url = '$url'");
-            if($stmt->execute()){
-                while($row = $stmt->fetch()){
+            if ($stmt->execute()) {
+                while ($row = $stmt->fetch()) {
                     $resp[] = $row['id'];
                 }
             }
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error executing function 'findHitsByUrl'. ".$e->getMessage());
         }
         return $resp;
@@ -342,20 +342,20 @@ 
      * @param $config Configuration
      *
      */
-    public static function getAllHits($pdo, $config){
+    public static function getAllHits($pdo, $config) {
         $resp = [];
-        try{
+        try {
             
             $dbtable = $config->getHitTableName();
             $stmt = $pdo->prepare("SELECT id,count FROM $dbtable");
-            if($stmt->execute()){
-                while($row = $stmt->fetch()){
-                    $resp[] = [$row['id'],$row['count']];
+            if ($stmt->execute()) {
+                while ($row = $stmt->fetch()) {
+                    $resp[] = [$row['id'], $row['count']];
                 }
             }
             
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error executing function 'getAllHits'. ".$e->getMessage());
         }
         return $resp;        
@@ -367,36 +367,36 @@ 
      * @param $config Configuration
      *
      */
-    public static function findUrls($pdo, $config, $by=[]){
+    public static function findUrls($pdo, $config, $by = []) {
         $resp = [];
-        try{
+        try {
             $dbtable = $config->getUrlTableName();
             $qdata = [];
             $tquery = [];
-            if(array_key_exists('id',$by)){
+            if (array_key_exists('id', $by)) {
                 $qdata[] = $by['id'];
                 $tquery[] = "id = ?";
             }
             
-            if(array_key_exists('url',$by)){
+            if (array_key_exists('url', $by)) {
                 $qdata[] = $by['url'];
                 $tquery[] = "url = ?";
             }
             
             $sql = "SELECT id,url,count FROM $dbtable";
-            if(count($tquery) > 0){
-                $sql = $sql." WHERE ".join(" AND ",$tquery);
+            if (count($tquery) > 0) {
+                $sql = $sql." WHERE ".join(" AND ", $tquery);
             }
             
             $stmt = $pdo->prepare($sql);
-            if($stmt->execute($qdata)){
-                while($row = $stmt->fetch()){
-                    $resp[] = [$row['id'],$row['url'],$row['count']];
+            if ($stmt->execute($qdata)) {
+                while ($row = $stmt->fetch()) {
+                    $resp[] = [$row['id'], $row['url'], $row['count']];
                 }
             }
             
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error executing function 'getAllUrls'. ".$e->getMessage());
         }
         return $resp;
@@ -407,41 +407,41 @@ 
      * @param $config Configuration
      *
      */
-    public static function findIdByTimeUser($pdo, $config, $by=[]){
-        $resp = [ ];
-        try{
+    public static function findIdByTimeUser($pdo, $config, $by = []) {
+        $resp = [];
+        try {
             $dbtable = $config->getOptionsTableName();
             $qdata = [];
             $tquery = [];
-            if(array_key_exists('from',$by)){
+            if (array_key_exists('from', $by)) {
                 $qdata[] = $by['from'];
                 $tquery[] = "time >= ?";
             }
             
-            if(array_key_exists('to',$by)){
+            if (array_key_exists('to', $by)) {
                 $qdata[] = $by['to'];
                 $tquery[] = "time <= ?";
             }
             
-            if(array_key_exists('user',$by)){
+            if (array_key_exists('user', $by)) {
                 $qdata[] = $by['user'];
                 $tquery[] = "user = ?";
             }
             
             $sql = "SELECT id,time,user FROM $dbtable";
-            if(count($tquery) > 0){
-                $sql = $sql." WHERE ".join(" AND ",$tquery);
+            if (count($tquery) > 0) {
+                $sql = $sql." WHERE ".join(" AND ", $tquery);
             }
             
             $stmt = $pdo->prepare($sql);
-            if($stmt->execute($qdata)){
-                while($row = $stmt->fetch()){
-                    $resp[] = [$row['id'],$row['time'],$row['user']];
+            if ($stmt->execute($qdata)) {
+                while ($row = $stmt->fetch()) {
+                    $resp[] = [$row['id'], $row['time'], $row['user']];
                 }
             }
             
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error executing function 'getAllUrls'. ".$e->getMessage());
         }
         return $resp;
@@ -453,40 +453,40 @@ 
      * @param $config Configuration
      *
      */
-    public static function findByFrom($pdo, $config, $by=[]){
+    public static function findByFrom($pdo, $config, $by = []) {
         $resp = [];
-        try{
+        try {
             $dbFromtable = $config->getFromTableName();
             $dbUrltable = $config->getUrlTableName();
             $qdata = [];
             $tquery = [];
             
-            if(array_key_exists('url',$by) && array_key_exists('id',$by)){
+            if (array_key_exists('url', $by) && array_key_exists('id', $by)) {
                 $qdata = [$by['url'], $by['id']];
                 $tquery = "SELECT f.* FROM  $dbFromtable f,$dbUrltable u WHERE (f.from_id = u.id and f.url = ?) or f.from_id = ?";                
             }
-            else if(array_key_exists('url',$by)){
+            else if (array_key_exists('url', $by)) {
                 $qdata = [$by['url']];
                 $tquery = "SELECT f.* FROM $dbFromtable f,$dbUrltable u where f.from_id = u.id and u.url = ?";
             }
-            else if(array_key_exists('id',$by)){
+            else if (array_key_exists('id', $by)) {
                 $qdata = [$by['id']];
                 $tquery = "SELECT f.* FROM $dbFromtable f where f.from_id = ?";
             }
-            else{
+            else {
                 $qdata = [];
                 $tquery = "SELECT f.* FROM $dbFromtable f";
             }
                                     
             $stmt = $pdo->prepare($tquery);
-            if($stmt->execute($qdata)){
-                while($row = $stmt->fetch()){
-                    $resp[] = [$row['id'],$row['from_id'],$row['count']];
+            if ($stmt->execute($qdata)) {
+                while ($row = $stmt->fetch()) {
+                    $resp[] = [$row['id'], $row['from_id'], $row['count']];
                 }
             }
             
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error executing function 'findByFrom'. ".$e->getMessage());
         }
         return $resp;
@@ -502,20 +502,20 @@ 
     public static function getCounts($pdo, $config)
     {
         $resp = [];
-        try{
+        try {
 
             $dbHitTable = $config->getHitTableName();
             $dbUrlTable = $config->getUrlTableName();
             $stmt = $pdo->prepare("SELECT h.id, u.url, h.count FROM $dbHitTable h, $dbUrlTable u WHERE h.id=u.id");
-            if($stmt->execute()){
-                while($row = $stmt->fetch()){
-                    $resp[] = [$row[0],$row[1],$row[2],];
+            if ($stmt->execute()) {
+                while ($row = $stmt->fetch()) {
+                    $resp[] = [$row[0], $row[1], $row[2], ];
                 }
             }
             
             $stmt = null;
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error reading the database. Method getCounts().".$e->getMessage());
         }        
         return $resp;
@@ -527,21 +527,21 @@ 
      * @param $config Configuration
      *
      */
-    public static function getHitsWithOptions($pdo, $config){
+    public static function getHitsWithOptions($pdo, $config) {
         $resp = [];
-        try{
+        try {
             
             $dbOptionsTable = $config->getOptionsTableName();
             $stmt = $pdo->prepare("SELECT o.id, o.time, o.user FROM $dbOptionsTable o");
-            if($stmt->execute()){
-                while($row = $stmt->fetch()){
-                    $resp[] = ['id'=>$row[0],'time'=>$row[1],'user'=>$row[2],];
+            if ($stmt->execute()) {
+                while ($row = $stmt->fetch()) {
+                    $resp[] = ['id'=>$row[0], 'time'=>$row[1], 'user'=>$row[2], ];
                 }
             }
             
             $stmt = null;
         }
-        catch(Exception $e){
+        catch (Exception $e) {
             throw new Exception("Error reading the database. Method getCounts().".$e->getMessage());
         }
         return $resp;
@@ -552,7 +552,7 @@ 
      * @param $config Configuration
      *
      */    
-    public static function getCountsById($pdo, $config){
+    public static function getCountsById($pdo, $config) {
         return "Works";
     }
 }

Braces +23 added lines, -46 removed lines

@@ -35,8 +35,7 @@ 
         if($config->getDsn()){
             try{
                 return new PDO($config->getDsn(),$config->getUser(),$config->getPassword(),$options);
-            }
-            catch(Exception $e){                
+            } catch(Exception $e){                
                 if(!$config->getUseOnMemoryDB()){
                     throw new Exception("Could not create a db connection. Check permissions, configuration, and documentation. ".$e->getMessage());
                 }
@@ -46,8 +45,7 @@ 
         if($config->getUseOnMemoryDB()){
             try{
                 return new PDO("sqlite::memory:",$options);
-            }
-            catch(Exception $e){
+            } catch(Exception $e){
                 throw new Exception("Could not create a db connection. Check permissions, configuration, and documentation. ".$e->getMessage());                
             }
         }
@@ -77,8 +75,7 @@ 
             $stmt->execute();
             $stmt = $pdo->prepare("CREATE TABLE $db_url_table (id VARCHAR(255), url VARCHAR(255), count INT)");
             $stmt->execute();
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Could not create the database. ".$e->getMessage());
         }        
         return true;
@@ -119,8 +116,7 @@ 
             $stmt = $pdo->prepare("DROP TABLE $tableName");
             $stmt->execute();
            
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Problem deleting the table $tableName. ".$e->getMessage());
         }
         return true;
@@ -140,8 +136,7 @@ 
             $resp = $resp && Persistence::checkOptionsTable($pdo, $config);
             $resp = $resp && Persistence::checkFromTable($pdo, $config);
             $resp = $resp && Persistence::checkUrlTable($pdo, $config);
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }        
         return $resp;
@@ -158,8 +153,7 @@ 
             $stmt = $pdo->prepare("SELECT * FROM $db_from_table WHERE 1==0");
             $stmt->execute();
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;
@@ -174,8 +168,7 @@ 
             $db_url_table = $config->getUrlTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_url_table WHERE 1==0");
             $stmt->execute();            
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;
@@ -192,8 +185,7 @@ 
             $db_options_table = $config->getOptionsTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_options_table WHERE 1==0");
             $stmt->execute();
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;
@@ -208,8 +200,7 @@ 
             $db_hit_table = $config->getHitTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_hit_table WHERE 1==0");
             $stmt->execute();            
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;        
@@ -234,14 +225,12 @@ 
         
         if(array_key_exists('url', $options)){
             $url = $options['url'];
-        }
-        else if(array_key_exists('HTTP_HOST',$_SERVER)){
+        } else if(array_key_exists('HTTP_HOST',$_SERVER)){
             $url = "http://".$_SERVER['HTTP_HOST'];
             if(array_key_exists('REQUEST_URI',$_SERVER)){
                 $url=$url.$_SERVER['REQUEST_URI'];
             }               
-        }
-        else{
+        } else{
             $url = "No Info";
         }
 
@@ -251,8 +240,7 @@ 
         
         if(array_key_exists('id', $options)){
             $id = $options['id'];
-        }
-        else{
+        } else{
             $id = $url;
         }
 
@@ -275,8 +263,7 @@ 
                         
             if(array_key_exists('from_id', $options)){
                 $ids = [$options['from_id']];
-            }
-            else{
+            } else{
                 $from_url = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 'No referer info';
                 $ids = Persistence::findHitIdsByUrl($pdo,$config,$from_url); 
                 if(count($ids)==0){
@@ -328,8 +315,7 @@ 
                     $resp[] = $row['id'];
                 }
             }
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'findHitsByUrl'. ".$e->getMessage());
         }
         return $resp;
@@ -354,8 +340,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'getAllHits'. ".$e->getMessage());
         }
         return $resp;        
@@ -395,8 +380,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'getAllUrls'. ".$e->getMessage());
         }
         return $resp;
@@ -440,8 +424,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'getAllUrls'. ".$e->getMessage());
         }
         return $resp;
@@ -464,16 +447,13 @@ 
             if(array_key_exists('url',$by) && array_key_exists('id',$by)){
                 $qdata = [$by['url'], $by['id']];
                 $tquery = "SELECT f.* FROM  $dbFromtable f,$dbUrltable u WHERE (f.from_id = u.id and f.url = ?) or f.from_id = ?";                
-            }
-            else if(array_key_exists('url',$by)){
+            } else if(array_key_exists('url',$by)){
                 $qdata = [$by['url']];
                 $tquery = "SELECT f.* FROM $dbFromtable f,$dbUrltable u where f.from_id = u.id and u.url = ?";
-            }
-            else if(array_key_exists('id',$by)){
+            } else if(array_key_exists('id',$by)){
                 $qdata = [$by['id']];
                 $tquery = "SELECT f.* FROM $dbFromtable f where f.from_id = ?";
-            }
-            else{
+            } else{
                 $qdata = [];
                 $tquery = "SELECT f.* FROM $dbFromtable f";
             }
@@ -485,8 +465,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'findByFrom'. ".$e->getMessage());
         }
         return $resp;
@@ -514,8 +493,7 @@ 
             }
             
             $stmt = null;
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error reading the database. Method getCounts().".$e->getMessage());
         }        
         return $resp;
@@ -540,8 +518,7 @@ 
             }
             
             $stmt = null;
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error reading the database. Method getCounts().".$e->getMessage());
         }
         return $resp;

src/Configuration.php

Spacing +12 added lines, -12 removed lines

@@ -164,18 +164,18 @@ 
     /*
      * @param configFileName
      */
-    public function __construct($configFileName, $pdoProvided=FALSE)
+    public function __construct($configFileName, $pdoProvided = FALSE)
     {    
         $config = parse_ini_file($configFileName, TRUE); 
-        if(!$pdoProvided){
-            $this->dsn = $this->loadMandatoryVariable($config,"database","dsn");
+        if (!$pdoProvided) {
+            $this->dsn = $this->loadMandatoryVariable($config, "database", "dsn");
         }
         
-        $this->hitTableName = $this->loadMandatoryVariable($config,"database","db_hit_table");
-        $this->fromTableName = $this->loadMandatoryVariable($config,"database","db_from_table");        
-        $this->optionsTableName = $this->loadMandatoryVariable($config,"database","db_options_table");
-        $this->urlTableName = $this->loadMandatoryVariable($config,"database","db_url_table");
-        $this->useOnMemoryDB = $this->loadMandatoryVariable($config,"database","use_onmemorydb");
+        $this->hitTableName = $this->loadMandatoryVariable($config, "database", "db_hit_table");
+        $this->fromTableName = $this->loadMandatoryVariable($config, "database", "db_from_table");        
+        $this->optionsTableName = $this->loadMandatoryVariable($config, "database", "db_options_table");
+        $this->urlTableName = $this->loadMandatoryVariable($config, "database", "db_url_table");
+        $this->useOnMemoryDB = $this->loadMandatoryVariable($config, "database", "use_onmemorydb");
         
         $this->storeTime = isset($config['options']['store_time']) ? strtolower($config['options']['store_time'])=="yes" : false;
         $this->storeUser = isset($config['options']['store_user']) ? strtolower($config['options']['store_user'])=="yes" : false;
@@ -194,13 +194,13 @@ 
      *
      * @return string
      */
-    private function loadMandatoryVariable($configFile,$section,$varname)
+    private function loadMandatoryVariable($configFile, $section, $varname)
     {
-        try{
+        try {
             return $configFile[$section][$varname];
         }
-        catch(Exception $e){
-            throw new Exception( "Error loading config file. Variable $varname in section [$section] not found. Check the configuration file.");
+        catch (Exception $e) {
+            throw new Exception("Error loading config file. Variable $varname in section [$section] not found. Check the configuration file.");
         }
     }
 

Braces +1 added lines, -2 removed lines

@@ -198,8 +198,7 @@
     {
         try{
             return $configFile[$section][$varname];
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception( "Error loading config file. Variable $varname in section [$section] not found. Check the configuration file.");
         }
     }

src/SiteAnalyzer.php

Spacing +39 added lines, -39 removed lines

@@ -18,32 +18,32 @@ 
  * @copyright 2018 Ruben Dorado
  * @license   http://www.opensource.org/licenses/MIT The MIT License
  */
-class SiteAnalyzer{
+class SiteAnalyzer {
 
     
     /*
      * @param 
      */
-    static function count($options=[])
+    static function count($options = [])
     {	
-        $config = SiteAnalyzer::loadConfig( array_key_exists('pdo',$options) );
+        $config = SiteAnalyzer::loadConfig(array_key_exists('pdo', $options));
         
-        if(array_key_exists('pdo',$options)){            
+        if (array_key_exists('pdo', $options)) {            
             $pdo = $options['pdo'];	
         }
-        else{            
+        else {            
             $pdo = Persistence::getPDO($config);
         }
         
-        try{
-            return Persistence::updateCount($pdo,$config,$options);
+        try {
+            return Persistence::updateCount($pdo, $config, $options);
         }
-        catch(Exception $e) {
-            try{
+        catch (Exception $e) {
+            try {
                 Persistence::crateDatabase($pdo, $config);
-                return Persistence::updateCount($pdo,$config,$options);
+                return Persistence::updateCount($pdo, $config, $options);
             }
-            catch(Exception $e) {
+            catch (Exception $e) {
                 throw new Exception("Site Analyzer could connect to the database.".$e->getMessage());
             };
             
@@ -55,17 +55,17 @@ 
     /*
      * @param $format string, one of [php-array, xml, json, txt-csv]
      */
-    public static function loadConfig($pdoProvided=FALSE)
+    public static function loadConfig($pdoProvided = FALSE)
     {
         $config = NULL;
-        try{
-            $config = new Configuration("../../../../site-analyzer.ini",$pdoProvided);
+        try {
+            $config = new Configuration("../../../../site-analyzer.ini", $pdoProvided);
         }
-        catch(Exception $e){
-            try{
-                $config = new Configuration("site-analyzer.ini",$pdoProvided); 
+        catch (Exception $e) {
+            try {
+                $config = new Configuration("site-analyzer.ini", $pdoProvided); 
             }
-            catch(Exception $e){
+            catch (Exception $e) {
                 throw Exception("Config file not found.");
             }
         }
@@ -76,13 +76,13 @@ 
     /*
      * @param $format string, one of [php-array, xml, json, txt-csv]
      */
-    public static function getStats($pdo=null, $renderer=null)
+    public static function getStats($pdo = null, $renderer = null)
     {         
         $config = new Configuration("site-analyzer.ini", isset($pdo));
-        if($pdo==null){
+        if ($pdo==null) {
             $pdo = Persistence::getPDO($config);
         }
-        $data = Persistence::getCounts($pdo,$config);
+        $data = Persistence::getCounts($pdo, $config);
         return $data;
     } 
 
@@ -92,15 +92,15 @@ 
     /*
      * @param
      */
-    public static function groupHitsByTime($criteria, $pdo=null)
+    public static function groupHitsByTime($criteria, $pdo = null)
     {
         $config = new Configuration("site-analyzer.ini", isset($pdo));
-        if($pdo==null){
+        if ($pdo==null) {
             $pdo = Persistence::getPDO($config);
         }
-        $data = Persistence::getHitsWithOptions($pdo,$config);
+        $data = Persistence::getHitsWithOptions($pdo, $config);
         $resp = [];
-        foreach ($data as $row){
+        foreach ($data as $row) {
             $tmp = [$row['id']];
             $tmp = array_merge($tmp, getdate($row['time']));
             $resp[] = $tmp;
@@ -114,26 +114,26 @@ 
     /*
      * @param
      */
-    public static function groupHitsByUser($pdo=null)
+    public static function groupHitsByUser($pdo = null)
     {
         $config = new Configuration("site-analyzer.ini", isset($pdo));
-        if($pdo==null){
+        if ($pdo==null) {
             $pdo = Persistence::getPDO($config);
         }
-        $data = Persistence::getHitsWithOptions($pdo,$config);
+        $data = Persistence::getHitsWithOptions($pdo, $config);
         
         $count = [];
-        foreach ($data as $row){
-            if(array_key_exists($row['user'],$count)){
+        foreach ($data as $row) {
+            if (array_key_exists($row['user'], $count)) {
                 $count[$row['user']]++;
             }
-            else{
-                $count[$row['user']]=1;
+            else {
+                $count[$row['user']] = 1;
             }            
         }
         
         $resp = [];
-        foreach ($count as $user => $count){
+        foreach ($count as $user => $count) {
             $resp[] = [$user, $count];
         }
         return $resp;
@@ -146,14 +146,14 @@ 
      */
     public static function transform($data, $format)
     {
-        if($format=="html"){
+        if ($format=="html") {
             $resp = "<table style='border-collapse: collapse;border: 1px solid black;'>";
-            foreach($data as $row){
-                $resp.="<tr style='border: 1px solid black;'>";
-                foreach($row as $cell){
-                    $resp.="<td style='border: 1px solid black;'>$cell</td>";
+            foreach ($data as $row) {
+                $resp .= "<tr style='border: 1px solid black;'>";
+                foreach ($row as $cell) {
+                    $resp .= "<td style='border: 1px solid black;'>$cell</td>";
                 }  
-                $resp.="</tr>";
+                $resp .= "</tr>";
             }
             return $resp."</table>";
         }

Braces +6 added lines, -12 removed lines

@@ -30,20 +30,17 @@ 
         
         if(array_key_exists('pdo',$options)){            
             $pdo = $options['pdo'];	
-        }
-        else{            
+        } else{            
             $pdo = Persistence::getPDO($config);
         }
         
         try{
             return Persistence::updateCount($pdo,$config,$options);
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             try{
                 Persistence::crateDatabase($pdo, $config);
                 return Persistence::updateCount($pdo,$config,$options);
-            }
-            catch(Exception $e) {
+            } catch(Exception $e) {
                 throw new Exception("Site Analyzer could connect to the database.".$e->getMessage());
             };
             
@@ -60,12 +57,10 @@ 
         $config = NULL;
         try{
             $config = new Configuration("../../../../site-analyzer.ini",$pdoProvided);
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             try{
                 $config = new Configuration("site-analyzer.ini",$pdoProvided); 
-            }
-            catch(Exception $e){
+            } catch(Exception $e){
                 throw Exception("Config file not found.");
             }
         }
@@ -126,8 +121,7 @@ 
         foreach ($data as $row){
             if(array_key_exists($row['user'],$count)){
                 $count[$row['user']]++;
-            }
-            else{
+            } else{
                 $count[$row['user']]=1;
             }            
         }