BurningFlipside / CommonCode

Http/Rest/SerializationMiddleware.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
         }
     }
 
+    /**
+     * @param string $param
+     */
     private function getParamFromArrayIfSet($array, $param, $default = null)
     {
         if(isset($array[$param]))

Http/WebPage.php

Doc Comments +3 added lines, -1 removed lines

@@ -78,6 +78,9 @@ 
         $this->loader->addPath($dir, $namespace);
     }
 
+    /**
+     * @param string $name
+     */
     public function setTemplateName($name)
     {
         $this->templateName = $name;
@@ -112,7 +115,6 @@ 
      * Add a JavaScript file from a set of files known to the framework
      *
      * @param string $jsFileID the ID of the JS file
-     * @param boolean $async Can the JS file be loaded asynchronously?
      */
     public function addWellKnownJS($jsFileID)
     {

Indentation +9 added lines, -9 removed lines

@@ -22,10 +22,10 @@ 
 
         $twigSettings = array();
         if(\file_exists('/var/php_cache/twig'))
-    	{	
-        	$twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig');
-        	$twigSettings['cache'] = $twigCache;
-		    //$twigSettings = array('cache' => $twigCache, 'debug' => true);
+        {	
+            $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig');
+            $twigSettings['cache'] = $twigCache;
+            //$twigSettings = array('cache' => $twigCache, 'debug' => true);
         }
         //$twigSettings['debug'] = true;
 
@@ -52,8 +52,8 @@ 
 
         $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about');
         $this->content['header']['right']['About'] = array(
-          'url' => $this->aboutUrl,
-          'menu' => $this->settings->getGlobalSetting('about_menu', array(
+            'url' => $this->aboutUrl,
+            'menu' => $this->settings->getGlobalSetting('about_menu', array(
             'Burning Flipside' => $this->wwwUrl.'/about/event',
             'AAR, LLC' => $this->wwwUrl.'/organization/aar',
             'Privacy Policy' => $this->wwwUrl.'/about/privacy'
@@ -69,7 +69,7 @@ 
         $this->content['urls']['loginUrl'] = $this->loginUrl;
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
 
-	if($this->user === false || $this->user === null)
+    if($this->user === false || $this->user === null)
         {
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
             {
@@ -203,7 +203,7 @@ 
     {
         if(!isset($this->content['notifications']))
         {
-          $this->content['notifications'] = array();
+            $this->content['notifications'] = array();
         }
         array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible));
     }
@@ -216,7 +216,7 @@ 
     {
         if(!isset($this->content['body']))
         {
-          $this->content['body'] = $this->body;
+            $this->content['body'] = $this->body;
         }
         //Add page JS just before rednering so it is after any added by the page explicitly
         // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js');

Spacing +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 use \Psr\Http\Message\ServerRequestInterface as Request;
 use \Psr\Http\Message\ResponseInterface as Response;
 
-require __DIR__ . '/../vendor/autoload.php';
-require_once(__DIR__ . '/../static.js_css.php');
+require __DIR__.'/../vendor/autoload.php';
+require_once(__DIR__.'/../static.js_css.php');
 
 class WebPage
 {
@@ -16,7 +16,7 @@ 
 
     public function __construct($title)
     {
-        \Sentry\init(['dsn' => 'https://8d76f6c4cb3b409bbe7ed4300e054afd@sentry.io/4283882' ]);
+        \Sentry\init(['dsn' => 'https://8d76f6c4cb3b409bbe7ed4300e054afd@sentry.io/4283882']);
         $this->settings = \Flipside\Settings::getInstance();
         $this->loader = new \Twig_Loader_Filesystem(dirname(__FILE__).'/../templates');
 
@@ -112,7 +112,7 @@ 
             $this->content['css'] = array($uri);
             return;
         }
-        array_push($this->content['css'],$uri);
+        array_push($this->content['css'], $uri);
     }
 
     /**
@@ -127,7 +127,7 @@ 
             $this->content['js'] = array($uri);
             return;
         }
-        array_push($this->content['js'],$uri);
+        array_push($this->content['js'], $uri);
     }
 
     /**
@@ -180,7 +180,7 @@ 
         {
             $data['menu'] = $submenu;
         }
-        $this->content['header']['right'] = array($name => $data)+$this->content['header']['right'];
+        $this->content['header']['right'] = array($name => $data) + $this->content['header']['right'];
     }
 
     /** Notification that is green for success */

Braces +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 
         $twigSettings = array();
         if(\file_exists('/var/php_cache/twig'))
-    	{	
+        {
         	$twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig');
         	$twigSettings['cache'] = $twigCache;
 		    //$twigSettings = array('cache' => $twigCache, 'debug' => true);
@@ -70,7 +70,7 @@ 
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
 
 	if($this->user === false || $this->user === null)
-        {
+	{
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
             {
                 $this->addLink('Login', $this->loginUrl);

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);
     }