Skip to content

Commit

Permalink
#2283 - Replace static to self
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeckerson committed Oct 2, 2021
1 parent ed775db commit 7f20e4b
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions Library/Types.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,47 +76,47 @@ public function getReturnTypeAnnotation(ClassMethod $method, array $returnTypes
$nullableType = $isNullable ? '|null' : '';

if ($method->isVoid() || $isVoid) {
return static::T_VOID;
return self::T_VOID;
}

if ($isInteger) {
return static::T_INT.$nullableType;
return self::T_INT.$nullableType;
}

if ($isDouble) {
return static::T_FLOAT.$nullableType;
return self::T_FLOAT.$nullableType;
}

if ($isBool) {
return static::T_BOOL.$nullableType;
return self::T_BOOL.$nullableType;
}

if ($isString) {
return static::T_STRING.$nullableType;
return self::T_STRING.$nullableType;
}

if ($isNull && 1 === $typesCount) {
return static::T_NULL;
return self::T_NULL;
}

if ($isArray) {
return static::T_ARRAY;
return self::T_ARRAY;
}

if ($isObject) {
return static::T_OBJECT;
return self::T_OBJECT;
}

if ($isIterable) {
return static::T_ITERABLE;
return self::T_ITERABLE;
}

if ($isResource) {
return static::T_RESOURCE;
return self::T_RESOURCE;
}

if ($method->areReturnTypesCompatible() && !$isTypeHinted) {
return static::T_MIXED.$nullableType;
return self::T_MIXED.$nullableType;
}

if ($isTypeHinted && !$isBasicTypes && !$isDynamic && !$isNullable) {
Expand All @@ -125,7 +125,7 @@ public function getReturnTypeAnnotation(ClassMethod $method, array $returnTypes

if ($isTypeHinted && $isProcessedReturnType) {
$withoutNullable = array_filter(array_keys($returnTypes), static function ($ret) {
if ($ret !== static::T_NULL) {
if ($ret !== self::T_NULL) {
return $ret;
}
});
Expand All @@ -137,7 +137,7 @@ public function getReturnTypeAnnotation(ClassMethod $method, array $returnTypes
return implode('|', array_values($returnTypes));
}

return static::T_MIXED.$nullableType;
return self::T_MIXED.$nullableType;
}

/**
Expand Down Expand Up @@ -189,7 +189,7 @@ private function areReturnTypesFloatCompatible(array $types): bool
*/
private function areReturnTypesBoolCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_BOOL]);
return $this->areReturnTypesCompatible($types, [self::T_BOOL]);
}

/**
Expand All @@ -204,8 +204,8 @@ private function areReturnTypesStringCompatible(array $types): bool
return $this->areReturnTypesCompatible(
$types,
[
static::T_STRING,
static::T_ISTRING,
self::T_STRING,
self::T_ISTRING,
],
$this->isNullable($types)
);
Expand All @@ -220,7 +220,7 @@ private function areReturnTypesStringCompatible(array $types): bool
*/
private function areReturnTypesNullCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_NULL]);
return $this->areReturnTypesCompatible($types, [self::T_NULL]);
}

/**
Expand All @@ -232,7 +232,7 @@ private function areReturnTypesNullCompatible(array $types): bool
*/
private function areReturnTypesArrayCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_ARRAY]);
return $this->areReturnTypesCompatible($types, [self::T_ARRAY]);
}

/**
Expand All @@ -244,7 +244,7 @@ private function areReturnTypesArrayCompatible(array $types): bool
*/
private function areReturnTypesObjectCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_OBJECT]);
return $this->areReturnTypesCompatible($types, [self::T_OBJECT]);
}

/**
Expand All @@ -256,7 +256,7 @@ private function areReturnTypesObjectCompatible(array $types): bool
*/
private function areReturnTypesIterableCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_ITERABLE]);
return $this->areReturnTypesCompatible($types, [self::T_ITERABLE]);
}

/**
Expand All @@ -268,7 +268,7 @@ private function areReturnTypesIterableCompatible(array $types): bool
*/
private function areReturnTypesResourceCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_RESOURCE]);
return $this->areReturnTypesCompatible($types, [self::T_RESOURCE]);
}

/**
Expand Down Expand Up @@ -300,7 +300,7 @@ private function areReturnTypesCollectionCompatible(array $types): bool
*/
private function areReturnTypesVoidCompatible(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_VOID]);
return $this->areReturnTypesCompatible($types, [self::T_VOID]);
}

/**
Expand All @@ -312,7 +312,7 @@ private function areReturnTypesVoidCompatible(array $types): bool
*/
private function isNumeric(array $types): bool
{
return $this->areReturnTypesCompatible($types, [static::T_NUMBER]);
return $this->areReturnTypesCompatible($types, [self::T_NUMBER]);
}

/**
Expand All @@ -324,8 +324,8 @@ private function isNumeric(array $types): bool
*/
private function isNullable(array $types): bool
{
return (\array_key_exists(static::T_NULL, $types)
|| \in_array(static::T_NULL, $types))
return (\array_key_exists(self::T_NULL, $types)
|| \in_array(self::T_NULL, $types))
&& 1 !== \count($types);
}

Expand Down Expand Up @@ -356,7 +356,7 @@ private function areReturnTypesCompatible(array $types, array $allowedTypes, boo
$result = null;

if ($isNullable) {
$allowedTypes[] = static::T_NULL;
$allowedTypes[] = self::T_NULL;
}

foreach ($types as $type => $data) {
Expand Down

0 comments on commit 7f20e4b

Please sign in to comment.