Skip to content

Commit 62c3715

Browse files
fballianofballiano
committed
Merge branch 'main' into next
2 parents 3775e0d + 4874e5c commit 62c3715

File tree

4,295 files changed

+69
-4328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,295 files changed

+69
-4328
lines changed

‎app/Mage.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949

5050
/**
5151
* Main Mage hub class
52-
*
53-
* @author Magento Core Team <[email protected]>
5452
*/
5553
final class Mage
5654
{

‎app/code/core/Mage/Admin/Helper/Block.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Helper_Block
2423
{

‎app/code/core/Mage/Admin/Helper/Data.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Helper_Data extends Mage_Core_Helper_Abstract
2423
{

‎app/code/core/Mage/Admin/Helper/Rules/Fallback.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Helper_Rules_Fallback extends Mage_Core_Helper_Abstract
2423
{

‎app/code/core/Mage/Admin/Helper/Variable.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*
1818
* @category Mage
1919
* @package Mage_Admin
20-
* @author Magento Core Team <[email protected]>
2120
*/
2221
class Mage_Admin_Helper_Variable
2322
{

‎app/code/core/Mage/Admin/Model/Acl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @property Mage_Admin_Model_Acl_Role_Registry $_roleRegistry
2423
*

‎app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface
2423
{

‎app/code/core/Mage/Admin/Model/Acl/Assert/Time.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface
2423
{

‎app/code/core/Mage/Admin/Model/Acl/Resource.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Resource extends Zend_Acl_Resource
2423
{

‎app/code/core/Mage/Admin/Model/Acl/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @method Mage_Admin_Model_Resource_Acl_Role _getResource()
2423
* @method Mage_Admin_Model_Resource_Acl_Role getResource()

‎app/code/core/Mage/Admin/Model/Acl/Role/Generic.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Role_Generic extends Zend_Acl_Role
2423
{

‎app/code/core/Mage/Admin/Model/Acl/Role/Group.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Role_Group extends Mage_Admin_Model_Acl_Role_Generic
2423
{

‎app/code/core/Mage/Admin/Model/Acl/Role/Registry.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Role_Registry extends Zend_Acl_Role_Registry
2423
{

‎app/code/core/Mage/Admin/Model/Acl/Role/User.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Acl_Role_User extends Mage_Admin_Model_Acl_Role_Generic
2423
{

‎app/code/core/Mage/Admin/Model/Block.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Adminhtml
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @method Mage_Admin_Model_Resource_Block _getResource()
2423
* @method Mage_Admin_Model_Resource_Block getResource()

‎app/code/core/Mage/Admin/Model/Config.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Config extends Varien_Simplexml_Config
2423
{

‎app/code/core/Mage/Admin/Model/Mysql4/Acl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Acl extends Mage_Admin_Model_Resource_Acl

‎app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Acl_Role extends Mage_Admin_Model_Resource_Acl_Role

‎app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Acl_Role_Collection extends Mage_Admin_Model_Resource_Acl_Role_Collection

‎app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Permissions_Collection extends Mage_Admin_Model_Resource_Permissions_Collection

‎app/code/core/Mage/Admin/Model/Mysql4/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Role extends Mage_Admin_Model_Resource_Role

‎app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Role_Collection extends Mage_Admin_Model_Resource_Role_Collection

‎app/code/core/Mage/Admin/Model/Mysql4/Roles.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Roles extends Mage_Admin_Model_Resource_Roles

‎app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Roles_Collection extends Mage_Admin_Model_Resource_Roles_Collection

‎app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Roles_User_Collection extends Mage_Admin_Model_Resource_Roles_User_Collection

‎app/code/core/Mage/Admin/Model/Mysql4/Rules.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Rules extends Mage_Admin_Model_Resource_Rules

‎app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_Rules_Collection extends Mage_Admin_Model_Resource_Rules_Collection

‎app/code/core/Mage/Admin/Model/Mysql4/User.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_User extends Mage_Admin_Model_Resource_User

‎app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
* @deprecated
2322
*/
2423
class Mage_Admin_Model_Mysql4_User_Collection extends Mage_Admin_Model_Resource_User_Collection

‎app/code/core/Mage/Admin/Model/Observer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Observer
2423
{

‎app/code/core/Mage/Admin/Model/Redirectpolicy.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Redirectpolicy
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Acl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Acl extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Acl/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* @deprecated
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Acl_Role extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Acl_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Block.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Adminhtml
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Block/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*
1818
* @category Mage
1919
* @package Mage_Adminhtml
20-
* @author Magento Core Team <[email protected]>
2120
*/
2221
class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
2322
{

‎app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Permissions_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Role extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Role/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @method Mage_Admin_Model_Role[] getItems()
2423
*/

‎app/code/core/Mage/Admin/Model/Resource/Roles.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Roles_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Rules.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Rules extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @method Mage_Admin_Model_Rules[] getItems()
2423
*/

‎app/code/core/Mage/Admin/Model/Resource/User.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/User/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Variable.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*/
2322
class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract
2423
{

‎app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @method Mage_Admin_Model_Variable getItemById(int $value)
2423
* @method Mage_Admin_Model_Variable[] getItems()

‎app/code/core/Mage/Admin/Model/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*
1919
* @category Mage
2020
* @package Mage_Admin
21-
* @author Magento Core Team <[email protected]>
2221
*
2322
* @method Mage_Admin_Model_Resource_Role _getResource()
2423
* @method Mage_Admin_Model_Resource_Role getResource()

0 commit comments

Comments
 (0)