Fixes for PR comments, updated phpunit livrary version

Author: vgarvardt

.travis.yml

@@ -3,9 +3,11 @@ language: php
 php:
   - '5.6'
   - '7.0'
-
-install:
-  - composer install -n
+  - '7.1'
 
 script:
-  - phpunit
+  - composer install -n
+  - vendor/bin/phpunit
+  - rm -rf vendor
+  - composer update --prefer-lowest -n
+  - vendor/bin/phpunit

composer.json

@@ -18,7 +18,7 @@
     "behat/transliterator": "^1.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8.0",
-    "friendsofphp/php-cs-fixer": "^2.3"
+    "friendsofphp/php-cs-fixer": "^2.3",
+    "phpunit/phpunit": "^5.7"
   }
 }

src/Bucket.php

@@ -2,7 +2,9 @@
 
 namespace HelloFresh\Stats;
 
-
+/**
+ * Describes a bucket instance, responsible for building different types of metrics for an operation.
+ */
 interface Bucket
 {
     const TOTAL_BUCKET = 'total';
@@ -18,21 +20,29 @@ interface Bucket
     const DEFAULT_HTTP_REQUEST_SECTION = 'request';
 
     /**
+     * Builds simple metric name in the form "<section>.<operation-0>.<operation-1>.<operation-2>".
+     *
      * @return string
      */
     public function metric();
 
     /**
+     * Builds metric name with success suffix in the form "<section>-ok|fail.<operation-0>.<operation-1>.<operation-2>".
+     *
      * @return string
      */
     public function metricWithSuffix();
 
     /**
+     * Builds simple total metric name in the form total.<section>".
+     *
      * @return string
      */
     public function metricTotal();
 
     /**
+     * Builds total metric name with success suffix in the form total-ok|fail.<section>"
+     *
      * @return string
      */
     public function metricTotalWithSuffix();

src/Bucket/HTTPRequest.php

@@ -8,11 +8,6 @@
 
 class HTTPRequest extends Plain
 {
-    /** @var RequestInterface */
-    protected $request;
-    /** @var HTTPMetricAlterCallback */
-    protected $httpMetricAlterCallback;
-
     /**
      * HTTPRequest constructor.
      *
@@ -23,22 +18,22 @@ class HTTPRequest extends Plain
      */
     public function __construct($section, RequestInterface $request, $success, HTTPMetricAlterCallback $callback = null)
     {
-        $this->request = $request;
-        $this->httpMetricAlterCallback = $callback;
-
-        parent::__construct($section, $this->buildMetricOperation(), $success);
+        parent::__construct($section, $this->buildMetricOperation($request, $callback), $success);
     }
 
     /**
-     * @return MetricOperation
+     * @param RequestInterface $request
+     * @param HTTPMetricAlterCallback $callback
+     *
+     * @return MetricOperation|mixed
      */
-    public function buildMetricOperation()
+    public function buildMetricOperation(RequestInterface $request, HTTPMetricAlterCallback $callback)
     {
-        $operation = new MetricOperation(strtolower($this->request->getMethod()));
-        if ($this->request->getUri()->getPath() != '/') {
+        $operation = new MetricOperation(strtolower($request->getMethod()));
+        if ($request->getUri()->getPath() !== '/') {
             $partsFilled = 1;
-            foreach (explode('/', $this->request->getUri()->getPath()) as $fragment) {
-                if ($fragment == '') {
+            foreach (explode('/', $request->getUri()->getPath()) as $fragment) {
+                if ($fragment === '') {
                     continue;
                 }
 
@@ -50,8 +45,8 @@ public function buildMetricOperation()
             }
         }
 
-        if (null != $this->httpMetricAlterCallback) {
-            $operation = call_user_func_array($this->httpMetricAlterCallback, [$operation, $this->request]);
+        if (null !== $callback) {
+            $operation = call_user_func_array($callback, [$operation, $request]);
         }
 
         return $operation;

src/Bucket/MetricOperation.php

@@ -21,7 +21,7 @@ public function __construct(array $operations = [])
         // ensure that operations is not bigger than allowed
         array_splice($operations, static::LENGTH);
 
-        foreach ($operations as $key => $value) {
+        foreach (array_values($operations) as $key => $value) {
             $this->offsetSet($key, $value);
         }
 

src/Client/Base.php src/Client/AbstractClient.phpsrc/Client/Base.php renamed to src/Client/AbstractClient.php

@@ -12,7 +12,7 @@
 use HelloFresh\Stats\Timer;
 use Psr\Http\Message\RequestInterface;
 
-abstract class Base implements Client
+abstract class AbstractClient implements Client
 {
     /** @var string */
     protected $httpRequestSection;

src/Client/Log.php

@@ -9,11 +9,16 @@
 use HelloFresh\Stats\Timer;
 use Psr\Log\LoggerInterface;
 
-class Log extends Base implements Client
+class Log extends AbstractClient implements Client
 {
     /** @var LoggerInterface */
     protected $logger;
 
+    /** @var Incrementer\Log */
+    protected $incrementer;
+    /** @var State\Log */
+    protected $state;
+
     /**
      * Log constructor.
      *
@@ -38,14 +43,20 @@ public function buildTimer()
      */
     protected function getIncrementer()
     {
-        return new Incrementer\Log($this->logger);
+        if (null === $this->incrementer) {
+            $this->incrementer = new Incrementer\Log($this->logger);
+        }
+        return $this->incrementer;
     }
 
     /**
      * @inheritdoc
      */
     protected function getState()
     {
-        return new State\Log($this->logger);
+        if (null === $this->state) {
+            $this->state = new State\Log($this->logger);
+        }
+        return $this->state;
     }
 }

src/Client/NoOp.php

@@ -8,8 +8,13 @@
 use HelloFresh\Stats\State;
 use HelloFresh\Stats\Timer\Memory;
 
-class NoOp extends Base implements Client
+class NoOp extends AbstractClient implements Client
 {
+    /** @var Incrementer\NoOp */
+    protected $incrementer;
+    /** @var State\NoOp */
+    protected $state;
+
     /**
      * @inheritdoc
      */
@@ -19,18 +24,24 @@ public function buildTimer()
     }
 
     /**
-     * @return Incrementer
+     * @inheritdoc
      */
     protected function getIncrementer()
     {
-        return new Incrementer\NoOp();
+        if (null === $this->incrementer) {
+            $this->incrementer = new Incrementer\NoOp();
+        }
+        return $this->incrementer;
     }
 
     /**
-     * @return State
+     * @inheritdoc
      */
     protected function getState()
     {
-        return new State\NoOp();
+        if (null === $this->state) {
+            $this->state = new State\NoOp();
+        }
+        return $this->state;
     }
 }

src/Client/StatsD.php

@@ -10,7 +10,7 @@
 use HelloFresh\Stats\Timer\StatsD as StatsDTimer;
 use League\StatsD\Client as StatsDClient;
 
-class StatsD extends Base implements Client
+class StatsD extends AbstractClient implements Client
 {
     /** @var string */
     protected $httpRequestSection;
@@ -19,19 +19,24 @@ class StatsD extends Base implements Client
     /** @var StatsDClient */
     protected $client;
 
+    /** @var Incrementer\StatsD */
+    protected $incrementer;
+    /** @var State\StatsD */
+    protected $state;
+
     /**
      * StatsD constructor.
      *
      * @param string $dsn statsd connection dsn
      */
     public function __construct($dsn)
     {
-        $url = parse_url($dsn);
+        $url = (array)parse_url($dsn);
 
         $params = parse_str(empty($url['query']) ? '' : $url['query']);
         $options = [
-            'host' => $url['host'],
-            'port' => $url['port'],
+            'host' => empty($url['host']) ? 'localhost' : '',
+            'port' => empty($url['port']) ? $url['port'] : 8125,
             'namespace' => empty($params['ns']) ? '' : $params['ns'],
             'timeout' => empty($params['timeout']) ? null : (float)$params['timeout'],
             'throwConnectionExceptions' => empty($params['error']) ? true : (bool)$params['error'],
@@ -53,14 +58,20 @@ public function buildTimer()
      */
     protected function getIncrementer()
     {
-        return new Incrementer\StatsD($this->client);
+        if (null === $this->incrementer) {
+            $this->incrementer = new Incrementer\StatsD($this->client);
+        }
+        return $this->incrementer;
     }
 
     /**
      * @inheritdoc
      */
     protected function getState()
     {
-        return new State\StatsD($this->client);
+        if (null === $this->state) {
+            $this->state = new State\StatsD($this->client);
+        }
+        return $this->state;
     }
 }

src/Factory.php

@@ -25,8 +25,7 @@ class Factory
      */
     public static function build($dsn, LoggerInterface $logger)
     {
-        $url = parse_url($dsn);
-        switch ($url['scheme']) {
+        switch (parse_url($dsn, PHP_URL_SCHEME)) {
             case static::STATSD:
                 return new StatsD($dsn);