Skip to content

Commit 5ac7314

Browse files
author
Nil Portugues Caldero
committed
Small fixes
1 parent 7155818 commit 5ac7314

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
bin/
2-
.idea/
32
vendor/
43
composer.lock
54
build/

src/Server/Actions/Traits/RequestTrait.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use NilPortugues\Api\JsonApi\Http\Request\Parameters\Fields;
1313
use NilPortugues\Api\JsonApi\Http\Request\Parameters\Included;
1414
use NilPortugues\Api\JsonApi\JsonApiSerializer;
15-
use NilPortugues\Api\JsonApi\Server\Errors\Error;
1615
use NilPortugues\Api\JsonApi\Server\Errors\InvalidParameterError;
1716
use NilPortugues\Api\JsonApi\Server\Errors\InvalidParameterMemberError;
1817
use NilPortugues\Api\Mapping\Mapping;
@@ -23,12 +22,12 @@
2322
trait RequestTrait
2423
{
2524
/**
26-
* @var Error[]
25+
* @var \NilPortugues\Api\JsonApi\Server\Errors\Error[]
2726
*/
2827
protected $queryParamErrorBag = [];
2928

3029
/**
31-
* @return Error[]
30+
* @return \NilPortugues\Api\JsonApi\Server\Errors\Error[]
3231
*/
3332
protected function getQueryParamsErrors()
3433
{
@@ -42,7 +41,7 @@ protected function getQueryParamsErrors()
4241
*
4342
* @return bool
4443
*/
45-
protected function hasValidQueryParams($serializer, Fields $fields, Included $included)
44+
protected function hasValidQueryParams(JsonApiSerializer $serializer, Fields $fields, Included $included)
4645
{
4746
$this->validateFieldsQueryParams($serializer, $fields, 'Fields');
4847
$this->validateIncludeQueryParamsTypes($serializer, $included, 'Include');
@@ -55,7 +54,7 @@ protected function hasValidQueryParams($serializer, Fields $fields, Included $in
5554
* @param Fields $fields
5655
* @param string $paramName
5756
*/
58-
protected function validateFieldsQueryParams($serializer, Fields $fields, $paramName)
57+
protected function validateFieldsQueryParams(JsonApiSerializer $serializer, Fields $fields, $paramName)
5958
{
6059
if (false === $fields->isEmpty()) {
6160
$validateFields = $fields->types();
@@ -121,7 +120,7 @@ protected function addInvalidParameterErrorsToErrorBag($paramName, array &$valid
121120
* @param Included $included
122121
* @param string $paramName
123122
*/
124-
protected function validateIncludeQueryParamsTypes($serializer, Included $included, $paramName)
123+
protected function validateIncludeQueryParamsTypes(JsonApiSerializer $serializer, Included $included, $paramName)
125124
{
126125
if (false === $included->isEmpty()) {
127126
$validateFields = array_keys($included->get());

src/Server/Data/DataObject.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static function assertPut($data, JsonApiSerializer $serializer, $classNam
8181
*
8282
* @return array
8383
*/
84-
protected static function missingCreationAttributes(array $data, $serializer)
84+
protected static function missingCreationAttributes(array $data, JsonApiSerializer $serializer)
8585
{
8686
$inputAttributes = array_keys($data[JsonApiTransformer::ATTRIBUTES_KEY]);
8787

src/Server/Query/QueryObject.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ protected static function validateIncludeParams(
108108
$transformer = $serializer->getTransformer();
109109

110110
foreach ($included->get() as $resource => $data) {
111-
if (null == $transformer->getMappingByAlias($resource)) {
112-
$errorBag[] = new InvalidParameterError($resource, strtolower($paramName));
111+
if (null === $transformer->getMappingByAlias($resource)) {
112+
$errorBag->offsetSet(null, new InvalidParameterError($resource, strtolower($paramName)));
113113
continue;
114114
}
115115

116116
if (is_array($data)) {
117117
foreach ($data as $subResource) {
118-
if (null == $transformer->getMappingByAlias($subResource)) {
118+
if (null === $transformer->getMappingByAlias($subResource)) {
119119
$errorBag->offsetSet(null, new InvalidParameterError($subResource, strtolower($paramName)));
120120
}
121121
}

0 commit comments

Comments
 (0)