Update signatures for compatibility with php8. Update composer.json p…

.docker/php/8.0/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:8.0-cli-alpine
+ENV XDEBUG_VERSION 3.2.1
+
+# Update system
+RUN apk update && apk add --update linux-headers && apk add --no-cache git $PHPIZE_DEPS procps python3  \
+    && pecl install xdebug-${XDEBUG_VERSION} \
+    && docker-php-ext-enable xdebug
+
+RUN python3 -m ensurepip \
+    && rm -r /usr/lib/python*/ensurepip \
+    && pip3 install --upgrade pip setuptools \
+    && pip3 install --upgrade prometheus_client path \
+    && ln -s /usr/bin/python3 /usr/bin/python
+# Cleanup
+RUN apk del $PHPIZE_DEPS && rm -rf /var/cache/apk/*

README.md

@@ -14,7 +14,7 @@ This implementation supports the following metric types:
 
 * Counter
 * Gauge
-* Historgram (calculated from a collection of gauges)
+* Histogram (calculated from a collection of gauges)
 * Summary (calculated from a collection of gauges)
 
 The library ships with a [PSR-7](https://www.php-fig.org/psr/psr-7/) compatible 

composer.json

@@ -12,7 +12,7 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
+    "php": "^7.1 || ^8.0",
     "psr/http-message": "^1.0"
   },
   "autoload": {

docker-compose.yml

@@ -37,6 +37,18 @@ services:
       - ./:/repo
     working_dir: /repo
 
+  php80:
+    build:
+      dockerfile: Dockerfile
+      context: .docker/php/8.0
+    container_name: om_et_php8.0
+    restart: "no"
+    networks:
+      - om_et
+    volumes:
+      - ./:/repo
+    working_dir: /repo
+
   composer:
     build:
       dockerfile: Dockerfile
@@ -63,7 +75,7 @@ services:
 
 networks:
   default:
-    external:
-      name: "gateway"
+    name: "gateway"
+    external: true
   om_et:
     internal: true

src/Collections/CounterCollection.php

@@ -2,9 +2,9 @@
 
 namespace OpenMetricsPhp\Exposition\Text\Collections;
 
-use Iterator;
 use OpenMetricsPhp\Exposition\Text\Interfaces\NamesMetric;
 use OpenMetricsPhp\Exposition\Text\Metrics\Counter;
+use Traversable;
 use function count;
 
 final class CounterCollection extends AbstractMetricCollection
@@ -39,7 +39,7 @@ public function count() : int
 		return count( $this->counters );
 	}
 
-	public function getMetricLines() : Iterator
+	public function getMetricLines() : Traversable
 	{
 		if ( 0 === $this->count() )
 		{

src/Collections/GaugeCollection.php

@@ -2,9 +2,9 @@
 
 namespace OpenMetricsPhp\Exposition\Text\Collections;
 
-use Iterator;
 use OpenMetricsPhp\Exposition\Text\Interfaces\NamesMetric;
 use OpenMetricsPhp\Exposition\Text\Metrics\Gauge;
+use Traversable;
 use function count;
 use function implode;
 use function iterator_to_array;
@@ -48,7 +48,7 @@ public function count() : int
 		return count( $this->gauges );
 	}
 
-	public function getMetricLines() : Iterator
+	public function getMetricLines() : Traversable
 	{
 		if ( 0 === $this->count() )
 		{

src/Collections/LabelCollection.php

@@ -7,6 +7,7 @@
 use OpenMetricsPhp\Exposition\Text\Exceptions\InvalidArgumentException;
 use OpenMetricsPhp\Exposition\Text\Interfaces\ProvidesNamedValue;
 use OpenMetricsPhp\Exposition\Text\Types\Label;
+use Traversable;
 use function array_map;
 use function count;
 use function implode;
@@ -62,7 +63,7 @@ public function add( ProvidesNamedValue $label, ProvidesNamedValue ...$labels )
 		}
 	}
 
-	public function getIterator() : iterable
+	public function getIterator() : Traversable
 	{
 		yield from $this->labels;
 	}

src/HttpResponse.php

@@ -2,11 +2,11 @@
 
 namespace OpenMetricsPhp\Exposition\Text;
 
-use Iterator;
 use OpenMetricsPhp\Exposition\Text\HttpResponse\OutputStream;
 use OpenMetricsPhp\Exposition\Text\Interfaces\ProvidesMetricLines;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
+use Traversable;
 use function is_array;
 
 final class HttpResponse implements ResponseInterface
@@ -61,7 +61,7 @@ public static function fromMetricCollections(
 	private static function getAllMetricLines(
 		ProvidesMetricLines $collection,
 		ProvidesMetricLines ...$collections
-	) : Iterator
+	) : Traversable
 	{
 		yield from $collection->getMetricLines();
 		foreach ( $collections as $loopCollection )

src/Interfaces/ProvidesMetricLines.php

@@ -2,11 +2,11 @@
 
 namespace OpenMetricsPhp\Exposition\Text\Interfaces;
 
-use Iterator;
+use Traversable;
 
 interface ProvidesMetricLines
 {
-	public function getMetricLines() : Iterator;
+	public function getMetricLines() : Traversable;
 
 	public function getMetricsString() : string;
 }

src/Metrics/Histogram.php

@@ -2,7 +2,6 @@
 
 namespace OpenMetricsPhp\Exposition\Text\Metrics;
 
-use Iterator;
 use OpenMetricsPhp\Exposition\Text\Collections\GaugeCollection;
 use OpenMetricsPhp\Exposition\Text\Exceptions\InvalidArgumentException;
 use OpenMetricsPhp\Exposition\Text\Interfaces\NamesMetric;
@@ -12,6 +11,7 @@
 use OpenMetricsPhp\Exposition\Text\Metrics\Aggregations\Sum;
 use OpenMetricsPhp\Exposition\Text\Metrics\Histogram\Bucket;
 use OpenMetricsPhp\Exposition\Text\Metrics\Histogram\InfiniteBucket;
+use Traversable;
 use function iterator_to_array;
 use function sort;
 use const SORT_ASC;
@@ -112,7 +112,7 @@ private function getHelpString() : string
 		return sprintf( '# HELP %s %s', $this->metricName->toString(), $this->help );
 	}
 
-	public function getMetricLines() : Iterator
+	public function getMetricLines() : Traversable
 	{
 		yield $this->getTypeString();
 

src/Metrics/Summary.php

@@ -2,14 +2,14 @@
 
 namespace OpenMetricsPhp\Exposition\Text\Metrics;
 
-use Iterator;
 use OpenMetricsPhp\Exposition\Text\Collections\GaugeCollection;
 use OpenMetricsPhp\Exposition\Text\Exceptions\InvalidArgumentException;
 use OpenMetricsPhp\Exposition\Text\Interfaces\NamesMetric;
 use OpenMetricsPhp\Exposition\Text\Interfaces\ProvidesMetricLines;
 use OpenMetricsPhp\Exposition\Text\Metrics\Aggregations\Count;
 use OpenMetricsPhp\Exposition\Text\Metrics\Aggregations\Sum;
 use OpenMetricsPhp\Exposition\Text\Metrics\Summary\Quantile;
+use Traversable;
 use const SORT_ASC;
 use const SORT_NUMERIC;
 
@@ -106,7 +106,7 @@ private function getHelpString() : string
 		return sprintf( '# HELP %s %s', $this->metricName->toString(), $this->help );
 	}
 
-	public function getMetricLines() : Iterator
+	public function getMetricLines() : Traversable
 	{
 		yield $this->getTypeString();
 

tests/Integration/OpenMetrics/parseFile.py

@@ -1,8 +1,12 @@
 from prometheus_client.openmetrics.parser import text_string_to_metric_families
-from path import path
 import sys
 
-metrics = path(sys.argv[1]).bytes()
+if sys.version_info[0] == 3:
+    from path import Path
+    metrics = Path(sys.argv[1]).bytes().decode("utf-8")
+else:
+    from path import path
+    metrics = path(sys.argv[1]).bytes()
 
 for family in text_string_to_metric_families(metrics):
   for sample in family.samples:

tests/Unit/Types/LabelTest.php

@@ -6,6 +6,7 @@
 use OpenMetricsPhp\Exposition\Text\Tests\Traits\EmptyStringProviding;
 use OpenMetricsPhp\Exposition\Text\Types\Label;
 use PHPUnit\Framework\TestCase;
+use Traversable;
 
 final class LabelTest extends TestCase
 {
@@ -49,7 +50,7 @@ public function testThrowsExceptionForInvalidLabelName( string $name ) : void
 		$this->fail( 'Expected an InvalidArgumentException to be thrown for invalid label name.' );
 	}
 
-	public function invalidLabelNameProvider() : iterable
+	public function invalidLabelNameProvider() : Traversable
 	{
 		yield from $this->emptyStringProvider();
 

tests/Unit/Types/MetricNameTest.php

@@ -6,6 +6,7 @@
 use OpenMetricsPhp\Exposition\Text\Tests\Traits\EmptyStringProviding;
 use OpenMetricsPhp\Exposition\Text\Types\MetricName;
 use PHPUnit\Framework\TestCase;
+use Traversable;
 
 final class MetricNameTest extends TestCase
 {
@@ -30,7 +31,7 @@ public function testThrowsExceptionForInvalidMetricName( string $metricName ) :
 		$this->fail( 'Expected an InvalidArgumentException to be thrown for invalid metric name.' );
 	}
 
-	public function invalidMetricNameProvider() : iterable
+	public function invalidMetricNameProvider() : Traversable
 	{
 		yield from $this->emptyStringProvider();