Skip to content

Commit 7717291

Browse files
committed
[BCB] Remove ConstantArrayType::slice()
1 parent 7046180 commit 7717291

File tree

3 files changed

+3
-29
lines changed

3 files changed

+3
-29
lines changed

UPGRADING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ Instead of `AccessoryArrayListType::intersectWith($type)`, do `TypeCombinator::i
289289
* Remove `ConstantArrayType::removeFirst()`, use [`Type::shiftArray()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_shiftArray) instead
290290
* Remove `ConstantArrayType::reverse()`, use [`Type::reverseArray()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_reverseArray) instead
291291
* Remove `ConstantArrayType::chunk()`, use [`Type::chunkArray()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_chunkArray) instead
292+
* Remove `ConstantArrayType::slice()`, use [`Type::sliceArray()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_sliceArray) instead
292293
* Made `TypeUtils` thinner by removing methods:
293294
* Remove `TypeUtils::getArrays()` and `getAnyArrays()`, use [`Type::getArrays()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_getArrays) instead
294295
* Remove `TypeUtils::getConstantArrays()` and `getOldConstantArrays()`, use [`Type::getConstantArrays()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_getConstantArrays) instead

phpstan-baseline.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ parameters:
882882
-
883883
message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantArrayType is error\-prone and deprecated\. Use Type\:\:getConstantArrays\(\) instead\.$#'
884884
identifier: phpstanApi.instanceofType
885-
count: 9
885+
count: 7
886886
path: src/Type/Constant/ConstantArrayType.php
887887

888888
-

src/Type/Constant/ConstantArrayType.php

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
use PHPStan\Type\BooleanType;
3131
use PHPStan\Type\CompoundType;
3232
use PHPStan\Type\ConstantScalarType;
33-
use PHPStan\Type\ConstantTypeHelper;
3433
use PHPStan\Type\ErrorType;
3534
use PHPStan\Type\GeneralizePrecision;
3635
use PHPStan\Type\Generic\TemplateTypeMap;
@@ -39,10 +38,10 @@
3938
use PHPStan\Type\IntersectionType;
4039
use PHPStan\Type\MixedType;
4140
use PHPStan\Type\NeverType;
41+
use PHPStan\Type\NullType;
4242
use PHPStan\Type\Traits\ArrayTypeTrait;
4343
use PHPStan\Type\Traits\NonObjectTypeTrait;
4444
use PHPStan\Type\Traits\UndecidedComparisonTypeTrait;
45-
use PHPStan\Type\NullType;
4645
use PHPStan\Type\Type;
4746
use PHPStan\Type\TypeCombinator;
4847
use PHPStan\Type\UnionType;
@@ -1183,32 +1182,6 @@ private function removeFirstElements(int $length, bool $reindex = true): self
11831182
return $array;
11841183
}
11851184

1186-
/** @deprecated Use sliceArray() instead */
1187-
public function slice(int $offset, ?int $limit, bool $preserveKeys = false): self
1188-
{
1189-
$array = $this->sliceArray(
1190-
ConstantTypeHelper::getTypeFromValue($offset),
1191-
ConstantTypeHelper::getTypeFromValue($limit),
1192-
TrinaryLogic::createFromBoolean($preserveKeys),
1193-
);
1194-
if (!$array instanceof self) {
1195-
throw new ShouldNotHappenException();
1196-
}
1197-
1198-
return $array;
1199-
}
1200-
1201-
/** @deprecated Use reverseArray() instead */
1202-
public function reverse(bool $preserveKeys = false): self
1203-
{
1204-
$array = $this->reverseArray(TrinaryLogic::createFromBoolean($preserveKeys));
1205-
if (!$array instanceof self) {
1206-
throw new ShouldNotHappenException();
1207-
}
1208-
1209-
return $array;
1210-
}
1211-
12121185
private function reindex(): self
12131186
{
12141187
$keyTypes = [];

0 commit comments

Comments
 (0)