Update supported versions of PHP and composer packages (#10)

.gitignore

@@ -1,6 +1,5 @@
 .idea
+.phpunit.cache
 composer.lock
+phpunit.xml
 vendor
-bin
-coverage
-coverage.xml

.travis.yml

@@ -1,16 +1,19 @@
+dist: focal
+
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
+  - 7.4
+  - 8.0
+
+branches:
+  only:
+    - master
 
 before_install:
+  - echo "extension = apcu.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo "apc.enable_cli = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
-before_script:
-  - composer install
-
-script: ./vendor/bin/phpunit --configuration phpunit.xml
+script:
+  - composer test

composer.json

@@ -7,13 +7,17 @@
     {
       "name": "Superbalist.com a division of Takealot Online (Pty) Ltd",
       "email": "[email protected]"
+    },
+    {
+      "name": "Thomas Spencer",
+      "email": "[email protected]"
     }
   ],
   "require": {
-    "php": ">=5.6.0",
-    "illuminate/support": "^5.3 || ^6.0 || ^7.0 || ^8.0",
-    "illuminate/routing": "^5.3 || ^6.0 || ^7.0 || ^8.0",
-    "jimdo/prometheus_client_php": "^0.9.0"
+    "php": "^7.4 || ^8.0",
+    "illuminate/routing": "^8.50",
+    "illuminate/support": "^8.50",
+    "promphp/prometheus_client_php": "^2.0"
   },
   "autoload": {
     "psr-4": {
@@ -22,9 +26,6 @@
     }
   },
   "extra": {
-    "branch-alias": {
-      "dev-master": "1.0-dev"
-    },
     "laravel": {
       "providers": [
         "Healthengine\\LaravelPrometheusExporter\\PrometheusServiceProvider"
@@ -35,7 +36,23 @@
     }
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.5",
-    "mockery/mockery": "^1.2.2"
+    "mockery/mockery": "^1.5",
+    "orchestra/testbench": "^6.3",
+    "phpunit/phpunit": "^9.4"
+  },
+  "config": {
+    "sort-packages": true
+  },
+  "suggest": {
+    "ext-apcu": "To use the APCu driver."
+  },
+  "scripts": {
+    "phpunit": "@php vendor/bin/phpunit",
+    "test": [
+      "@composer update --prefer-lowest",
+      "@composer phpunit",
+      "@composer update",
+      "@composer phpunit"
+    ]
   }
 }

phpunit.xml.dist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnSkipped="true"
+         failOnWarning="true"
+         verbose="true">
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="laravel-prometheus-exporter/tests">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/CollectorInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 interface CollectorInterface
 {

src/ExampleCollector.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 use Prometheus\Gauge;
 

src/MetricsController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Routing\Controller;

src/PrometheusExporter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 use InvalidArgumentException;
 use Prometheus\CollectorRegistry;

src/PrometheusFacade.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 use Illuminate\Support\Facades\Facade;
 

src/PrometheusServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;

src/StorageAdapterFactory.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Superbalist\LaravelPrometheusExporter;
+namespace Healthengine\LaravelPrometheusExporter;
 
 use InvalidArgumentException;
+use Prometheus\Exception\StorageException;
 use Prometheus\Storage\Adapter;
 use Prometheus\Storage\APC;
 use Prometheus\Storage\InMemory;
@@ -17,6 +18,9 @@ class StorageAdapterFactory
      * @param array $config
      *
      * @return Adapter
+     *
+     * @throws InvalidArgumentException When value of `$driver` is not supported.
+     * @throws StorageException When using APCu driver and the extension is either not installed or not enabled.
      */
     public function make($driver, array $config = [])
     {

src/routes.php

@@ -1,9 +1,10 @@
 <?php
 
-/** @var \Illuminate\Routing\Route $route */
+use Illuminate\Support\Facades\Route;
+
 $route = Route::get(
     config('prometheus.metrics_route_path'),
-    \Superbalist\LaravelPrometheusExporter\MetricsController::class . '@getMetrics'
+    \Healthengine\LaravelPrometheusExporter\MetricsController::class . '@getMetrics'
 );
 
 if ($name = config('prometheus.metrics_route_name')) {

tests/MetricsControllerTest.php

@@ -7,9 +7,12 @@
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use Prometheus\RenderTextFormat;
-use Superbalist\LaravelPrometheusExporter\MetricsController;
-use Superbalist\LaravelPrometheusExporter\PrometheusExporter;
+use Healthengine\LaravelPrometheusExporter\MetricsController;
+use Healthengine\LaravelPrometheusExporter\PrometheusExporter;
 
+/**
+ * @covers \Healthengine\LaravelPrometheusExporter\MetricsController
+ */
 class MetricsControllerTest extends TestCase
 {
     public function testConstruct()

tests/PrometheusExporterTest.php

@@ -8,9 +8,12 @@
 use Prometheus\Counter;
 use Prometheus\Gauge;
 use Prometheus\Histogram;
-use Superbalist\LaravelPrometheusExporter\CollectorInterface;
-use Superbalist\LaravelPrometheusExporter\PrometheusExporter;
+use Healthengine\LaravelPrometheusExporter\CollectorInterface;
+use Healthengine\LaravelPrometheusExporter\PrometheusExporter;
 
+/**
+ * @covers \Healthengine\LaravelPrometheusExporter\PrometheusExporter
+ */
 class PrometheusExporterTest extends TestCase
 {
     public function testConstruct()

tests/StorageAdapterFactoryTest.php

@@ -3,11 +3,15 @@
 namespace Tests;
 
 use PHPUnit\Framework\TestCase;
+use Prometheus\Exception\StorageException;
 use Prometheus\Storage\APC;
 use Prometheus\Storage\InMemory;
 use Prometheus\Storage\Redis;
-use Superbalist\LaravelPrometheusExporter\StorageAdapterFactory;
+use Healthengine\LaravelPrometheusExporter\StorageAdapterFactory;
 
+/**
+ * @covers \Healthengine\LaravelPrometheusExporter\StorageAdapterFactory
+ */
 class StorageAdapterFactoryTest extends TestCase
 {
     public function testMakeMemoryAdapter()
@@ -19,6 +23,14 @@ public function testMakeMemoryAdapter()
 
     public function testMakeApcAdapter()
     {
+        if (!extension_loaded('apcu')) {
+            $this->markTestSkipped('APCu extension is not loaded');
+        }
+
+        if (!apcu_enabled()) {
+            $this->markTestSkipped('APCu is not enabled');
+        }
+
         $factory = new StorageAdapterFactory();
         $adapter = $factory->make('apc');
         $this->assertInstanceOf(APC::class, $adapter);