murrant / librenmsv2

app/Models/DeviceGroup.php

Doc Comments +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
     /**
      * Extract an array of tables in a pattern
      *
-     * @param $pattern
+     * @param string $pattern
      * @return array
      */
     private function getTablesFromPattern($pattern)
@@ -203,7 +203,7 @@ 
      * Convert a v1 device group pattern to v2 style
      *
      * @param $pattern
-     * @return array
+     * @return string
      */
     private function convertV1Pattern($pattern)
     {

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
         $related = $this->getRelation('deviceCountRelation')->first();
 
         // then return the count directly
-        return ($related) ? (int)$related->count : 0;
+        return ($related) ? (int) $related->count : 0;
     }
 
     /**
@@ -191,7 +191,7 @@ 
         if (starts_with($pattern, '%')) {
             $pattern = $this->convertV1Pattern($pattern);
 
-            $this->pattern = $pattern;  //TODO: does not save, only updates this instance
+            $this->pattern = $pattern; //TODO: does not save, only updates this instance
         }
 
         return $pattern;

Braces +14 added lines, -7 removed lines

@@ -144,7 +144,8 @@ 
         $query = null;
         if (count($tables) == 1) {
             $query = DB::table($tables[0])->select('device_id');
-        } else {
+        }
+        else {
             $query = DB::table('devices')->select('devices.device_id')->distinct();
 
             foreach ($tables as $table) {
@@ -221,14 +222,16 @@ 
             if (starts_with($cur, '%')) {
                 // table and column
                 $out .= substr($cur, 1).' ';
-            } elseif (substr($cur, -1) == '~') {
+            }
+            elseif (substr($cur, -1) == '~') {
                 // like operator
                 $content = $parts[++$i]; // grab the content so we can format it
 
                 if (str_contains($content, '@')) {
                     // contains wildcard
                     $content = str_replace('@', '%', $content);
-                } else {
+                }
+                else {
                     // assume substring
                     $content = '%'.$content.'%';
                 }
@@ -240,14 +243,18 @@ 
 
                 $out .= "LIKE('".$content."') ";
 
-            } elseif ($cur == '&&') {
+            }
+            elseif ($cur == '&&') {
                 $out .= 'AND ';
-            } elseif ($cur == '||') {
+            }
+            elseif ($cur == '||') {
                 $out .= 'OR ';
-            } elseif (in_array($cur, $ops)) {
+            }
+            elseif (in_array($cur, $ops)) {
                 // passthrough operators
                 $out .= $cur.' ';
-            } else {
+            }
+            else {
                 // user supplied input
                 $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input
             }