Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
@fballiano
fballiano committed Apr 18, 2023
2 parents 3775e0d + 4874e5c commit 62c3715
Show file tree
Hide file tree
Showing 4,295 changed files with 69 additions and 4,328 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 0 additions & 2 deletions app/Mage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@

/**
* Main Mage hub class
*
* @author Magento Core Team <core@magentocommerce.com>
*/
final class Mage
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Helper/Block.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Helper_Block
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Helper_Data extends Mage_Core_Helper_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Helper/Rules/Fallback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Helper_Rules_Fallback extends Mage_Core_Helper_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Helper/Variable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Helper_Variable
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @property Mage_Admin_Model_Acl_Role_Registry $_roleRegistry
*
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Resource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Resource extends Zend_Acl_Resource
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Resource_Acl_Role _getResource()
* @method Mage_Admin_Model_Resource_Acl_Role getResource()
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Generic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Role_Generic extends Zend_Acl_Role
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Group.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Role_Group extends Mage_Admin_Model_Acl_Role_Generic
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Role_Registry extends Zend_Acl_Role_Registry
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Acl_Role_User extends Mage_Admin_Model_Acl_Role_Generic
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Block.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Resource_Block _getResource()
* @method Mage_Admin_Model_Resource_Block getResource()
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Config extends Varien_Simplexml_Config
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Acl extends Mage_Admin_Model_Resource_Acl
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Acl_Role extends Mage_Admin_Model_Resource_Acl_Role
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Acl_Role_Collection extends Mage_Admin_Model_Resource_Acl_Role_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Permissions_Collection extends Mage_Admin_Model_Resource_Permissions_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Role extends Mage_Admin_Model_Resource_Role
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Role_Collection extends Mage_Admin_Model_Resource_Role_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Roles extends Mage_Admin_Model_Resource_Roles
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Roles_Collection extends Mage_Admin_Model_Resource_Roles_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Roles_User_Collection extends Mage_Admin_Model_Resource_Roles_User_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Rules extends Mage_Admin_Model_Resource_Rules
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_Rules_Collection extends Mage_Admin_Model_Resource_Rules_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_User extends Mage_Admin_Model_Resource_User
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_Admin_Model_Mysql4_User_Collection extends Mage_Admin_Model_Resource_User_Collection
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Observer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Observer
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Redirectpolicy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Redirectpolicy
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Acl extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
* @deprecated
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Acl_Role extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Acl_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Block.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Permissions_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Role extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Role[] getItems()
*/
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Roles_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Rules extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Rules[] getItems()
*/
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Variable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Variable getItemById(int $value)
* @method Mage_Admin_Model_Variable[] getItems()
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Resource_Role _getResource()
* @method Mage_Admin_Model_Resource_Role getResource()
Expand Down
Loading

0 comments on commit 62c3715

Please sign in to comment.