Improved some tests

Author: vgarvardt

src/Bucket/MetricOperation.php

@@ -22,12 +22,27 @@ public function __construct(array $operations = [])
         array_splice($operations, static::LENGTH);
 
         foreach (array_values($operations) as $key => $value) {
-            $this->offsetSet($key, $value);
+            $this->offsetSet($key, $this->valueToString($value));
         }
 
         $opLength = count($operations);
         for ($i = $opLength; $i < static::LENGTH; $i++) {
             $this->offsetSet($i, Bucket::METRIC_EMPTY_PLACEHOLDER);
         }
     }
+
+    /**
+     * @param mixed $value
+     *
+     * @return string
+     */
+    protected function valueToString($value)
+    {
+        if (!is_scalar($value) && $value !== null && (is_object($value) && !method_exists($value, '__toString'))) {
+            return Bucket::METRIC_EMPTY_PLACEHOLDER;
+        }
+
+        $str = (string)$value;
+        return empty($str) ? Bucket::METRIC_EMPTY_PLACEHOLDER : $str;
+    }
 }

src/Bucket/Plain.php

@@ -75,7 +75,7 @@ public function metricTotalWithSuffix()
      */
     public static function sanitizeMetricName($metric)
     {
-        if ($metric == "") {
+        if ($metric === '') {
             return Bucket::METRIC_EMPTY_PLACEHOLDER;
         }
 

tests/Bucket/HTTPRequestTest.php

@@ -60,6 +60,7 @@ public function testHTTPMetricAlterCallback()
 
         $callback->expects($this->once())
             ->method('__invoke')
+            ->with($this->isInstanceOf(MetricOperation::class), $this->equalTo($request))
             ->will($this->returnValue(new MetricOperation(['new', 'metric', 'here'])));
 
         $bucket = new HTTPRequest('baz', $request, true, $callback);

tests/Bucket/MetricOperationTest.php

@@ -45,6 +45,18 @@ public function operations()
                 ['foo', 'bar', 'baz'],
                 ['one' => 'foo', 'two' => 'bar', 'three' => 'baz', 'four' => 'qux'],
             ],
+            [
+                ['-', '-', '-'],
+                [null],
+            ],
+            [
+                ['-', '-', '-'],
+                [new \stdClass()],
+            ],
+            [
+                ['-', '-', '-'],
+                [''],
+            ],
         ];
     }
 }