Skip to content

Commit 2214b17

Browse files
kiatngkiatng
authored
Merge branch '1.9.4.x' into fix-1189
2 parents 567da9b + 0487e85 commit 2214b17

File tree

3,182 files changed

+6325
-18975
lines changed

Some content is hidden

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

3,182 files changed

+6325
-18975
lines changed

‎.github/phpstan-baseline.neon‎

Lines changed: 0 additions & 929 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 1 addition & 5 deletions

‎app/Mage.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,8 @@ public static function isInstalled($options = [])
828828
/**
829829
* log facility (??)
830830
*
831-
* @param string $message
832-
* @param integer $level
831+
* @param array|object|string $message
832+
* @param int $level
833833
* @param string $file
834834
* @param bool $forceLog
835835
*/

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ protected function _getParentResourceId($resourceId)
4141
return implode('/', $resourcePathInfo);
4242
}
4343

44-
4544
/**
4645
* Fallback resource permissions similarly to zend_acl
4746
* @param array $resources

‎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
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

21-
2221
/**
2322
* IP assertion for admin acl
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
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

21-
2221
/**
2322
* Assert time for admin acl
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
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

21-
2221
/**
2322
* 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
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

21-
2221
/**
2322
* User acl role
2423
*

‎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
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

21-
2221
/**
2322
* User 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
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020

21-
2221
/**
2322
* Acl Group model
2423
*

0 commit comments

Comments
 (0)