Skip to content

Commit b385dbb

Browse files
fballianofballiano
authored
Merge branch '1.9.4.x' into fix-1189
2 parents 4836ae3 + 988e9ff commit b385dbb

File tree

243 files changed

+1047
-1615
lines changed

Some content is hidden

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

243 files changed

+1047
-1615
lines changed

‎.github/phpstan-baseline.neon

Lines changed: 4 additions & 425 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* Admin Block Helper
2323
*
24-
* @category Mage
25-
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Helper_Block
2929
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* Admin Data Helper
2323
*
24-
* @category Mage
25-
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Helper_Data extends Mage_Core_Helper_Abstract
2929
{

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,19 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* Admin Data Helper
2323
*
24-
* @category Mage
25-
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
28-
2928
class Mage_Admin_Helper_Rules_Fallback extends Mage_Core_Helper_Abstract
3029
{
3130
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* Admin Variable Helper
2323
*
24-
* @category Mage
25-
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Helper_Variable
2929
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,7 +23,7 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*
2828
* @property Mage_Admin_Model_Acl_Role_Registry $_roleRegistry
2929
*

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,7 +23,7 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface
2929
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,7 +23,7 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface
2929
{

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,9 +23,8 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Resource extends Zend_Acl_Resource
2929
{
30-
3130
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* User acl role
2323
*
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
27+
*
2428
* @method Mage_Admin_Model_Resource_Acl_Role _getResource()
2529
* @method Mage_Admin_Model_Resource_Acl_Role getResource()
2630
* @method int getParentId()
@@ -35,10 +39,6 @@
3539
* @method Mage_Admin_Model_Acl_Role setUserId(int $value)
3640
* @method string getRoleName()
3741
* @method Mage_Admin_Model_Acl_Role setRoleName(string $value)
38-
*
39-
* @category Mage
40-
* @package Mage_Admin
41-
* @author Magento Core Team <core@magentocommerce.com>
4242
*/
4343
class Mage_Admin_Model_Acl_Role extends Mage_Core_Model_Abstract
4444
{

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,9 +23,8 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Role_Generic extends Zend_Acl_Role
2929
{
30-
3130
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,9 +23,8 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Role_Group extends Mage_Admin_Model_Acl_Role_Generic
2929
{
30-
3130
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,7 +23,7 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Role_Registry extends Zend_Acl_Role_Registry
2929
{

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,9 +23,8 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Acl_Role_User extends Mage_Admin_Model_Acl_Role_Generic
2929
{
30-
3130
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
@@ -23,7 +23,7 @@
2323
*
2424
* @category Mage
2525
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
*/
2828
class Mage_Admin_Model_Config extends Varien_Simplexml_Config
2929
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* Resource model for admin ACL
2323
*
24-
* @category Mage
25-
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
* @deprecated
2828
*/
2929
class Mage_Admin_Model_Mysql4_Acl extends Mage_Admin_Model_Resource_Acl

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
* obtain it through the world-wide-web, please send an email
1313
* to license@magento.com so we can send you a copy immediately.
1414
*
15-
* @category Mage
16-
* @package Mage_Admin
15+
* @category Mage
16+
* @package Mage_Admin
1717
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

2121
/**
2222
* ACL role resource
2323
*
24-
* @category Mage
25-
* @package Mage_Admin
26-
* @author Magento Core Team <core@magentocommerce.com>
24+
* @category Mage
25+
* @package Mage_Admin
26+
* @author Magento Core Team <core@magentocommerce.com>
2727
* @deprecated
2828
*/
2929
class Mage_Admin_Model_Mysql4_Acl_Role extends Mage_Admin_Model_Resource_Acl_Role

0 commit comments

Comments
 (0)