BurningFlipside / CommonCode

LDAP/LDAPServer.php

Doc Comments -1 removed lines

@@ -6,7 +6,6 @@
  * @author Chris Wright
  * @version 2.0
  * @param string $subject The subject string
- * @param bool $dn Treat subject as a DN if TRUE
  * @param string|array $ignore Set of characters to leave untouched
  * @return string The escaped string
  */

Serialize/ExcelSerializer.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 {
     protected $types = array('xlsx', 'xls', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.ms-excel');
 
+    /**
+     * @param integer $row
+     */
     protected function setRowFromArray(&$sheat, $row, $array, $count = 0)
     {
         if($count === 0)

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         {
             return null;
         }
-	$data = $this->getArray($array);
+    $data = $this->getArray($array);
         $ssheat = new Spreadsheet();
         $sheat = $ssheat->getActiveSheet();
         $keys = array_shift($data);

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         {
             if(isset($array[$i]))
             {
-                $sheat->setCellValueByColumnAndRow($i+1, $row, $array[$i]);
+                $sheat->setCellValueByColumnAndRow($i + 1, $row, $array[$i]);
             }
         }
     }

Auth/LDAPGettableObject.php

Indentation +14 added lines, -14 removed lines

@@ -35,20 +35,20 @@
     {
         if(isset($this->labeleduri))
         {
-             //Have multiple emails
-             if($propName === 'mail')
-             {
-                 return $this->getFieldSingleValue('labeleduri');
-             }
-             if($propName === 'allMail')
-             {
-                 $tmp = $this->getField('mail');
-                 if(isset($tmp['count']))
-                 {
-                     unset($tmp['count']);
-                 }
-                 return $tmp;
-             }
+                //Have multiple emails
+                if($propName === 'mail')
+                {
+                    return $this->getFieldSingleValue('labeleduri');
+                }
+                if($propName === 'allMail')
+                {
+                    $tmp = $this->getField('mail');
+                    if(isset($tmp['count']))
+                    {
+                        unset($tmp['count']);
+                    }
+                    return $tmp;
+                }
         }
         $tmp = $this->getValueWithDefault($propName);
         if($tmp !== false)

Settings.php

Indentation +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     public function getDataSetData($dataSetName)
     {
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
-	{
+    {
             return false;
         }
         return \FlipsideSettings::$dataset[$dataSetName];

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     public function getDataSetData($dataSetName)
     {
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
-	{
+        {
             return false;
         }
         return \FlipsideSettings::$dataset[$dataSetName];

Log/LogService.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
         \Psr\Log\LogLevel::WARNING,
         \Psr\Log\LogLevel::NOTICE);
 
-    public function __construct($params=false)
+    public function __construct($params = false)
     {
         if(isset($params['defaultLogLevels']))
         {
@@ -27,10 +27,10 @@ 
     {
         // build a replacement array with braces around the context keys
         $replace = array();
-        foreach ($context as $key => $val) {
+        foreach($context as $key => $val) {
             // check that the value can be casted to string
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
-                $replace['{' . $key . '}'] = $val;
+            if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+                $replace['{'.$key.'}'] = $val;
             }
         }
 

Braces +4 added lines, -2 removed lines

@@ -27,9 +27,11 @@
     {
         // build a replacement array with braces around the context keys
         $replace = array();
-        foreach ($context as $key => $val) {
+        foreach ($context as $key => $val)
+        {
             // check that the value can be casted to string
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')))
+            {
                 $replace['{' . $key . '}'] = $val;
             }
         }

Log/PHPLog.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 class PHPLog extends LogService
 {
-    public function __construct($params=false)
+    public function __construct($params = false)
     {
         parent::__construct($params);
     }

Data/ObjectDataTable.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $objCount = count($res);
         for($i = 0; $i < $objCount; $i++)
         {
-           $res[$i] = new $this->className($res[$i]);
+            $res[$i] = new $this->className($res[$i]);
         }
         return $res;
     }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         return $this->dataTable->create($data);
     }
 
-    public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false, $returnObj=false)
+    public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false, $returnObj = false)
     {
         $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params);
         if($res === false)
@@ -67,7 +67,7 @@ 
         return $this->dataTable->delete($filter);
     }
 
-    public function count($filter=false)
+    public function count($filter = false)
     {
         return $this->dataTable->count($filter);
     }

Data/CSVDataTable.php

Indentation +14 added lines, -14 removed lines

@@ -9,33 +9,33 @@
     public function __construct($file)
     {
         $this->data = array_map('str_getcsv', file($file));
-	$titles = array_shift($this->data);
-	$count = count($this->data);
-	for($i = 0; $i < $count; $i++)
-	{
+    $titles = array_shift($this->data);
+    $count = count($this->data);
+    for($i = 0; $i < $count; $i++)
+    {
             $this->data[$i] = array_combine($titles, $this->data[$i]);
-	}
+    }
     }
 
     public function count($filter = false)
     {
         if($filter)
-	{
+    {
             $res = $this->data;
-	    $res = $filter->filter_array($res);
-	    return count($res);
-	}
-	return count($this->data);
+        $res = $filter->filter_array($res);
+        return count($res);
+    }
+    return count($this->data);
     }
   
     public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
         $res = $this->data;
-	if($filter !== false)
-	{
+    if($filter !== false)
+    {
             $res = $filter->filter_array($res);
-	}
-	return $res;
+    }
+    return $res;
     }
 
     public function create($data)

Braces +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function count($filter = false)
     {
         if($filter)
-	{
+        {
             $res = $this->data;
 	    $res = $filter->filter_array($res);
 	    return count($res);

Data/MongoDataSet.php

Braces +5 added lines, -2 removed lines

@@ -141,9 +141,12 @@
     {
         $namespace = $this->db_name.'.'.$collectionName;
         $dbWrite = new \MongoDB\Driver\BulkWrite();
-        try {
+        try
+        {
             $dbWrite->update($criteria, $new_object, $options);
-        } catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) {
+        }
+        catch(\MongoDB\Driver\Exception\InvalidArgumentException $e)
+        {
             if(isset($new_object['$set']['']))
             {
                 unset($new_object['$set']['']);