MAC fixes

Author: chervand

components/Mac.php

@@ -114,11 +114,11 @@ public function validate()
 
         $mac = hash_hmac(
             $this->getAlgorithm(),
-            implode('\n', array_filter($values)),
+            implode('\\n', array_filter($values)) . '\\n',
             $this->getJwt()->getClaim('mac_key')
         );
 
-        if ($mac === $this->mac) {
+        if (base64_encode($mac) === $this->mac) {
             return $this;
         }
 

components/Psr7/ServerRequest.php

@@ -15,7 +15,7 @@ class ServerRequest extends \GuzzleHttp\Psr7\ServerRequest
      * ServerRequest constructor.
      * @param Request $request
      */
-    public function __construct(Request &$request)
+    public function __construct(Request $request)
     {
         parent::__construct(
             $request->method,