diff --git a/src/Illuminate/Bus/Batch.php b/src/Illuminate/Bus/Batch.php index 5766ff025ef9..aea6c0f641bc 100644 --- a/src/Illuminate/Bus/Batch.php +++ b/src/Illuminate/Bus/Batch.php @@ -11,7 +11,6 @@ use Illuminate\Support\Arr; use Illuminate\Support\Collection; use JsonSerializable; -use ReturnTypeWillChange; use Throwable; class Batch implements Arrayable, JsonSerializable @@ -460,7 +459,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php index 7ced629bc4c4..19f32a322ee3 100644 --- a/src/Illuminate/Collections/Traits/EnumeratesValues.php +++ b/src/Illuminate/Collections/Traits/EnumeratesValues.php @@ -13,7 +13,6 @@ use Illuminate\Support\HigherOrderCollectionProxy; use Illuminate\Support\HigherOrderWhenProxy; use JsonSerializable; -use ReturnTypeWillChange; use Symfony\Component\VarDumper\VarDumper; use Traversable; @@ -834,7 +833,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return array_map(function ($value) { diff --git a/src/Illuminate/Container/RewindableGenerator.php b/src/Illuminate/Container/RewindableGenerator.php index 675527d87eb4..a3052ef0bc87 100644 --- a/src/Illuminate/Container/RewindableGenerator.php +++ b/src/Illuminate/Container/RewindableGenerator.php @@ -49,6 +49,7 @@ public function getIterator() * * @return int */ + #[\ReturnTypeWillChange] public function count() { if (is_callable($count = $this->count)) { diff --git a/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php b/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php index b1120c3f4a1d..6f1713c946ac 100644 --- a/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php +++ b/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php @@ -5,7 +5,6 @@ use ArrayObject as BaseArrayObject; use Illuminate\Contracts\Support\Arrayable; use JsonSerializable; -use ReturnTypeWillChange; class ArrayObject extends BaseArrayObject implements Arrayable, JsonSerializable { @@ -34,7 +33,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->getArrayCopy(); diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php index 0b95847a1112..9d21e98ad9dd 100644 --- a/src/Illuminate/Database/Eloquent/Model.php +++ b/src/Illuminate/Database/Eloquent/Model.php @@ -21,7 +21,6 @@ use Illuminate\Support\Traits\ForwardsCalls; use JsonSerializable; use LogicException; -use ReturnTypeWillChange; abstract class Model implements Arrayable, ArrayAccess, HasBroadcastChannel, Jsonable, JsonSerializable, QueueableEntity, UrlRoutable { @@ -1427,7 +1426,7 @@ public function toJson($options = 0) * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Http/Resources/Json/JsonResource.php b/src/Illuminate/Http/Resources/Json/JsonResource.php index 130a0691ebef..7cbdb602997e 100644 --- a/src/Illuminate/Http/Resources/Json/JsonResource.php +++ b/src/Illuminate/Http/Resources/Json/JsonResource.php @@ -11,7 +11,6 @@ use Illuminate\Http\Resources\ConditionallyLoadsAttributes; use Illuminate\Http\Resources\DelegatesToResource; use JsonSerializable; -use ReturnTypeWillChange; class JsonResource implements ArrayAccess, JsonSerializable, Responsable, UrlRoutable { @@ -227,7 +226,7 @@ public function toResponse($request) * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->resolve(Container::getInstance()->make('request')); diff --git a/src/Illuminate/Http/Resources/Json/ResourceCollection.php b/src/Illuminate/Http/Resources/Json/ResourceCollection.php index ff090e9bea3a..65710aa32700 100644 --- a/src/Illuminate/Http/Resources/Json/ResourceCollection.php +++ b/src/Illuminate/Http/Resources/Json/ResourceCollection.php @@ -85,6 +85,7 @@ public function withQuery(array $query) * * @return int */ + #[\ReturnTypeWillChange] public function count() { return $this->collection->count(); diff --git a/src/Illuminate/Pagination/CursorPaginator.php b/src/Illuminate/Pagination/CursorPaginator.php index f53c99678475..01039b7d1da0 100644 --- a/src/Illuminate/Pagination/CursorPaginator.php +++ b/src/Illuminate/Pagination/CursorPaginator.php @@ -10,7 +10,6 @@ use Illuminate\Support\Collection; use IteratorAggregate; use JsonSerializable; -use ReturnTypeWillChange; class CursorPaginator extends AbstractCursorPaginator implements Arrayable, ArrayAccess, Countable, IteratorAggregate, Jsonable, JsonSerializable, PaginatorContract { @@ -143,7 +142,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Pagination/LengthAwarePaginator.php b/src/Illuminate/Pagination/LengthAwarePaginator.php index f64e198ef054..81c0d78a515b 100644 --- a/src/Illuminate/Pagination/LengthAwarePaginator.php +++ b/src/Illuminate/Pagination/LengthAwarePaginator.php @@ -10,7 +10,6 @@ use Illuminate\Support\Collection; use IteratorAggregate; use JsonSerializable; -use ReturnTypeWillChange; class LengthAwarePaginator extends AbstractPaginator implements Arrayable, ArrayAccess, Countable, IteratorAggregate, Jsonable, JsonSerializable, LengthAwarePaginatorContract { @@ -214,7 +213,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Pagination/Paginator.php b/src/Illuminate/Pagination/Paginator.php index 822e7677e726..d295e669480f 100644 --- a/src/Illuminate/Pagination/Paginator.php +++ b/src/Illuminate/Pagination/Paginator.php @@ -10,7 +10,6 @@ use Illuminate\Support\Collection; use IteratorAggregate; use JsonSerializable; -use ReturnTypeWillChange; class Paginator extends AbstractPaginator implements Arrayable, ArrayAccess, Countable, IteratorAggregate, Jsonable, JsonSerializable, PaginatorContract { @@ -159,7 +158,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Session/ArraySessionHandler.php b/src/Illuminate/Session/ArraySessionHandler.php index 571210f637ef..1dcaa607feb4 100644 --- a/src/Illuminate/Session/ArraySessionHandler.php +++ b/src/Illuminate/Session/ArraySessionHandler.php @@ -3,7 +3,6 @@ namespace Illuminate\Session; use Illuminate\Support\InteractsWithTime; -use ReturnTypeWillChange; use SessionHandlerInterface; class ArraySessionHandler implements SessionHandlerInterface @@ -38,7 +37,7 @@ public function __construct($minutes) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function open($savePath, $sessionName) { return true; @@ -47,7 +46,7 @@ public function open($savePath, $sessionName) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function close() { return true; @@ -56,7 +55,7 @@ public function close() /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function read($sessionId) { if (! isset($this->storage[$sessionId])) { @@ -77,7 +76,7 @@ public function read($sessionId) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function write($sessionId, $data) { $this->storage[$sessionId] = [ @@ -91,7 +90,7 @@ public function write($sessionId, $data) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function destroy($sessionId) { if (isset($this->storage[$sessionId])) { @@ -104,7 +103,7 @@ public function destroy($sessionId) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function gc($lifetime) { $expiration = $this->calculateExpiration($lifetime); diff --git a/src/Illuminate/Session/NullSessionHandler.php b/src/Illuminate/Session/NullSessionHandler.php index c34e47ef5848..778f48fa42e3 100644 --- a/src/Illuminate/Session/NullSessionHandler.php +++ b/src/Illuminate/Session/NullSessionHandler.php @@ -2,7 +2,6 @@ namespace Illuminate\Session; -use ReturnTypeWillChange; use SessionHandlerInterface; class NullSessionHandler implements SessionHandlerInterface @@ -10,7 +9,7 @@ class NullSessionHandler implements SessionHandlerInterface /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function open($savePath, $sessionName) { return true; @@ -19,7 +18,7 @@ public function open($savePath, $sessionName) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function close() { return true; @@ -28,7 +27,7 @@ public function close() /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function read($sessionId) { return ''; @@ -37,7 +36,7 @@ public function read($sessionId) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function write($sessionId, $data) { return true; @@ -46,7 +45,7 @@ public function write($sessionId, $data) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function destroy($sessionId) { return true; @@ -55,7 +54,7 @@ public function destroy($sessionId) /** * {@inheritdoc} */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function gc($lifetime) { return true; diff --git a/src/Illuminate/Support/Fluent.php b/src/Illuminate/Support/Fluent.php index 411b83f8deb4..5ea478a9353c 100755 --- a/src/Illuminate/Support/Fluent.php +++ b/src/Illuminate/Support/Fluent.php @@ -6,7 +6,6 @@ use Illuminate\Contracts\Support\Arrayable; use Illuminate\Contracts\Support\Jsonable; use JsonSerializable; -use ReturnTypeWillChange; class Fluent implements Arrayable, ArrayAccess, Jsonable, JsonSerializable { @@ -71,7 +70,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Support/MessageBag.php b/src/Illuminate/Support/MessageBag.php index 852bc5e3bb58..82201f815501 100755 --- a/src/Illuminate/Support/MessageBag.php +++ b/src/Illuminate/Support/MessageBag.php @@ -8,7 +8,6 @@ use Illuminate\Contracts\Support\MessageBag as MessageBagContract; use Illuminate\Contracts\Support\MessageProvider; use JsonSerializable; -use ReturnTypeWillChange; class MessageBag implements Arrayable, Countable, Jsonable, JsonSerializable, MessageBagContract, MessageProvider { @@ -370,6 +369,7 @@ public function any() * * @return int */ + #[\ReturnTypeWillChange] public function count() { return count($this->messages, COUNT_RECURSIVE) - count($this->messages); @@ -390,7 +390,7 @@ public function toArray() * * @return array */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/src/Illuminate/Support/Stringable.php b/src/Illuminate/Support/Stringable.php index af181b1c1f0c..6e8328e3ab1f 100644 --- a/src/Illuminate/Support/Stringable.php +++ b/src/Illuminate/Support/Stringable.php @@ -7,7 +7,6 @@ use Illuminate\Support\Traits\Macroable; use Illuminate\Support\Traits\Tappable; use JsonSerializable; -use ReturnTypeWillChange; use Symfony\Component\VarDumper\VarDumper; class Stringable implements JsonSerializable @@ -783,7 +782,7 @@ public function dd() * * @return string */ - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->__toString(); diff --git a/src/Illuminate/Testing/AssertableJsonString.php b/src/Illuminate/Testing/AssertableJsonString.php index e36c84aa300d..ef165fa5d757 100644 --- a/src/Illuminate/Testing/AssertableJsonString.php +++ b/src/Illuminate/Testing/AssertableJsonString.php @@ -334,6 +334,7 @@ protected function jsonSearchStrings($key, $value) * * @return int */ + #[\ReturnTypeWillChange] public function count() { return count($this->decoded); diff --git a/tests/Database/DatabaseProcessorTest.php b/tests/Database/DatabaseProcessorTest.php index 2767523d7f7a..4e858cd59853 100755 --- a/tests/Database/DatabaseProcessorTest.php +++ b/tests/Database/DatabaseProcessorTest.php @@ -8,7 +8,6 @@ use Mockery as m; use PDO; use PHPUnit\Framework\TestCase; -use ReturnTypeWillChange; class DatabaseProcessorTest extends TestCase { @@ -39,7 +38,7 @@ public function __construct() // } - #[ReturnTypeWillChange] + #[\ReturnTypeWillChange] public function lastInsertId(string $sequence = null) { //