Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed whitespace for docblocks #2558

Merged
merged 45 commits into from
Sep 5, 2022
Merged

Fixed whitespace for docblocks #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
37eeb14
Fixed whitespace for docblocks
fballiano Aug 31, 2022
e66c48d
Fixed whitespace for docblocks
fballiano Aug 31, 2022
ed1f388
Fixed whitespace for docblocks
fballiano Aug 31, 2022
b7d9ffb
Merge branch 'whitespace_docblock_r_z' of github.com:fballiano/magent…
fballiano Aug 31, 2022
cc0ef59
Fixed whitespace for docblocks
fballiano Sep 1, 2022
1944f9f
Fixed whitespace for docblocks
fballiano Sep 1, 2022
e201aa0
Merge branch '1.9.4.x' into whitespace_docblock_r_z
fballiano Sep 1, 2022
c3a629f
Merge branch 'OpenMage:1.9.4.x' into whitespace_docblock_r_z
fballiano Sep 2, 2022
7f584c5
Fixed whitespace for docblocks
fballiano Sep 2, 2022
231d401
Fixed whitespace for docblocks
fballiano Sep 2, 2022
b89ad97
Fixed whitespace for docblocks
fballiano Sep 2, 2022
5550bfd
Fixed whitespace for docblocks
fballiano Sep 2, 2022
fe60a07
Fixed whitespace for docblocks
fballiano Sep 2, 2022
21b493b
Fixed whitespace for docblocks
fballiano Sep 2, 2022
ac4a6e6
Merge branch 'whitespace_docblock_r_z' of github.com:fballiano/magent…
fballiano Sep 2, 2022
cec62d4
Fixed whitespace for docblocks
fballiano Sep 2, 2022
3f6d945
Fixed whitespace for docblocks
fballiano Sep 2, 2022
ded5bd3
Fixed whitespace for docblocks
fballiano Sep 2, 2022
c5c7175
Fixed whitespace for docblocks
fballiano Sep 2, 2022
82d42bc
Fixed whitespace for docblocks
fballiano Sep 2, 2022
00dfbc6
Fixed whitespace for docblocks
fballiano Sep 3, 2022
0cd5150
Fixed whitespace for docblocks
fballiano Sep 3, 2022
d525d9a
Fixed whitespace for docblocks
fballiano Sep 3, 2022
e5997dd
Fixed whitespace for docblocks
fballiano Sep 3, 2022
153054c
Fixed whitespace for docblocks
fballiano Sep 5, 2022
a2d7f20
Fixed whitespace for docblocks
fballiano Sep 5, 2022
022b315
Fixed whitespace for docblocks
fballiano Sep 5, 2022
f2ffa00
Fixed whitespace for docblocks
fballiano Sep 5, 2022
2ee5417
Fixed whitespace for docblocks
fballiano Sep 5, 2022
b315a82
Fixed whitespace for docblocks
fballiano Sep 5, 2022
c3bdf20
Merge branch 'whitespace_docblock_r_z' of github.com:fballiano/magent…
fballiano Sep 5, 2022
43df76a
Fixed whitespace for docblocks
fballiano Sep 5, 2022
0874388
Fixed whitespace for docblocks
fballiano Sep 5, 2022
d8cac0b
Fixed whitespace for docblocks
fballiano Sep 5, 2022
7fae194
Fixed whitespace for docblocks
fballiano Sep 5, 2022
a77465a
Fixed whitespace for docblocks
fballiano Sep 5, 2022
dd9bbf4
Fixed whitespace for docblocks
fballiano Sep 5, 2022
4b274b2
Fixed whitespace for docblocks
fballiano Sep 5, 2022
32c595c
Fixed whitespace for docblocks
fballiano Sep 5, 2022
1b50139
Merge remote-tracking branch 'origin/whitespace_docblock_r_z' into wh…
fballiano Sep 5, 2022
2dadef7
Fixed whitespace for docblocks
fballiano Sep 5, 2022
6f2ba12
Fixed whitespace for docblocks
fballiano Sep 5, 2022
ed66755
Fixed whitespace for docblocks
fballiano Sep 5, 2022
4bc5055
Fixed whitespace for docblocks
fballiano Sep 5, 2022
ba0446d
Fixed whitespace for docblocks
fballiano Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Resource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
6 changes: 1 addition & 5 deletions app/code/core/Mage/Admin/Model/Acl/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand All @@ -42,10 +42,6 @@
*/
class Mage_Admin_Model_Acl_Role extends Mage_Core_Model_Abstract
{
/**
* Initialize resource model
*
*/
protected function _construct()
{
$this->_init('admin/acl_role');
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Registry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Roles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Redirectpolicy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
6 changes: 1 addition & 5 deletions app/code/core/Mage/Admin/Model/Resource/Acl/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand All @@ -28,10 +28,6 @@
*/
class Mage_Admin_Model_Resource_Acl_Role extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Define main table
*
*/
protected function _construct()
{
$this->_init('admin/role', 'role_id');
Expand Down
6 changes: 1 addition & 5 deletions app/code/core/Mage/Admin/Model/Resource/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand All @@ -27,10 +27,6 @@
*/
class Mage_Admin_Model_Resource_Role extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Define main table
*
*/
protected function _construct()
{
$this->_init('admin/role', 'role_id');
Expand Down
4 changes: 0 additions & 4 deletions app/code/core/Mage/Admin/Model/Resource/Role/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
*/
class Mage_Admin_Model_Resource_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
/**
* Initialize resource model
*
*/
protected function _construct()
{
$this->_init('admin/role');
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
6 changes: 0 additions & 6 deletions app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,12 @@
*/
class Mage_Admin_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
/**
* Initialize resource model
*
*/
protected function _construct()
{
$this->_init('admin/role');
}

/**
* Init select
*
* @return $this
*/
protected function _initSelect()
Expand Down
6 changes: 0 additions & 6 deletions app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,12 @@
*/
class Mage_Admin_Model_Resource_Roles_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
/**
* Initialize resource model
*
*/
protected function _construct()
{
$this->_init('admin/user');
}

/**
* Initialize select
*
* @return $this
*/
protected function _initSelect()
Expand Down
6 changes: 1 addition & 5 deletions app/code/core/Mage/Admin/Model/Resource/Rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand All @@ -27,10 +27,6 @@
*/
class Mage_Admin_Model_Resource_Rules extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Define main table
*
*/
protected function _construct()
{
$this->_init('admin/rule', 'rule_id');
Expand Down
4 changes: 0 additions & 4 deletions app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
*/
class Mage_Admin_Model_Resource_Rules_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
/**
* Initialize resource model
*
*/
protected function _construct()
{
$this->_init('admin/rules');
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
5 changes: 1 addition & 4 deletions app/code/core/Mage/Admin/Model/Roles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down Expand Up @@ -51,9 +51,6 @@ class Mage_Admin_Model_Roles extends Mage_Core_Model_Abstract
*/
protected $_eventPrefix = 'admin_roles';

/**
* Constructor
*/
protected function _construct()
{
$this->_init('admin/roles');
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE_AFL.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0)
*/
-->
<config>
Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/AdminNotification/etc/adminhtml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE_AFL.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* @category Mage
* @package Mage_AdminNotification
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* @category Mage
* @package Mage_AdminNotification
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0)
*/
-->
<config>
Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/AdminNotification/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE_AFL.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* https://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* @category Mage
* @package Mage_AdminNotification
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* @category Mage
* @package Mage_AdminNotification
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0)
*/
-->
<config>
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Adminhtml
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
5 changes: 1 addition & 4 deletions app/code/core/Mage/Adminhtml/Block/Api/Role.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Adminhtml
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand All @@ -25,16 +25,13 @@
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/

class Mage_Adminhtml_Block_Api_Role extends Mage_Adminhtml_Block_Widget_Grid_Container
{

public function __construct()
{
$this->_controller = 'api_role';
$this->_headerText = Mage::helper('adminhtml')->__('Roles');
$this->_addButtonLabel = Mage::helper('adminhtml')->__('Add New Role');
parent::__construct();
}

}
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Api/Roles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Mage
* @package Mage_Adminhtml
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down
7 changes: 4 additions & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
* @category Mage
* @package Mage_Adminhtml
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* implementing now
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Adminhtml_Block_Api_Tab_Roleinfo extends Mage_Adminhtml_Block_Widget_Form
{
Expand Down
7 changes: 6 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@
* @category Mage
* @package Mage_Adminhtml
* @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Adminhtml_Block_Api_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form {

public function __construct() {
Expand Down
Loading