Browse Source

Move php8 only attributes inside docblock.

mscherer 4 years ago
parent
commit
4c07d7757f

+ 2 - 3
src/Collection/Iterator/BufferedIterator.php

@@ -18,7 +18,6 @@ namespace Cake\Collection\Iterator;
 
 use Cake\Collection\Collection;
 use Countable;
-use ReturnTypeWillChange;
 use Serializable;
 use SplDoublyLinkedList;
 
@@ -88,7 +87,7 @@ class BufferedIterator extends Collection implements Countable, Serializable
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->_key;
@@ -99,7 +98,7 @@ class BufferedIterator extends Collection implements Countable, Serializable
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->_current;

+ 1 - 2
src/Collection/Iterator/ExtractIterator.php

@@ -19,7 +19,6 @@ namespace Cake\Collection\Iterator;
 use ArrayIterator;
 use Cake\Collection\Collection;
 use Cake\Collection\CollectionInterface;
-use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -69,7 +68,7 @@ class ExtractIterator extends Collection
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $extractor = $this->_extractor;

+ 1 - 2
src/Collection/Iterator/InsertIterator.php

@@ -17,7 +17,6 @@ declare(strict_types=1);
 namespace Cake\Collection\Iterator;
 
 use Cake\Collection\Collection;
-use ReturnTypeWillChange;
 
 /**
  * This iterator will insert values into a property of each of the records returned.
@@ -102,7 +101,7 @@ class InsertIterator extends Collection
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $row = parent::current();

+ 1 - 2
src/Collection/Iterator/ReplaceIterator.php

@@ -19,7 +19,6 @@ namespace Cake\Collection\Iterator;
 use ArrayIterator;
 use Cake\Collection\Collection;
 use Cake\Collection\CollectionInterface;
-use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -66,7 +65,7 @@ class ReplaceIterator extends Collection
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $callback = $this->_callback;

+ 1 - 2
src/Collection/Iterator/TreePrinter.php

@@ -20,7 +20,6 @@ use Cake\Collection\CollectionInterface;
 use Cake\Collection\CollectionTrait;
 use RecursiveIterator;
 use RecursiveIteratorIterator;
-use ReturnTypeWillChange;
 
 /**
  * Iterator for flattening elements in a tree structure while adding some
@@ -88,7 +87,7 @@ class TreePrinter extends RecursiveIteratorIterator implements CollectionInterfa
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         $extractor = $this->_key;

+ 1 - 2
src/Collection/Iterator/ZipIterator.php

@@ -20,7 +20,6 @@ use Cake\Collection\Collection;
 use Cake\Collection\CollectionInterface;
 use Cake\Collection\CollectionTrait;
 use MultipleIterator;
-use ReturnTypeWillChange;
 use Serializable;
 
 /**
@@ -91,7 +90,7 @@ class ZipIterator extends MultipleIterator implements CollectionInterface, Seria
      *
      * @return array
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         if ($this->_callback === null) {

+ 1 - 0
src/Database/Driver/Mysql.php

@@ -33,6 +33,7 @@ class Mysql extends Driver
 
     /**
      * @inheritDoc
+     * @var int
      */
     protected const MAX_ALIAS_LENGTH = 256;
 

+ 1 - 0
src/Database/Driver/Postgres.php

@@ -36,6 +36,7 @@ class Postgres extends Driver
 
     /**
      * @inheritDoc
+     * @var int
      */
     protected const MAX_ALIAS_LENGTH = 63;
 

+ 1 - 2
src/Database/Query.php

@@ -28,7 +28,6 @@ use Cake\Database\Statement\CallbackStatement;
 use Closure;
 use InvalidArgumentException;
 use IteratorAggregate;
-use ReturnTypeWillChange;
 use RuntimeException;
 
 /**
@@ -1933,7 +1932,7 @@ class Query implements ExpressionInterface, IteratorAggregate
      * @return \Cake\Database\StatementInterface
      * @psalm-suppress ImplementedReturnTypeMismatch
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         if ($this->_iterator === null || $this->_dirty) {

+ 2 - 3
src/Database/Statement/BufferedStatement.php

@@ -20,7 +20,6 @@ use Cake\Database\DriverInterface;
 use Cake\Database\StatementInterface;
 use Cake\Database\TypeConverterTrait;
 use Iterator;
-use ReturnTypeWillChange;
 
 /**
  * A statement decorator that implements buffered results.
@@ -282,7 +281,7 @@ class BufferedStatement implements Iterator, StatementInterface
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->index;
@@ -293,7 +292,7 @@ class BufferedStatement implements Iterator, StatementInterface
      *
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->buffer[$this->index];

+ 1 - 2
src/Database/Statement/StatementDecorator.php

@@ -21,7 +21,6 @@ use Cake\Database\StatementInterface;
 use Cake\Database\TypeConverterTrait;
 use Countable;
 use IteratorAggregate;
-use ReturnTypeWillChange;
 
 /**
  * Represents a database statement. Statements contains queries that can be
@@ -283,7 +282,7 @@ class StatementDecorator implements StatementInterface, Countable, IteratorAggre
      * @return \Cake\Database\StatementInterface
      * @psalm-suppress ImplementedReturnTypeMismatch
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         if (!$this->_hasExecuted) {

+ 1 - 2
src/Datasource/EntityTrait.php

@@ -21,7 +21,6 @@ use Cake\ORM\Entity;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 use InvalidArgumentException;
-use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -602,7 +601,7 @@ trait EntityTrait
      * @param string $offset The offset to get.
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function &offsetGet($offset)
     {
         return $this->get($offset);

+ 1 - 2
src/Event/EventList.php

@@ -18,7 +18,6 @@ namespace Cake\Event;
 
 use ArrayAccess;
 use Countable;
-use ReturnTypeWillChange;
 
 /**
  * The Event List
@@ -72,7 +71,7 @@ class EventList implements ArrayAccess, Countable
      * @param mixed $offset The offset to retrieve.
      * @return mixed Can return all value types.
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if ($this->offsetExists($offset)) {

+ 2 - 3
src/Http/Session/CacheSession.php

@@ -20,7 +20,6 @@ namespace Cake\Http\Session;
 
 use Cake\Cache\Cache;
 use InvalidArgumentException;
-use ReturnTypeWillChange;
 use SessionHandlerInterface;
 
 /**
@@ -81,7 +80,7 @@ class CacheSession implements SessionHandlerInterface
      * @param string $id ID that uniquely identifies session in cache.
      * @return string|false Session data or false if it does not exist.
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function read($id)
     {
         $value = Cache::read($id, $this->_options['config']);
@@ -128,7 +127,7 @@ class CacheSession implements SessionHandlerInterface
      * @param int $maxlifetime Sessions that have not updated for the last maxlifetime seconds will be removed.
      * @return int|false
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         return 0;

+ 2 - 3
src/Http/Session/DatabaseSession.php

@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Cake\Http\Session;
 
 use Cake\ORM\Locator\LocatorAwareTrait;
-use ReturnTypeWillChange;
 use SessionHandlerInterface;
 
 /**
@@ -110,7 +109,7 @@ class DatabaseSession implements SessionHandlerInterface
      * @param string $id ID that uniquely identifies session in database.
      * @return string|false Session data or false if it does not exist.
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function read($id)
     {
         /** @var string $pkField */
@@ -178,7 +177,7 @@ class DatabaseSession implements SessionHandlerInterface
      * @param int $maxlifetime Sessions that have not updated for the last maxlifetime seconds will be removed.
      * @return int|false The number of deleted sessions on success, or false on failure.
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         return $this->_table->deleteAll(['expires <' => time()]);

+ 1 - 2
src/I18n/DateFormatTrait.php

@@ -21,7 +21,6 @@ use Closure;
 use DateTime;
 use DateTimeZone;
 use IntlDateFormatter;
-use ReturnTypeWillChange;
 use RuntimeException;
 
 /**
@@ -444,7 +443,7 @@ trait DateFormatTrait
      *
      * @return string|int
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         if (static::$_jsonEncodeFormat instanceof Closure) {

+ 2 - 2
src/I18n/Parser/MoFileParser.php

@@ -30,7 +30,7 @@ class MoFileParser
      * Magic used for validating the format of a MO file as well as
      * detecting if the machine used to create that file was little endian.
      *
-     * @var float
+     * @var int
      */
     public const MO_LITTLE_ENDIAN_MAGIC = 0x950412de;
 
@@ -38,7 +38,7 @@ class MoFileParser
      * Magic used for validating the format of a MO file as well as
      * detecting if the machine used to create that file was big endian.
      *
-     * @var float
+     * @var int
      */
     public const MO_BIG_ENDIAN_MAGIC = 0xde120495;
 

+ 1 - 2
src/ORM/ResultSet.php

@@ -22,7 +22,6 @@ use Cake\Database\Exception\DatabaseException;
 use Cake\Database\StatementInterface;
 use Cake\Datasource\EntityInterface;
 use Cake\Datasource\ResultSetInterface;
-use ReturnTypeWillChange;
 use SplFixedArray;
 
 /**
@@ -185,7 +184,7 @@ class ResultSet implements ResultSetInterface
      *
      * @return object|array
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->_current;

+ 2 - 3
tests/test_app/Plugin/TestPlugin/src/Http/Session/TestPluginSession.php

@@ -3,7 +3,6 @@ declare(strict_types=1);
 
 namespace TestPlugin\Http\Session;
 
-use ReturnTypeWillChange;
 use SessionHandlerInterface;
 
 /**
@@ -30,7 +29,7 @@ class TestPluginSession implements SessionHandlerInterface
     /**
      * @inheritDoc
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function read($id)
     {
     }
@@ -54,7 +53,7 @@ class TestPluginSession implements SessionHandlerInterface
     /**
      * @inheritDoc
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         return 0;

+ 3 - 0
tests/test_app/TestApp/Database/Driver/TestDriver.php

@@ -19,6 +19,9 @@ use Cake\Database\Driver\Sqlite;
 
 class TestDriver extends Sqlite
 {
+    /**
+     * @inheritDoc
+     */
     public function enabled(): bool
     {
         return true;

+ 1 - 2
tests/test_app/TestApp/Http/Client/Adapter/CakeStreamWrapper.php

@@ -5,7 +5,6 @@ namespace TestApp\Http\Client\Adapter;
 
 use ArrayAccess;
 use Exception;
-use ReturnTypeWillChange;
 
 class CakeStreamWrapper implements ArrayAccess
 {
@@ -72,7 +71,7 @@ class CakeStreamWrapper implements ArrayAccess
     /**
      * @inheritDoc
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->_data[$offset];

+ 2 - 3
tests/test_app/TestApp/Http/Session/TestAppLibSession.php

@@ -3,7 +3,6 @@ declare(strict_types=1);
 
 namespace TestApp\Http\Session;
 
-use ReturnTypeWillChange;
 use SessionHandlerInterface;
 
 /**
@@ -37,7 +36,7 @@ class TestAppLibSession implements SessionHandlerInterface
     /**
      * @inheritDoc
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function read($id)
     {
     }
@@ -61,7 +60,7 @@ class TestAppLibSession implements SessionHandlerInterface
     /**
      * @inheritDoc
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         return 0;