@@ -18,7 +18,6 @@ |
||
18 | 18 | use yii\base\InvalidParamException; |
19 | 19 | use yii\base\Model; |
20 | 20 | use yii\base\ModelEvent; |
21 | -use Yii; |
|
22 | 21 | use Exception; |
23 | 22 | use yii\base\NotSupportedException; |
24 | 23 | use yii\helpers\Inflector; |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | if ($this->hasAttribute($name)) { |
172 | 172 | $this->_attributes[$name] = $value; |
173 | 173 | } else { |
174 | - throw new InvalidParamException(get_class($this) . ' has no attribute named "' . $name . '".'); |
|
174 | + throw new InvalidParamException(get_class($this).' has no attribute named "'.$name.'".'); |
|
175 | 175 | } |
176 | 176 | } |
177 | 177 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | if (isset($this->_oldAttributes[$name]) || $this->hasAttribute($name)) { |
209 | 209 | $this->_oldAttributes[$name] = $value; |
210 | 210 | } else { |
211 | - throw new InvalidParamException(get_class($this) . ' has no attribute named "' . $name . '".'); |
|
211 | + throw new InvalidParamException(get_class($this).' has no attribute named "'.$name.'".'); |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | |
@@ -382,10 +382,10 @@ discard block |
||
382 | 382 | * If not set, [[formName()]] will be used. |
383 | 383 | * @return boolean whether the model is successfully populated with some data. |
384 | 384 | */ |
385 | - public function loadIds($data, $formName=null) |
|
385 | + public function loadIds($data, $formName = null) |
|
386 | 386 | { |
387 | 387 | $camelData = []; |
388 | - foreach($data as $key => $value) { |
|
388 | + foreach ($data as $key => $value) { |
|
389 | 389 | $key = lcfirst(Inflector::id2camel($key)); |
390 | 390 | $camelData[$key] = $value; |
391 | 391 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | /** |
120 | 120 | * Returns the key value of the object |
121 | - * @return mixed|null |
|
121 | + * @return string |
|
122 | 122 | * @since XXX |
123 | 123 | */ |
124 | 124 | public function getKey() |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | /** |
131 | 131 | * Returns the old key value of the object |
132 | - * @return mixed|null |
|
132 | + * @return string |
|
133 | 133 | * @since XXX |
134 | 134 | */ |
135 | 135 | public function getOldKey() |
@@ -85,6 +85,7 @@ |
||
85 | 85 | |
86 | 86 | /** |
87 | 87 | * @param mixed $config |
88 | + * @param \yii\base\Module|null $module |
|
88 | 89 | * @return array Oauth server configuration |
89 | 90 | * @since XXX |
90 | 91 | */ |
@@ -20,7 +20,6 @@ |
||
20 | 20 | use sweelix\oauth2\server\interfaces\JwtServiceInterface; |
21 | 21 | use yii\db\Exception as DatabaseException; |
22 | 22 | use Yii; |
23 | -use Exception; |
|
24 | 23 | |
25 | 24 | /** |
26 | 25 | * This is the jwt service for redis |
@@ -45,7 +45,7 @@ |
||
45 | 45 | */ |
46 | 46 | protected function getJwtKey($jid) |
47 | 47 | { |
48 | - return $this->namespace . ':' . $jid; |
|
48 | + return $this->namespace.':'.$jid; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -82,8 +82,8 @@ |
||
82 | 82 | } |
83 | 83 | if ($cypherKey->save() === true) { |
84 | 84 | $this->stdout('Key created :'."\n"); |
85 | - $this->stdout(' - id: ' . $cypherKey->id . "\n"); |
|
86 | - $this->stdout(' - Algorithm: ' . $cypherKey->encryptionAlgorithm . "\n"); |
|
85 | + $this->stdout(' - id: '.$cypherKey->id."\n"); |
|
86 | + $this->stdout(' - Algorithm: '.$cypherKey->encryptionAlgorithm."\n"); |
|
87 | 87 | } else { |
88 | 88 | $this->stdout('Key cannot be created.'."\n"); |
89 | 89 | } |
@@ -60,9 +60,9 @@ |
||
60 | 60 | $scope->definition = $this->definition; |
61 | 61 | if ($scope->save() === true) { |
62 | 62 | $this->stdout('Scope created :'."\n"); |
63 | - $this->stdout(' - id: ' . $scope->id . "\n"); |
|
64 | - $this->stdout(' - isDefault: ' . ($scope->isDefault ? 'Yes' : 'No') . "\n"); |
|
65 | - $this->stdout(' - definition: ' . $scope->definition . "\n"); |
|
63 | + $this->stdout(' - id: '.$scope->id."\n"); |
|
64 | + $this->stdout(' - isDefault: '.($scope->isDefault ? 'Yes' : 'No')."\n"); |
|
65 | + $this->stdout(' - definition: '.$scope->definition."\n"); |
|
66 | 66 | } else { |
67 | 67 | $this->stdout('Scope cannot be created.'."\n"); |
68 | 68 | } |
@@ -124,7 +124,7 @@ |
||
124 | 124 | $response->content = $oauthResponse->getResponseBody('xml'); |
125 | 125 | } |
126 | 126 | $headers = $oauthResponse->getHttpHeaders(); |
127 | - foreach($headers as $name => $value) |
|
127 | + foreach ($headers as $name => $value) |
|
128 | 128 | { |
129 | 129 | $response->headers->set($name, $value); |
130 | 130 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | if ((isset($this->attributesDefinitions[$key]) === true) |
57 | 57 | && (in_array($this->attributesDefinitions[$key], $bypassTypes) === false) |
58 | 58 | ) { |
59 | - switch($this->attributesDefinitions[$key]) { |
|
59 | + switch ($this->attributesDefinitions[$key]) { |
|
60 | 60 | case 'bool': |
61 | 61 | case 'boolean': |
62 | 62 | $value = $value ? 1 : 0; |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | switch ($this->attributesDefinitions[$key]) { |
96 | 96 | case 'bool': |
97 | 97 | case 'boolean': |
98 | - $value = (bool) $value; |
|
98 | + $value = (bool)$value; |
|
99 | 99 | break; |
100 | 100 | case 'int': |
101 | 101 | case 'integer': |
102 | - $value = (int) $value; |
|
102 | + $value = (int)$value; |
|
103 | 103 | break; |
104 | 104 | case 'array': |
105 | 105 | try { |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | case 'real': |
112 | 112 | case 'double': |
113 | 113 | case 'float': |
114 | - $value = (float) $value; |
|
114 | + $value = (float)$value; |
|
115 | 115 | break; |
116 | 116 | } |
117 | 117 | } |
@@ -78,7 +78,7 @@ |
||
78 | 78 | protected function encodeAttributes(Array $attributes) |
79 | 79 | { |
80 | 80 | $data = Json::encode($attributes); |
81 | - $etag = '"' . rtrim(base64_encode(sha1($data, true)), '=') . '"'; |
|
81 | + $etag = '"'.rtrim(base64_encode(sha1($data, true)), '=').'"'; |
|
82 | 82 | return $etag; |
83 | 83 | } |
84 | 84 |
@@ -15,14 +15,12 @@ |
||
15 | 15 | namespace sweelix\oauth2\server\services\redis; |
16 | 16 | |
17 | 17 | use sweelix\oauth2\server\interfaces\BaseModelInterface; |
18 | -use sweelix\oauth2\server\models\BaseModel; |
|
19 | 18 | use sweelix\oauth2\server\Module; |
20 | 19 | use sweelix\oauth2\server\traits\redis\TypeConverter; |
21 | 20 | use yii\base\Object; |
22 | 21 | use yii\di\Instance; |
23 | 22 | use yii\helpers\Json; |
24 | 23 | use yii\redis\Connection; |
25 | -use Yii; |
|
26 | 24 | |
27 | 25 | /** |
28 | 26 | * This is the base service for redis |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | protected function getScopeKey($sid) |
49 | 49 | { |
50 | - return $this->namespace . ':' . $sid; |
|
50 | + return $this->namespace.':'.$sid; |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | protected function getScopeListKey() |
58 | 58 | { |
59 | - return $this->namespace . ':keys'; |
|
59 | + return $this->namespace.':keys'; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | protected function getScopeDefaultListKey() |
67 | 67 | { |
68 | - return $this->namespace . ':defaultkeys'; |
|
68 | + return $this->namespace.':defaultkeys'; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |