Merge branch 'master' into feature/override-policy

Author: snapshotpl

.gitignore

@@ -1,2 +1,3 @@
 /vendor/
-composer.lock
+composer.lock
+tmp/

.scrutinizer.yml

@@ -0,0 +1,13 @@
+checks:
+ php: true
+build:
+ environment:
+ php:
+ version: 5.6.16
+ tests:
+ override:
+ -
+ command: 'phpunit'
+ coverage:
+ file: 'tmp/phpunit-coverage-clover.xml'
+ format: 'php-clover'

.travis.yml

@@ -7,9 +7,6 @@ matrix:
  - php: 5.6
  - php: 7
  - php: hhvm
- allow_failures:
- - php: 7
- - php: hhvm
 
 install:
  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source

README.md

@@ -1,4 +1,9 @@
-# request-id middleware [![Build Status](https://travis-ci.org/php-middleware/request-id.svg?branch=master)](https://travis-ci.org/php-middleware/request-id)
+# request-id middleware
+
+[![Build Status](https://travis-ci.org/php-middleware/request-id.svg?branch=master)](https://travis-ci.org/php-middleware/request-id)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/php-middleware/request-id/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/php-middleware/request-id/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/php-middleware/request-id/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/php-middleware/request-id/?branch=master)
+[![Build Status](https://scrutinizer-ci.com/g/php-middleware/request-id/badges/build.png?b=master)](https://scrutinizer-ci.com/g/php-middleware/request-id/build-status/master)
 
 PSR-7 request id middleware
 

composer.json

@@ -9,7 +9,7 @@
  "request-id"
  ],
  "require": {
- "php": ">=5.5",
+ "php": "^5.5 || ^7.0",
  "psr/http-message": "^1.0"
  },
  "require-dev": {

phpunit.xml

@@ -7,6 +7,11 @@
  </testsuite>
  </testsuites>
 
+ <logging>
+ <log type="coverage-clover" target="tmp/phpunit-coverage-clover.xml"/>
+ <log type="coverage-html" target="tmp/" />
+ </logging>
+
  <filter>
  <whitelist processUncoveredFilesFromWhitelist="true">
  <directory suffix=".php">./src</directory>

src/RequestIdMiddleware.php

@@ -32,7 +32,7 @@ class RequestIdMiddleware implements RequestIdProviderInterface
  protected $requestId;
 
  /**
- * @var bool
+ * @var string
  */
  protected $responseHeader;
 
@@ -45,7 +45,7 @@ class RequestIdMiddleware implements RequestIdProviderInterface
  /**
  * @param GeneratorInterface $generator
  * @param bool|OverridePolicyInterface $allowOverride
- * @param bool $responseHeader
+ * @param string $responseHeader
  * @param string $requestHeader
  */
  public function __construct(

test/Generator/Md5GeneratorTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpMiddlewareTestTest\RequestId\Generator;
+
+use PhpMiddleware\RequestId\Generator\GeneratorInterface;
+use PhpMiddleware\RequestId\Generator\Md5Generator;
+use PHPUnit_Framework_TestCase;
+
+class Md5GeneratorTest extends PHPUnit_Framework_TestCase
+{
+ protected $generator;
+
+ protected function setUp()
+ {
+ $decoratedGenerator = $this->getMock(GeneratorInterface::class);
+ $decoratedGenerator->method('generateRequestId')->willReturn('boo');
+
+ $this->generator = new Md5Generator($decoratedGenerator);
+ }
+
+ public function testGetHashFromGeneratedValue()
+ {
+ $result = $this->generator->generateRequestId();
+
+ $this->assertSame('ae3e83e2fab3a7d8683d8eefabd1e74d', $result);
+ }
+}

test/Generator/PhpUniqidGeneratorTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace PhpMiddlewareTestTest\RequestId\Generator;
+
+use PhpMiddleware\RequestId\Generator\PhpUniqidGenerator;
+use PHPUnit_Framework_TestCase;
+
+class PhpUniqidGeneratorTest extends PHPUnit_Framework_TestCase
+{
+ protected $generator;
+
+ protected function setUp()
+ {
+ $this->generator = new PhpUniqidGenerator();
+ }
+
+ public function testGetHashFromGeneratedValue()
+ {
+ $result = $this->generator->generateRequestId();
+
+ $this->assertNotEmpty($result);
+ }
+}

test/Generator/PrefixedGeneratorTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace PhpMiddlewareTestTest\RequestId\Generator;
+
+use PhpMiddleware\RequestId\Generator\GeneratorInterface;
+use PhpMiddleware\RequestId\Generator\PrefixedGenerator;
+use PHPUnit_Framework_TestCase;
+
+class PrefixedGeneratorTest extends PHPUnit_Framework_TestCase
+{
+ protected $decoratedGenerator;
+
+ protected function setUp()
+ {
+ $this->decoratedGenerator = $this->getMock(GeneratorInterface::class);
+ $this->decoratedGenerator->method('generateRequestId')->willReturn('boo');
+ }
+
+ public function testGetHashFromGeneratedValue()
+ {
+ $result = $this->getGenerator('foo_')->generateRequestId();
+
+ $this->assertSame('foo_boo', $result);
+ }
+
+ public function getGenerator($prefix)
+ {
+ return new PrefixedGenerator($prefix, $this->decoratedGenerator);
+ }
+}