Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update supportpal/coding-standard to 0.4.4 #184

Merged
merged 5 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"phpstan/phpstan": "1.10.25",
"phpunit/phpunit": "^8.0|^9.0",
"rregeer/phpunit-coverage-check": "^0.3.1",
"slevomat/coding-standard": "^6.4",
"slevomat/coding-standard": "^8.15",
"squizlabs/php_codesniffer": "^3.5",
"supportpal/coding-standard": "^0.4"
},
Expand Down
235 changes: 123 additions & 112 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Config/RequestDefaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function setDefaultRequestOptions(array $defaultRequestOptions): self
* @param mixed $value
* @return $this
*/
public function addRequestOption(string $key, $value): self
public function addRequestOption(string $key, mixed $value): self
{
$this->defaultRequestOptions[$key] = $value;

Expand Down
6 changes: 3 additions & 3 deletions src/Model/BaseModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function setPivot(?array $pivot): self
* @param mixed $value
* @return mixed
*/
private function applyAttributeAwareTransformers(array $attributeAwareTransformers, string $key, $value)
private function applyAttributeAwareTransformers(array $attributeAwareTransformers, string $key, mixed $value)
{
foreach ($attributeAwareTransformers as $transformer) {
if (! $transformer->canTransform($this->snakeCaseToCamelCase($key), get_class($this), $value)) {
Expand All @@ -141,7 +141,7 @@ private function applyAttributeAwareTransformers(array $attributeAwareTransforme
* @param mixed $value
* @throws InvalidArgumentException
*/
private function setAttributeValue(string $attributeSetter, $value): void
private function setAttributeValue(string $attributeSetter, mixed $value): void
{
try {
$this->{$attributeSetter}($value);
Expand All @@ -159,7 +159,7 @@ private function setAttributeValue(string $attributeSetter, $value): void
* @param mixed $value
* @return mixed
*/
private function applyValueTransformers(array $transformers, $value)
private function applyValueTransformers(array $transformers, mixed $value)
{
foreach ($transformers as $transformer) {
if (! $transformer->canTransform($value)) {
Expand Down
2 changes: 1 addition & 1 deletion src/Model/Department/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function getDepartmentId(): int
* @param string|int $departmentId
* @return self
*/
public function setDepartmentId($departmentId): self
public function setDepartmentId(string|int $departmentId): self
{
$departmentId = filter_var($departmentId, FILTER_VALIDATE_INT);

Expand Down
4 changes: 2 additions & 2 deletions src/Model/SettingsModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface SettingsModel extends Model
* @param mixed $value
* @return void
*/
public function __set($property, $value);
public function __set(mixed $property, mixed $value);

/**
* @return string[]
Expand All @@ -21,5 +21,5 @@ public function all(): array;
* @param mixed|null $default
* @return string|null
*/
public function get(string $name, $default = null): ?string;
public function get(string $name, mixed $default = null): ?string;
}
4 changes: 2 additions & 2 deletions src/Transformer/AttributeAwareTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ interface AttributeAwareTransformer
* @param mixed $value
* @return bool
*/
public function canTransform(string $attribute, string $type, $value): bool;
public function canTransform(string $attribute, string $type, mixed $value): bool;

/**
* @param mixed $value
* @return mixed
*/
public function transform($value);
public function transform(mixed $value);
}
4 changes: 2 additions & 2 deletions src/Transformer/Transformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ interface Transformer
* @param mixed $value
* @return bool
*/
public function canTransform($value): bool;
public function canTransform(mixed $value): bool;

/**
* @param mixed $value
* @return mixed
*/
public function transform($value);
public function transform(mixed $value);
}
6 changes: 3 additions & 3 deletions test/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected function assertArrayEqualsObjectFields(object $obj, array $array): voi
* @param Collection|Model $models
* @param array<mixed> $data
*/
protected function assertApiDataMatchesModels($models, array $data): void
protected function assertApiDataMatchesModels(Model|Collection $models, array $data): void
{
if ($models instanceof Collection) {
self::assertSame($data['count'], $models->getCount());
Expand Down Expand Up @@ -114,7 +114,7 @@ protected function assertApiDataMatchesModels($models, array $data): void
* @param array<mixed> $attributeValue
* @param mixed $value
*/
protected function handleNestedArrays(array $attributeValue, $value): void
protected function handleNestedArrays(array $attributeValue, mixed $value): void
{
for ($i = 0; $i < count($attributeValue); ++$i) {
if (! is_object($value[$i])) {
Expand All @@ -131,7 +131,7 @@ protected function handleNestedArrays(array $attributeValue, $value): void
* @param mixed $attributeValue
* @param mixed $value
*/
protected function handleAtomicValues($attributeValue, $value): void
protected function handleAtomicValues(mixed $attributeValue, mixed $value): void
{
if (is_bool($attributeValue) || is_bool($value)) {
/**
Expand Down
4 changes: 2 additions & 2 deletions test/Unit/ModelNormalizer/ModelNormalizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function testNormalizeTransformAll(): void
* @param bool $objectNormalizerSupports
* @param bool $expectation
*/
public function testSupportsNormalization($data, bool $objectNormalizerSupports, bool $expectation): void
public function testSupportsNormalization(mixed $data, bool $objectNormalizerSupports, bool $expectation): void
{
$objectNormalizerExpectation = $this->objectNormalizer
->supportsNormalization($data, $this->format)
Expand Down Expand Up @@ -152,7 +152,7 @@ public function testNormalizeTransformNone(): void
* @param bool $objectNormalizerSupports
* @dataProvider provideSupportNormalizationCases
*/
public function testSupportsDenormalization($data, bool $objectNormalizerSupports): void
public function testSupportsDenormalization(mixed $data, bool $objectNormalizerSupports): void
{
$this->objectNormalizer
->supportsDenormalization($data, Model::class, $this->format)
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/Transformer/BooleanToIntTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testCanTransform(bool $data): void
* @param mixed $data
* @dataProvider provideCannotTransformCases
*/
public function testCannotTransform($data): void
public function testCannotTransform(mixed $data): void
{
self::assertFalse($this->booleanToIntTransformer->canTransform($data));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/Transformer/EmptyModelToNullTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function testCanTransform(Model $model): void
* @param mixed $data
* @dataProvider provideCannotTransformCases
*/
public function testCannotTransform($data): void
public function testCannotTransform(mixed $data): void
{
self::assertFalse($this->transformer->canTransform($data));
}
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/Transformer/IntToBooleanTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected function setUp(): void
* @param mixed $value
* @dataProvider provideCannotTransformNonIntValueCases
*/
public function testCannotTransformNonIntValue($value): void
public function testCannotTransformNonIntValue(mixed $value): void
{
$this->propertyTypeExtractor->getTypes(Model::class, $this->attribute)->shouldNotBeCalled();
self::assertFalse($this->intToBooleanTransformer->canTransform($this->attribute, Model::class, $value));
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/Transformer/StringTrimTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testCanTransform(): void
* @param mixed $data
* @dataProvider provideCannotTransformCases
*/
public function testCannotTransform($data): void
public function testCannotTransform(mixed $data): void
{
self::assertFalse($this->transformer->canTransform($data));
}
Expand Down