minor #32298 [Cache] finish type-hints (Tobion)

Tobion · Tobion · commit f800d01ff7ce · 2019-07-02T16:51:24.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [Cache] finish type-hints | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #32179 | License | MIT | Doc PR | symfony/symfony-docs#...  Finish leftovers from #32282 Commits ------- 1919c7d [Cache] finish type-hints
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -99,12 +99,6 @@ function ($deferred, $namespace, &$expiredIds) use ($getId) {
      *
      * Using ApcuAdapter makes system caches compatible with read-only filesystems.
      *
-     * @param string               $namespace
-     * @param int                  $defaultLifetime
-     * @param string               $version
-     * @param string               $directory
-     * @param LoggerInterface|null $logger
-     *
      * @return AdapterInterface
      */
     public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null)
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -128,7 +128,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix) {
      *
      * @return array The identifiers that failed to be cached or a boolean stating if caching succeeded or not
      */
-    abstract protected function doSave(array $values, ?int $lifetime, array $addTagData = [], array $removeTagData = []): array;
+    abstract protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array;
 
     /**
      * Removes multiple items from the pool and their corresponding tags.
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -72,7 +72,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         return apcu_exists($id);
     }
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -31,7 +31,6 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
     private $createCacheItem;
 
     /**
-     * @param int  $defaultLifetime
      * @param bool $storeSerialized Disabling serialization can lead to cache corruptions when storing mutable values but increases performance otherwise
      */
     public function __construct(int $defaultLifetime = 0, bool $storeSerialized = true)
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php
@@ -65,7 +65,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         return $this->provider->contains($id);
     }
diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php
@@ -51,7 +51,7 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, ?int $lifetime, array $addTagData = [], array $removeTagData = []): array
+    protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array
     {
         $failed = $this->doSaveCache($values, $lifetime);
 
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -276,7 +276,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         return false !== $this->getClient()->get(rawurlencode($id)) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
     }
diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -236,7 +236,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         $sql = "SELECT 1 FROM $this->table WHERE $this->idCol = :id AND ($this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > :time)";
         $stmt = $this->getConnection()->prepare($sql);
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -69,7 +69,7 @@ function ($key, $value, $isHit) {
      *
      * @return CacheItemPoolInterface
      */
-    public static function create($file, CacheItemPoolInterface $fallbackPool)
+    public static function create(string $file, CacheItemPoolInterface $fallbackPool)
     {
         // Shared memory is available in PHP 7.0+ with OPCache enabled
         if (filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -165,7 +165,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         if ($this->appendOnly && isset($this->values[$id])) {
             return true;
diff --git a/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php b/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
@@ -55,7 +55,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         return $this->pool->has($id);
     }
diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
@@ -88,7 +88,7 @@ public function __construct($redisClient, string $namespace = '', int $defaultLi
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, ?int $lifetime, array $addTagData = [], array $delTagData = []): array
+    protected function doSave(array $values, int $lifetime, array $addTagData = [], array $delTagData = []): array
     {
         // serialize values
         if (!$serialized = $this->marshaller->marshall($values, $failed)) {
diff --git a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php
@@ -81,7 +81,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         $file = $this->getFile($id);
 
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -324,7 +324,7 @@ protected function doFetch(array $ids)
     /**
      * {@inheritdoc}
      */
-    protected function doHave($id)
+    protected function doHave(string $id)
     {
         return (bool) $this->redis->exists($id);
     }

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,6 @@ function ($deferred, $namespace, &$expiredIds) use ($getId) {`
`99`	`99`	`*`
`100`	`100`	`* Using ApcuAdapter makes system caches compatible with read-only filesystems.`
`101`	`101`	`*`
`102`		`- * @param string $namespace`
`103`		`- * @param int $defaultLifetime`
`104`		`- * @param string $version`
`105`		`- * @param string $directory`
`106`		`- * @param LoggerInterface\|null $logger`
`107`		`- *`
`108`	`102`	`* @return AdapterInterface`
`109`	`103`	`*/`
`110`	`104`	`public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix) {`
`128`	`128`	`*`
`129`	`129`	`* @return array The identifiers that failed to be cached or a boolean stating if caching succeeded or not`
`130`	`130`	`*/`
`131`		`- abstract protected function doSave(array $values, ?int $lifetime, array $addTagData = [], array $removeTagData = []): array;`
	`131`	`+ abstract protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array;`
`132`	`132`
`133`	`133`	`/**`
`134`	`134`	`* Removes multiple items from the pool and their corresponding tags.`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function doFetch(array $ids)`
`72`	`72`	`/**`
`73`	`73`	`* {@inheritdoc}`
`74`	`74`	`*/`
`75`		`- protected function doHave($id)`
	`75`	`+ protected function doHave(string $id)`
`76`	`76`	`{`
`77`	`77`	`return apcu_exists($id);`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function doFetch(array $ids)`
`65`	`65`	`/**`
`66`	`66`	`* {@inheritdoc}`
`67`	`67`	`*/`
`68`		`- protected function doHave($id)`
	`68`	`+ protected function doHave(string $id)`
`69`	`69`	`{`
`70`	`70`	`return $this->provider->contains($id);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st`
`51`	`51`	`/**`
`52`	`52`	`* {@inheritdoc}`
`53`	`53`	`*/`
`54`		`- protected function doSave(array $values, ?int $lifetime, array $addTagData = [], array $removeTagData = []): array`
	`54`	`+ protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array`
`55`	`55`	`{`
`56`	`56`	`$failed = $this->doSaveCache($values, $lifetime);`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ protected function doFetch(array $ids)`
`276`	`276`	`/**`
`277`	`277`	`* {@inheritdoc}`
`278`	`278`	`*/`
`279`		`- protected function doHave($id)`
	`279`	`+ protected function doHave(string $id)`
`280`	`280`	`{`
`281`	`281`	`return false !== $this->getClient()->get(rawurlencode($id)) \|\| $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ protected function doFetch(array $ids)`
`236`	`236`	`/**`
`237`	`237`	`* {@inheritdoc}`
`238`	`238`	`*/`
`239`		`- protected function doHave($id)`
	`239`	`+ protected function doHave(string $id)`
`240`	`240`	`{`
`241`	`241`	`$sql = "SELECT 1 FROM $this->table WHERE $this->idCol = :id AND ($this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > :time)";`
`242`	`242`	`$stmt = $this->getConnection()->prepare($sql);`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function ($key, $value, $isHit) {`
`69`	`69`	`*`
`70`	`70`	`* @return CacheItemPoolInterface`
`71`	`71`	`*/`
`72`		`- public static function create($file, CacheItemPoolInterface $fallbackPool)`
	`72`	`+ public static function create(string $file, CacheItemPoolInterface $fallbackPool)`
`73`	`73`	`{`
`74`	`74`	`// Shared memory is available in PHP 7.0+ with OPCache enabled`
`75`	`75`	`if (filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ protected function doFetch(array $ids)`
`165`	`165`	`/**`
`166`	`166`	`* {@inheritdoc}`
`167`	`167`	`*/`
`168`		`- protected function doHave($id)`
	`168`	`+ protected function doHave(string $id)`
`169`	`169`	`{`
`170`	`170`	`if ($this->appendOnly && isset($this->values[$id])) {`
`171`	`171`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected function doFetch(array $ids)`
`55`	`55`	`/**`
`56`	`56`	`* {@inheritdoc}`
`57`	`57`	`*/`
`58`		`- protected function doHave($id)`
	`58`	`+ protected function doHave(string $id)`
`59`	`59`	`{`
`60`	`60`	`return $this->pool->has($id);`
`61`	`61`	`}`