| @@ -37,7 +37,7 @@ discard block | ||
| 37 | 37 | * | 
| 38 | 38 | * @param string $uri | 
| 39 | 39 | * | 
| 40 | - * @return Url | |
| 40 | + * @return \Psr\Http\Message\UriInterface | |
| 41 | 41 | */ | 
| 42 | 42 | protected function createUrl($uri) | 
| 43 | 43 |      { | 
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 | * Generate a base string for a RSA-SHA1 signature | 
| 49 | 49 | * based on the given a url, method, and any parameters. | 
| 50 | 50 | * | 
| 51 | - * @param Url $url | |
| 51 | + * @param Uri $url | |
| 52 | 52 | * @param string $method | 
| 53 | 53 | * @param array $parameters | 
| 54 | 54 | * | 
| @@ -59,9 +59,9 @@ | ||
| 59 | 59 | $baseString = rawurlencode($method).'&'; | 
| 60 | 60 | |
| 61 | 61 | $schemeHostPath = Uri::fromParts(array( | 
| 62 | - 'scheme' => $url->getScheme(), | |
| 63 | - 'host' => $url->getHost(), | |
| 64 | - 'path' => $url->getPath(), | |
| 62 | + 'scheme' => $url->getScheme(), | |
| 63 | + 'host' => $url->getHost(), | |
| 64 | + 'path' => $url->getPath(), | |
| 65 | 65 | )); | 
| 66 | 66 | |
| 67 | 67 | $baseString .= rawurlencode($schemeHostPath).'&'; | 
| @@ -71,7 +71,7 @@ | ||
| 71 | 71 | $data = array_merge($query, $parameters); | 
| 72 | 72 | |
| 73 | 73 | // normalize data key/values | 
| 74 | -        array_walk_recursive($data, function (&$key, &$value) { | |
| 74 | +        array_walk_recursive($data, function(&$key, &$value) { | |
| 75 | 75 | $key = rawurlencode(rawurldecode($key)); | 
| 76 | 76 | $value = rawurlencode(rawurldecode($value)); | 
| 77 | 77 | }); | 
| @@ -119,14 +119,14 @@ | ||
| 119 | 119 | } | 
| 120 | 120 | |
| 121 | 121 |          if ($this->scope) { | 
| 122 | -            $parameters[] = 'scope=' . implode(',', $this->scope); | |
| 122 | +            $parameters[] = 'scope='.implode(',', $this->scope); | |
| 123 | 123 | } | 
| 124 | 124 | |
| 125 | 125 |          if ($this->redirectOnError) { | 
| 126 | 126 | $parameters[] = 'redirectOnError=true'; | 
| 127 | 127 | } | 
| 128 | 128 | |
| 129 | -        return '?' . implode('&', $parameters); | |
| 129 | +        return '?'.implode('&', $parameters); | |
| 130 | 130 | } | 
| 131 | 131 | |
| 132 | 132 | public function urlTokenCredentials() |