diff --git a/.rector.php b/.rector.php
index d85ced26c3e..c25b14684f3 100644
--- a/.rector.php
+++ b/.rector.php
@@ -111,7 +111,6 @@
             Php80\Class_\AnnotationToAttributeRector::class, # todo: wait for php80
             Php80\Class_\ClassPropertyAssignToConstructorPromotionRector::class, # todo: wait for php80
             Php80\Class_\StringableForToStringRector::class, # todo: wait for php80
-            Php80\ClassMethod\AddParamBasedOnParentClassMethodRector::class, # todo: TMP
             Php81\Array_\FirstClassCallableRector::class, # todo: TMP
             Php81\FuncCall\NullToStrictStringFuncCallArgRector::class, # todo: check later
             Strict\Empty_\DisallowedEmptyRuleFixerRector::class, # todo: TMP
diff --git a/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php b/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php
index c421a6679c3..59c261cb8fa 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php
@@ -52,7 +52,7 @@ protected function checkFeedEnable($code)
      * @return Mage_Core_Helper_Abstract
      * @deprecated this method is incompatible with parent class. Use Mage::helper instead
      */
-    protected function _getHelper($name)
+    protected function _getHelper($name = null)
     {
         return Mage::helper($name);
     }
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
index 018142f9ea1..94dfd63f952 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
@@ -18,7 +18,7 @@ class Mage_Core_Model_Mysql4_Design_Theme_Collection extends Varien_Directory_Co
     /**
      * @return $this
      */
-    public function load()
+    public function load($printQuery = false, $logQuery = false)
     {
         $packages = $this->getData('themes');
         if (is_null($packages)) {
diff --git a/lib/Varien/Directory/Collection.php b/lib/Varien/Directory/Collection.php
index 28eb4d9e064..5ce7e765a6f 100644
--- a/lib/Varien/Directory/Collection.php
+++ b/lib/Varien/Directory/Collection.php
@@ -33,8 +33,8 @@ class Varien_Directory_Collection extends Varien_Data_Collection implements IFac
      * Constructor
      *
      * @param   string $path - path to directory
-     * @param   bool $is_recursion - use or not recursion
-     * @return  none
+     * @param   bool $isRecursion - use or not recursion
+     * @return  void
      */
     public function __construct($path, $isRecursion = true, $recursionLevel = 0)
     {
@@ -92,7 +92,8 @@ public function getPath()
      * Set path to this directory
      * @param   string $path - path to this directory
      * @param   bool $isRecursion - use or not recursion
-     * @return  none
+     * @return  void
+     * @throws  Exception
      */
     public function setPath($path, $isRecursion = '')
     {
@@ -116,7 +117,7 @@ public function setPath($path, $isRecursion = '')
      * Set recursion
      *
      * @param   bool $isRecursion - use or not recursion
-     * @return  none
+     * @return  void
      */
     public function setRecursion($isRecursion)
     {
@@ -127,7 +128,7 @@ public function setRecursion($isRecursion)
      * Set level of recursion
      *
      * @param   int $recursionLevel - level of recursion
-     * @return  none
+     * @return  void
      */
     public function setRecursionLevel($recursionLevel)
     {
@@ -137,7 +138,6 @@ public function setRecursionLevel($recursionLevel)
     /**
      * get latest dir in the path
      *
-     * @param   string $path - path to directory
      * @return  string - latest dir in the path
      */
     public function lastDir()
@@ -161,7 +161,7 @@ public static function getLastDir($path)
      * add item to collection
      *
      * @param   IFactory $item - item of collection
-     * @return  none
+     * @return  void
      */
     public function addItem(IFactory $item)
     {
@@ -171,7 +171,7 @@ public function addItem(IFactory $item)
     /**
      * parse this directory
      *
-     * @return  none
+     * @return  void
      */
     protected function parseDir()
     {
@@ -191,7 +191,7 @@ protected function parseDir()
      * set filter using
      *
      * @param   bool $useFilter - filter using
-     * @return  none
+     * @return  void
      */
     public function useFilter($useFilter)
     {
@@ -215,7 +215,7 @@ public function filesName()
      * get files names of current collection
      *
      * @param   array $files - array of files names
-     * @return  none
+     * @return  void
      */
     public function getFilesName(&$files)
     {
@@ -237,8 +237,8 @@ public function filesPaths()
     /**
      * get files paths of current collection
      *
-     * @param   array $files - array of files paths
-     * @return  none
+     * @param   array &$paths - array of files paths
+     * @return  void
      */
     public function getFilesPaths(&$paths)
     {
@@ -261,7 +261,7 @@ public function filesObj()
      * get SplFileObject objects of files of current collection
      *
      * @param   array $objs - array of SplFileObject objects
-     * @return  none
+     * @return  void
      */
     public function getFilesObj(&$objs)
     {
@@ -284,7 +284,7 @@ public function dirsName()
      * get names of dirs of current collection
      *
      * @param   array $dirs - array of names of dirs
-     * @return  none
+     * @return  void
      */
     public function getDirsName(&$dirs)
     {
@@ -298,7 +298,7 @@ public function getDirsName(&$dirs)
      * set filters for files
      *
      * @param   array $filter - array of filters
-     * @return  none
+     * @return  void
      */
     protected function setFilesFilter($filter)
     {
@@ -320,7 +320,7 @@ public function __toArray()
     /**
      * display this collection as array
      * @param   array &$arr - this collection array
-     * @return  none
+     * @return  void
      */
     public function toArray(&$arr)
     {
@@ -336,7 +336,7 @@ public function toArray(&$arr)
      * get this collection as xml
      * @param   bool $addOpenTag - add or not header of xml
      * @param   string $rootName - root element name
-     * @return  none
+     * @return  string
      */
     public function __toXml($addOpenTag = true, $rootName = 'Struct')
     {
@@ -350,9 +350,9 @@ public function __toXml($addOpenTag = true, $rootName = 'Struct')
      * @param   string &$xml - xml
      * @param   bool $addOpenTag - add or not header of xml
      * @param   string $rootName - root element name
-     * @return  none
+     * @return  void
      */
-    public function toXml(&$xml, $recursionLevel = 0, $addOpenTag = true, $rootName = 'Struct')
+    public function toXml(&$xml = null, $recursionLevel = 0, $addOpenTag = true, $rootName = 'Struct')
     {
         if ($recursionLevel == 0) {
             $xml = '';
@@ -374,7 +374,7 @@ public function toXml(&$xml, $recursionLevel = 0, $addOpenTag = true, $rootName
 
     /**
      * apply filters
-     * @return  none
+     * @return  void
      */
     protected function _renderFilters()
     {
@@ -440,9 +440,9 @@ protected function _renderFilters()
 
     /**
      * add filter
-     * @return  none
+     * @return $this
      */
-    public function addFilter($field, $value)
+    public function addFilter($field, $value, $type = 'and')
     {
         $filter = [];
         $filter['field']   = $field;
@@ -450,34 +450,7 @@ public function addFilter($field, $value)
         $this->_filters[] = $filter;
         $this->_isFiltersRendered = false;
         $this->walk('addFilter', [$field, $value]);
+
         return $this;
     }
 }
-
-/* Example */
-/*
- $a = new Varien_Directory_Collection('/usr/home/vasily/dev/magento/lib',false);
-
- $a->addFilter("extension","php");
-
- $a->useFilter(true);
-
- print "-----------------------\n";
- print_r($a->filesName());
-
- $a->setPath('/usr/home/vasily/dev/magento/lib/Varien/Image',true);
- $a->useFilter(true);
-
- print "-----------------------\n";
- print_r($a->filesName());
-
- print "-----------------------\n";
- $filesObj = $a->filesObj();
- print $filesObj[0]->fgets();
- print $filesObj[0]->fgets();
- print $filesObj[0]->fgets();
- print $filesObj[0]->fgets();
- print $filesObj[0]->fgets();
- print $filesObj[0]->fgets();
-
- */