Merge branch 'master' into patch/remove-pa-6qy6p03ef45f

vgarvardt · web-flow · commit 0f5a0a499e39 · 2019-09-18T20:25:29.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - '5.6'
   - '7.0'
   - '7.1'
 
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.3",
     "phpunit/phpunit": "^5.7",
-    "league/statsd": "^1.4"
+    "league/statsd": "^1.5"
   },
   "suggest": {
     "league/statsd": "Required for statsd backend"
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/src/Client/StatsD.php b/src/Client/StatsD.php
@@ -5,8 +5,8 @@
 use HelloFresh\Stats\HTTPMetricAlterCallback;
 use HelloFresh\Stats\Incrementer;
 use HelloFresh\Stats\State;
-use HelloFresh\Stats\StatsD\CachingClient as StatsDClient;
 use HelloFresh\Stats\Timer;
+use League\StatsD\Client as StatsDClient;
 use League\StatsD\Exception\ConfigurationException;
 
 class StatsD extends AbstractClient implements Client
diff --git a/src/StatsD/CachingClient.php b/src/StatsD/CachingClient.php
diff --git a/tests/Client/LogTest.php b/tests/Client/LogTest.php
@@ -5,7 +5,6 @@
 use HelloFresh\Stats\Bucket;
 use HelloFresh\Stats\Bucket\MetricOperation;
 use HelloFresh\Stats\Bucket\Plain;
-use HelloFresh\Stats\State;
 use PHPUnit\Framework\TestCase;
 
 class LogTest extends TestCase

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: php
 php:
 -  - '5.6'
   - '7.0'
   - '7.1'