Merge pull request #1 from php-api-clients/middleware-4.0

WyriHaximus · web-flow · commit 92054999e4dc · 2017-07-02T16:15:22.000+02:00
Middleware 4.0
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
   ],
   "require": {
     "php": "^7.0",
-    "api-clients/middleware": "^2.0"
+    "api-clients/middleware": "^4.0"
   },
   "require-dev": {
     "api-clients/test-utilities": "^3.0.1",
diff --git a/composer.lock b/composer.lock
diff --git a/src/BearerAuthorizationHeaderMiddleware.php b/src/BearerAuthorizationHeaderMiddleware.php
@@ -15,7 +15,6 @@
  */
 class BearerAuthorizationHeaderMiddleware implements MiddlewareInterface
 {
-    use DefaultPriorityTrait;
     use PostTrait;
     use ErrorTrait;
 
@@ -24,8 +23,11 @@ class BearerAuthorizationHeaderMiddleware implements MiddlewareInterface
      * @param array $options
      * @return CancellablePromiseInterface
      */
-    public function pre(RequestInterface $request, array $options = []): CancellablePromiseInterface
-    {
+    public function pre(
+        RequestInterface $request,
+        string $transactionId,
+        array $options = []
+    ): CancellablePromiseInterface {
         if (!isset($options[self::class][Options::TOKEN])) {
             return resolve($request);
         }
diff --git a/tests/BearerAuthorizationHeaderMiddlewareTest.php b/tests/BearerAuthorizationHeaderMiddlewareTest.php
@@ -58,7 +58,7 @@ public function testPre(array $options, bool $hasHeader, string $expectedHeader)
     {
         $request = new Request('GET', 'https://example.com/');
         $middleware = new BearerAuthorizationHeaderMiddleware();
-        $changedRequest = await($middleware->pre($request, $options), Factory::create());
+        $changedRequest = await($middleware->pre($request, 'abc', $options), Factory::create());
 
         if ($hasHeader === false) {
             self::assertFalse($changedRequest->hasHeader('Authorization'));

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function testPre(array $options, bool $hasHeader, string $expectedHeader)`
`58`	`58`	`{`
`59`	`59`	`$request = new Request('GET', 'https://example.com/');`
`60`	`60`	`$middleware = new BearerAuthorizationHeaderMiddleware();`
`61`		`- $changedRequest = await($middleware->pre($request, $options), Factory::create());`
	`61`	`+ $changedRequest = await($middleware->pre($request, 'abc', $options), Factory::create());`
`62`	`62`
`63`	`63`	`if ($hasHeader === false) {`
`64`	`64`	`self::assertFalse($changedRequest->hasHeader('Authorization'));`