Get rid of RetutnTypeWillChange where possible, fixes #10014

src/Composer/DependencyResolver/Decisions.php

@@ -205,20 +205,12 @@ class Decisions implements \Iterator, \Countable
         array_pop($this->decisionQueue);
     }
 
-    /**
+    public function count(): int
-     * @return int
-     */
-    #[\ReturnTypeWillChange]
-    public function count()
     {
         return \count($this->decisionQueue);
     }
 
-    /**
+    public function rewind(): void
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function rewind()
     {
         end($this->decisionQueue);
     }
@@ -232,29 +224,17 @@ class Decisions implements \Iterator, \Countable
         return current($this->decisionQueue);
     }
 
-    /**
+    public function key(): ?int
-     * @return ?int
-     */
-    #[\ReturnTypeWillChange]
-    public function key()
     {
         return key($this->decisionQueue);
     }
 
-    /**
+    public function next(): void
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function next()
     {
         prev($this->decisionQueue);
     }
 
-    /**
+    public function valid(): bool
-     * @return bool
-     */
-    #[\ReturnTypeWillChange]
-    public function valid()
     {
         return false !== current($this->decisionQueue);
     }

src/Composer/DependencyResolver/Pool.php

@@ -129,10 +129,8 @@ class Pool implements \Countable
 
     /**
      * Returns how many packages have been loaded into the pool
-     * @return int
      */
-    #[\ReturnTypeWillChange]
+    public function count(): int
-    public function count()
     {
         return \count($this->packages);
     }

src/Composer/DependencyResolver/RuleSet.php

@@ -103,11 +103,7 @@ class RuleSet implements \IteratorAggregate, \Countable
         }
     }
 
-    /**
+    public function count(): int
-     * @return int
-     */
-    #[\ReturnTypeWillChange]
-    public function count()
     {
         return $this->nextRuleId;
     }
@@ -127,11 +123,7 @@ class RuleSet implements \IteratorAggregate, \Countable
         return $this->rules;
     }
 
-    /**
+    public function getIterator(): RuleSetIterator
-     * @return RuleSetIterator
-     */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
     {
         return new RuleSetIterator($this->getRules());
     }

src/Composer/DependencyResolver/RuleSetIterator.php

@@ -42,11 +42,7 @@ class RuleSetIterator implements \Iterator
         $this->rewind();
     }
 
-    /**
+    public function current(): Rule
-     * @return Rule
-     */
-    #[\ReturnTypeWillChange]
-    public function current()
     {
         return $this->rules[$this->currentType][$this->currentOffset];
     }
@@ -54,17 +50,12 @@ class RuleSetIterator implements \Iterator
     /**
      * @return RuleSet::TYPE_*|-1
      */
-    #[\ReturnTypeWillChange]
+    public function key(): int
-    public function key()
     {
         return $this->currentType;
     }
 
-    /**
+    public function next(): void
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function next()
     {
         $this->currentOffset++;
 
@@ -88,11 +79,7 @@ class RuleSetIterator implements \Iterator
         }
     }
 
-    /**
+    public function rewind(): void
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function rewind()
     {
         $this->currentOffset = 0;
 
@@ -111,11 +98,7 @@ class RuleSetIterator implements \Iterator
         } while (isset($this->types[$this->currentTypeOffset]) && !\count($this->rules[$this->currentType]));
     }
 
-    /**
+    public function valid(): bool
-     * @return bool
-     */
-    #[\ReturnTypeWillChange]
-    public function valid()
     {
         return isset($this->rules[$this->currentType], $this->rules[$this->currentType][$this->currentOffset]);
     }

src/Composer/Package/Archiver/ArchivableFilesFilter.php

@@ -23,8 +23,7 @@ class ArchivableFilesFilter extends FilterIterator
     /**
      * @return bool true if the current element is acceptable, otherwise false.
      */
-    #[\ReturnTypeWillChange]
+    public function accept(): bool
-    public function accept()
     {
         $file = $this->getInnerIterator()->current();
         if ($file->isDir()) {

src/Composer/Package/Archiver/ArchivableFilesFinder.php

@@ -90,8 +90,7 @@ class ArchivableFilesFinder extends \FilterIterator
         parent::__construct($this->finder->getIterator());
     }
 
-    #[\ReturnTypeWillChange]
+    public function accept(): bool
-    public function accept()
     {
         /** @var SplFileInfo $current */
         $current = $this->getInnerIterator()->current();

src/Composer/Repository/ArrayRepository.php

@@ -322,8 +322,7 @@ class ArrayRepository implements RepositoryInterface
      *
      * @return int Number of packages
      */
-    #[\ReturnTypeWillChange]
+    public function count(): int
-    public function count()
     {
         if (null === $this->packages) {
             $this->initialize();

src/Composer/Repository/CompositeRepository.php

@@ -178,8 +178,7 @@ class CompositeRepository implements RepositoryInterface
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
+    public function count(): int
-    public function count()
     {
         $total = 0;
         foreach ($this->repositories as $repository) {

src/Composer/Repository/FilterRepository.php

@@ -181,8 +181,7 @@ class FilterRepository implements RepositoryInterface
     /**
      * @inheritDoc
      */
-    #[\ReturnTypeWillChange]
+    public function count(): int
-    public function count()
     {
         if ($this->repo->count() > 0) {
             return count($this->getPackages());

src/Composer/Util/ErrorHandler.php

@@ -54,15 +54,6 @@ class ErrorHandler
         }
 
         if (self::$io) {
-            // ignore symfony/* deprecation warnings
-            // TODO remove in 2.3
-            if (Preg::isMatch('{^Return type of Symfony\\\\.*ReturnTypeWillChange}is', $message)) {
-                return true;
-            }
-            if (strpos(strtr($file, '\\', '/'), 'vendor/symfony/') !== false) {
-                return true;
-            }
-
             self::$io->writeError('<warning>Deprecation Notice: '.$message.' in '.$file.':'.$line.'</warning>');
             if (self::$io->isVerbose()) {
                 self::$io->writeError('<warning>Stack trace:</warning>');