@@ -25,7 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Links the relationships with primary model. |
| 28 | - * @param $model ActiveRecordInterface |
|
| 28 | + * @param BaseActiveRecord $model ActiveRecordInterface |
|
| 29 | 29 | * @param array $data |
| 30 | 30 | */ |
| 31 | 31 | protected function linkRelationships($model, array $data = []) |
@@ -5,9 +5,9 @@ |
||
| 5 | 5 | |
| 6 | 6 | namespace tuyakhov\jsonapi\actions; |
| 7 | 7 | |
| 8 | +use Yii; |
|
| 8 | 9 | use yii\base\Model; |
| 9 | 10 | use yii\db\ActiveRecord; |
| 10 | -use Yii; |
|
| 11 | 11 | use yii\web\ServerErrorHttpException; |
| 12 | 12 | |
| 13 | 13 | class UpdateAction extends Action |
@@ -5,12 +5,11 @@ |
||
| 5 | 5 | |
| 6 | 6 | namespace tuyakhov\jsonapi\actions; |
| 7 | 7 | |
| 8 | -use tuyakhov\jsonapi\ResourceInterface; |
|
| 8 | +use Yii; |
|
| 9 | 9 | use yii\data\ActiveDataProvider; |
| 10 | 10 | use yii\db\BaseActiveRecord; |
| 11 | 11 | use yii\web\BadRequestHttpException; |
| 12 | 12 | use yii\web\NotFoundHttpException; |
| 13 | -use Yii; |
|
| 14 | 13 | |
| 15 | 14 | /** |
| 16 | 15 | * UpdateRelationshipAction implements the API endpoint for updating relationships. |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | public function parse($rawBody, $contentType) |
| 35 | 35 | { |
| 36 | 36 | $array = parent::parse($rawBody, $contentType); |
| 37 | - $data = ArrayHelper::getValue($array, 'data', []); |
|
| 37 | + $data = ArrayHelper::getValue($array, 'data', []); |
|
| 38 | 38 | if (empty($data)) { |
| 39 | 39 | if ($this->throwException) { |
| 40 | 40 | throw new BadRequestHttpException('The request MUST include a single resource object as primary data.'); |
@@ -195,10 +195,10 @@ discard block |
||
| 195 | 195 | { |
| 196 | 196 | $result = []; |
| 197 | 197 | foreach (['id', 'type'] as $key) { |
| 198 | - $getter = 'get' . ucfirst($key); |
|
| 198 | + $getter = 'get'.ucfirst($key); |
|
| 199 | 199 | $value = $identifier->$getter(); |
| 200 | 200 | if ($value === null || is_array($value) || (is_object($value) && !method_exists($value, '__toString'))) { |
| 201 | - throw new InvalidValueException("The value {$key} of resource object " . get_class($identifier) . ' MUST be a string.'); |
|
| 201 | + throw new InvalidValueException("The value {$key} of resource object ".get_class($identifier).' MUST be a string.'); |
|
| 202 | 202 | } |
| 203 | 203 | if ($key === 'type' && $this->pluralize) { |
| 204 | 204 | $value = Inflector::pluralize($value); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | } |
| 251 | 251 | foreach ($relationship as $model) { |
| 252 | 252 | if ($model instanceof ResourceInterface) { |
| 253 | - $uniqueKey = $model->getType() . '/' . $model->getId(); |
|
| 253 | + $uniqueKey = $model->getType().'/'.$model->getId(); |
|
| 254 | 254 | $data[$uniqueKey] = $this->serializeModel($model, $inclusion[$name]); |
| 255 | 255 | if (!empty($inclusion[$name])) { |
| 256 | 256 | $data = array_merge($data, $this->serializeIncluded($model, $inclusion[$name])); |