Skip to content

Commit d13e5aa

Browse files
authored
1 parent 1cb837b commit d13e5aa

File tree

378 files changed

+2
-527
lines changed

Some content is hidden

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

378 files changed

+2
-527
lines changed

.php-cs-fixer.dist.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
'phpdoc_indent' => true,
2121
// Orders all @param annotations in DocBlocks according to method signature.
2222
'phpdoc_param_order' => true,
23+
// PHPDoc should start and end with content, excluding the very first and last line of the docblocks.
24+
'phpdoc_trim' => true,
2325
// Convert double quotes to single quotes for simple strings.
2426
'single_quote' => true,
2527
// Arguments lists, array destructuring lists, arrays that are multi-line, match-lines and parameters lists must have a trailing comma.

app/Mage.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ public static function getEdition()
249249

250250
/**
251251
* Set all my static data to defaults
252-
*
253252
*/
254253
public static function reset()
255254
{

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,26 @@ class Mage_Admin_Model_Acl extends Zend_Acl
2121
{
2222
/**
2323
* All the group roles are prepended by G
24-
*
2524
*/
2625
public const ROLE_TYPE_GROUP = 'G';
2726

2827
/**
2928
* All the user roles are prepended by U
30-
*
3129
*/
3230
public const ROLE_TYPE_USER = 'U';
3331

3432
/**
3533
* Permission level to deny access
36-
*
3734
*/
3835
public const RULE_PERM_DENY = 0;
3936

4037
/**
4138
* Permission level to inheric access from parent role
42-
*
4339
*/
4440
public const RULE_PERM_INHERIT = 1;
4541

4642
/**
4743
* Permission level to allow access
48-
*
4944
*/
5045
public const RULE_PERM_ALLOW = 2;
5146

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 @@ class Mage_Admin_Model_Resource_Acl extends Mage_Core_Model_Resource_Db_Abstract
1818

1919
/**
2020
* Initialize resource
21-
*
2221
*/
2322
protected function _construct()
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
@@ -16,7 +16,6 @@ class Mage_Admin_Model_Resource_Acl_Role_Collection extends Mage_Core_Model_Reso
1616
{
1717
/**
1818
* Initialize resource
19-
*
2019
*/
2120
protected function _construct()
2221
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resourc
1616
{
1717
/**
1818
* Define resource model
19-
*
2019
*/
2120
protected function _construct()
2221
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Mage_Admin_Model_Resource_Permissions_Collection extends Mage_Core_Model_R
1616
{
1717
/**
1818
* Initialize resource
19-
*
2019
*/
2120
protected function _construct()
2221
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Mage_Admin_Model_Resource_User_Collection extends Mage_Core_Model_Resource
1616
{
1717
/**
1818
* Define resource model
19-
*
2019
*/
2120
protected function _construct()
2221
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class Mage_Admin_Model_Resource_Variable_Collection extends Mage_Core_Model_Reso
1919
{
2020
/**
2121
* Define resource model
22-
*
2322
*/
2423
protected function _construct()
2524
{

app/code/core/Mage/AdminNotification/Model/Feed.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class Mage_AdminNotification_Model_Feed extends Mage_Core_Model_Abstract
3131

3232
/**
3333
* Init model
34-
*
3534
*/
3635
protected function _construct() {}
3736

0 commit comments

Comments
 (0)