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 #2550

Merged
merged 24 commits into from
Sep 4, 2022
Merged

Fixed whitespace for docblocks #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 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
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/Helper/Rules/Fallback.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/Acl/Assert/Ip.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/Acl/Role/Generic.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/Acl/Role/Group.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/data/admin_setup/data-install-1.6.0.0.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: 2 additions & 3 deletions app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
* @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)
*/

$installer = $this;
/** @var Mage_Core_Model_Resource_Setup $installer */

$installer = $this;
$installer->startSetup();

/**
Expand Down
5 changes: 2 additions & 3 deletions app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
* @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)
*/

$installer = $this;
/** @var Mage_Core_Model_Resource_Setup $installer */

$installer = $this;
$installer->startSetup();

$installer->run("
Expand Down
5 changes: 2 additions & 3 deletions app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
* @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)
*/

$installer = $this;
/** @var Mage_Core_Model_Resource_Setup $installer */

$installer = $this;
$installer->startSetup();

$installer->getConnection()->addColumn($this->getTable('admin/user'), 'extra', 'TEXT NULL');
Expand Down
5 changes: 2 additions & 3 deletions app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
* @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)
*/

$installer = $this;
/** @var Mage_Core_Model_Resource_Setup $installer */

$installer = $this;
$installer->startSetup();

$tableAdmins = $installer->getTable('admin/user');
Expand Down
8 changes: 4 additions & 4 deletions app/code/core/Mage/AdminNotification/Model/Feed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
* 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
* @category Mage
* @package Mage_AdminNotification
* @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)
*/

/**
* AdminNotification Feed model
*
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_AdminNotification_Model_Feed extends Mage_Core_Model_Abstract
{
Expand Down
12 changes: 6 additions & 6 deletions app/code/core/Mage/AdminNotification/Model/Inbox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
* 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
* @category Mage
* @package Mage_AdminNotification
* @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)
*/

/**
* AdminNotification Inbox model
*
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_AdminNotification_Model_Resource_Inbox _getResource()
* @method Mage_AdminNotification_Model_Resource_Inbox getResource()
Expand Down
12 changes: 6 additions & 6 deletions app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
* 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
* @category Mage
* @package Mage_AdminNotification
* @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)
*/

/**
* AdminNotification Inbox model
*
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
* @deprecated
*/
class Mage_AdminNotification_Model_Mysql4_Inbox extends Mage_AdminNotification_Model_Resource_Inbox
Expand Down
12 changes: 6 additions & 6 deletions app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
* 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
* @category Mage
* @package Mage_AdminNotification
* @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)
*/

/**
* AdminNotification Inbox model
*
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_AdminNotification_Model_Resource_Inbox extends Mage_Core_Model_Resource_Db_Abstract
{
Expand Down
16 changes: 4 additions & 12 deletions app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,14 @@
* 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
* @category Mage
* @package Mage_AdminNotification
* @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)
*/

/**
* AdminNotification install
*
* @category Mage
* @package Mage_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
$installer = $this;
/** @var Mage_Core_Model_Resource_Setup $installer */

$installer = $this;
$installer->startSetup();
/**
* Create table 'adminnotification/inbox'
Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* 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
* @category Mage
* @package Mage_AdminNotification
* @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)
*/

$installer = $this;
/** @var Mage_Core_Model_Resource_Setup $installer */

$installer = $this;
$installer->startSetup();

$installer->run("
-- DROP TABLE IF EXISTS `{$installer->getTable('adminnotification_inbox')}`;
CREATE TABLE IF NOT EXISTS `{$installer->getTable('adminnotification_inbox')}` (
Expand Down
2 changes: 0 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@
*/
class Mage_Adminhtml_Block_Abstract extends Mage_Core_Block_Template
{

/**
* @return string
*/
protected function _getUrlModelClass()
{
return 'adminhtml/url';
}

}
10 changes: 8 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Api/Editroles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@
* @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)
*/

class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs {
/**
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs
{
public function __construct()
{
parent::__construct();
Expand Down
10 changes: 8 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Api/Edituser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@
* @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)
*/

class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs {
/**
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs
{
public function __construct()
{
parent::__construct();
Expand Down
4 changes: 1 addition & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/User/Edit.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 @@ -27,7 +27,6 @@
*/
class Mage_Adminhtml_Block_Api_User_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
{

public function __construct()
{
$this->_objectId = 'user_id';
Expand All @@ -51,5 +50,4 @@ public function getHeaderText()
return Mage::helper('adminhtml')->__('New User');
}
}

}
4 changes: 1 addition & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.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 @@ -27,13 +27,11 @@
*/
class Mage_Adminhtml_Block_Api_User_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
{

protected function _prepareForm()
{
$form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']);
$form->setUseContainer(true);
$this->setForm($form);
return parent::_prepareForm();
}

}
4 changes: 1 addition & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.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,10 +25,8 @@
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/

class Mage_Adminhtml_Block_Api_User_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form
{

protected function _prepareForm()
{
$model = Mage::registry('api_user');
Expand Down
4 changes: 1 addition & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/User/Grid.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 @@ -27,7 +27,6 @@
*/
class Mage_Adminhtml_Block_Api_User_Grid extends Mage_Adminhtml_Block_Widget_Grid
{

public function __construct()
{
parent::__construct();
Expand Down Expand Up @@ -96,5 +95,4 @@ public function getGridUrl()
//$uid = $this->getRequest()->getParam('user_id');
return $this->getUrl('*/*/roleGrid', []);
}

}
Loading