Improve tests and coverage (#38)

- Adds more tests for better coverage
- Gets rid of legacy tests of analytics
- Removes composer from dependabot checks
- Minor fixes of models found from new tests

Author: aawnu

.github/dependabot.yml

@@ -9,12 +9,3 @@ updates:
       day: "monday"
     assignees:
       - "octocat"
-
-  # Maintain dependencies for Composer
-  - package-ecosystem: "composer"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-      day: "monday"
-    assignees:
-      - "octocat"

CONTRIBUTING.md

@@ -1,14 +1,14 @@
 # Contribute
 
-Thank you for being interesting in this package and wanting to contribute to it.
+Thank you for being interested in this package and wanting to contribute to it.
 
 ## Coding
 
 New code should be introduced to the codebase through issues that specify what you are trying to accomplish.
 I understand that sometimes you need to add/update/delete code otherwhere in the codebase to achieve this goal.
 This is why my test always merges master in to ensure that your code stays functional/executable during development.
 
-Please adhere these pointers:
+**Please adhere these pointers:**
 * Support selected PHP Versions | Ref: [Master/Composer.json](https://github.com/AlexWestergaard/php-ga4/blob/master/composer.json)
 * Pass current tests without modification; unless clearly explaining why the change is necessary/required | `> vendor/bin/phpunit`
 * PHPUnit tests should confidently ensure that code doesn't fail/error in unwated ways (eg. E_WARNINGS or missing paranthesis)

phpunit.xml

@@ -17,10 +17,10 @@
         </include>
         <exclude>
             <directory suffix=".php">./src/Facade</directory>
+            <file>./src/GA4Exception.php</file>
         </exclude>
         <report>
-            <text outputFile="./.phpunit/coverage.txt" showUncoveredFiles="true"
-                showOnlySummary="false" />
+            <text outputFile="./.phpunit/coverage.txt" showUncoveredFiles="true" showOnlySummary="false" />
         </report>
     </coverage>
     <php>

src/Analytics.php

@@ -76,10 +76,6 @@ public function setTimestampMicros(int|float $microOrUnix)
         $secondInMicro = 1_000_000;
         $offsetLimit = (strtotime('-3 days') + 90) * $secondInMicro;
 
-        if (!is_numeric($microOrUnix)) {
-            throw Ga4Exception::throwMicrotimeInvalidFormat();
-        }
-
         $formattedTime =  floor($microOrUnix * $secondInMicro);
         if ($formattedTime < $offsetLimit) {
             throw Ga4Exception::throwMicrotimeExpired();
@@ -162,10 +158,10 @@ public function post(): void
                     }
                 }
             }
+        }
 
-            if (Ga4Exception::hasThrowStack()) {
-                throw Ga4Exception::getThrowStack();
-            }
+        if (Ga4Exception::hasThrowStack()) {
+            throw Ga4Exception::getThrowStack();
         }
     }
 

src/Exception/Ga4Exception.php

@@ -42,11 +42,6 @@ public static function throwMissingApiSecret()
         return new static("Timestamp must be numeric", static::REQUEST_MISSING_API_SECRET);
     }
 
-    public static function throwMicrotimeInvalidFormat()
-    {
-        return new static("Timestamp must be numeric", static::MICROTIME_INVALID_FORMAT);
-    }
-
     public static function throwMicrotimeExpired()
     {
         return new static("Timestamp is too old, max 3 days", static::MICROTIME_EXPIRED);

src/Exception/Ga4ItemException.php

@@ -13,4 +13,9 @@ public static function throwNameTooLong($name)
     {
         return new static("Name is too long, max is 24: $name", static::PARAM_TOO_LONG);
     }
+
+    public static function throwNameMissing()
+    {
+        return new static("Name is missing", static::PARAM_MISSING);
+    }
 }

src/Exception/Ga4UserPropertyException.php

@@ -10,6 +10,7 @@ interface Ga4Exception
     const PARAM_MISSING_REQUIRED = 102001;
     const PARAM_RESERVED = 102002;
     const PARAM_TOO_LONG = 102003;
+    const PARAM_MISSING = 102004;
 
     const EVENT_NAME_RESERVED = 103001;
     const EVENT_NAME_MISSING = 103002;

src/Facade/Type/Ga4Exception.php

@@ -2,7 +2,14 @@
 
 namespace AlexWestergaard\PhpGa4;
 
+use AlexWestergaard\PhpGa4\Exception\Ga4Exception as ExceptionGa4Exception;
+
 /** @deprecated 1.1.1 */
 class GA4Exception extends \Exception
 {
+    public function __construct(string $message = "", int $code = 0, \Throwable|null $previous = null)
+    {
+        $new = new ExceptionGa4Exception($message, $code);
+        parent::__construct("This exception is deprecated, check previous for your exception", 0, $new);
+    }
 }

src/GA4Exception.php

@@ -28,15 +28,20 @@ public function toArray(): array
     {
         $return = [];
 
-        $return[$this->name] = $this->value;
+        if (!isset($this->name)) {
+            throw Ga4UserPropertyException::throwNameMissing();
+        }
 
-        if (!is_array($this->value)) {
-            $return[$this->name] = ['value' => $this->value];
+        $value = isset($this->value) ? $this->value : null;
+        if (!is_array($value)) {
+            $value = ['value' => $value];
         }
 
+        $return[$this->name] = $value;
+
         return $return;
     }
-    
+
     public static function new(): static
     {
         return new static();