Merge branch 'grouped' of https://github.com/The-3Labs-Team/php-cloud…

…flare-analytics into grouped
The-3Labs-Team · Aug 5, 2024 · c2db393 · c2db393
2 parents 6928453 + f27264b
commit c2db393
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/CloudflareAnalytics.php b/src/CloudflareAnalytics.php
@@ -2,9 +2,9 @@
 
 namespace The3LabsTeam\PhpCloudflareAnalytics;
 
-use Dotenv\Dotenv;
-use DateTime;
 use DateInterval;
+use DateTime;
+use Dotenv\Dotenv;
 
 class CloudflareAnalytics
 {
@@ -102,6 +102,7 @@ public function orderBy(string $context, string $field, string $direction = 'ASC
     public function take($alias, $limit)
     {
         $this->takes[$alias] = $limit;
+
         return $this;
     }
 
@@ -159,34 +160,35 @@ private function formatFields(array $fields, $alias)
     {
         $formattedFields = [];
         foreach ($fields as $field) {
-            $field = str_replace("$alias.", "", $field); // Rimuove il prefisso alias
+            $field = str_replace("$alias.", '', $field); // Rimuove il prefisso alias
             $parts = explode('.', $field);
             $current = &$formattedFields;
             foreach ($parts as $part) {
-                if (!isset($current[$part])) {
+                if (! isset($current[$part])) {
                     $current[$part] = [];
                 }
                 $current = &$current[$part];
             }
         }
+
         return $this->buildFieldString($formattedFields);
     }
 
     private function buildFieldString(array $fields, $indent = 2)
     {
         $result = '';
         foreach ($fields as $key => $value) {
-            $result .= str_repeat(' ', $indent) . $key;
-            if (is_array($value) && !empty($value)) {
-                $result .= " {\n" . $this->buildFieldString($value, $indent + 2) . str_repeat(' ', $indent) . "}\n";
+            $result .= str_repeat(' ', $indent).$key;
+            if (is_array($value) && ! empty($value)) {
+                $result .= " {\n".$this->buildFieldString($value, $indent + 2).str_repeat(' ', $indent)."}\n";
             } else {
                 $result .= "\n";
             }
         }
+
         return $result;
     }
 
-
     private function formatOrderBy(array $orderBy)
     {
         return implode("\n", array_map(fn ($o) => $o, $orderBy));

diff --git a/tests/CloudflareAnalyticsTest.php b/tests/CloudflareAnalyticsTest.php
@@ -112,4 +112,3 @@
     $this->assertIsArray($results);
     $this->assertGreaterThan(0, $results);
 });
-