Skip to content
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
52 changes: 2 additions & 50 deletions src/Type/Accessory/HasOffsetType.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use PHPStan\Type\Traits\MaybeCallableTypeTrait;
use PHPStan\Type\Traits\MaybeIterableTypeTrait;
use PHPStan\Type\Traits\MaybeObjectTypeTrait;
use PHPStan\Type\Traits\MaybeStringTypeTrait;
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\NonRemoveableTypeTrait;
Expand All @@ -44,6 +45,7 @@ class HasOffsetType implements CompoundType, AccessoryType
use MaybeCallableTypeTrait;
use MaybeIterableTypeTrait;
use MaybeObjectTypeTrait;
use MaybeStringTypeTrait;
use TruthyBooleanTypeTrait;
use NonGenericTypeTrait;
use UndecidedComparisonCompoundTypeTrait;
Expand Down Expand Up @@ -77,11 +79,6 @@ public function getObjectClassReflections(): array
return [];
}

public function getConstantStrings(): array
{
return [];
}

public function accepts(Type $type, bool $strictTypes): AcceptsResult
{
if ($type instanceof CompoundType) {
Expand Down Expand Up @@ -347,46 +344,6 @@ public function isInteger(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNumericString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonEmptyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonFalsyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLiteralString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLowercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isClassString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isUppercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function getClassStringObjectType(): Type
{
return new ObjectWithoutClassType();
Expand All @@ -402,11 +359,6 @@ public function isVoid(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isScalar(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
{
return new BooleanType();
Expand Down
52 changes: 2 additions & 50 deletions src/Type/Accessory/HasOffsetValueType.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use PHPStan\Type\Traits\MaybeCallableTypeTrait;
use PHPStan\Type\Traits\MaybeIterableTypeTrait;
use PHPStan\Type\Traits\MaybeObjectTypeTrait;
use PHPStan\Type\Traits\MaybeStringTypeTrait;
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\NonRemoveableTypeTrait;
Expand All @@ -49,6 +50,7 @@ class HasOffsetValueType implements CompoundType, AccessoryType
use MaybeCallableTypeTrait;
use MaybeIterableTypeTrait;
use MaybeObjectTypeTrait;
use MaybeStringTypeTrait;
use TruthyBooleanTypeTrait;
use NonGenericTypeTrait;
use UndecidedComparisonCompoundTypeTrait;
Expand Down Expand Up @@ -84,11 +86,6 @@ public function getObjectClassReflections(): array
return [];
}

public function getConstantStrings(): array
{
return [];
}

public function accepts(Type $type, bool $strictTypes): AcceptsResult
{
if ($type instanceof CompoundType) {
Expand Down Expand Up @@ -441,46 +438,6 @@ public function isInteger(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNumericString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonEmptyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonFalsyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLiteralString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLowercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isUppercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isClassString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function getClassStringObjectType(): Type
{
return new ObjectWithoutClassType();
Expand All @@ -496,11 +453,6 @@ public function isVoid(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isScalar(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
{
return new BooleanType();
Expand Down
60 changes: 60 additions & 0 deletions src/Type/Traits/MaybeStringTypeTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?php declare(strict_types = 1);

namespace PHPStan\Type\Traits;

use PHPStan\TrinaryLogic;

trait MaybeStringTypeTrait
{

public function getConstantStrings(): array
{
return [];
}

public function isString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNumericString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonEmptyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonFalsyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLiteralString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLowercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isUppercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isClassString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isScalar(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

}
Loading