Skip to content

Commit

Permalink
Fixed whitespace for docblocks (#2562)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fballiano
fballiano authored Sep 7, 2022
1 parent 2fe3145 commit 32d1591
Show file tree
Hide file tree
Showing 1,231 changed files with 4,062 additions and 4,665 deletions.
3 changes: 0 additions & 3 deletions app/code/core/Mage/Admin/Helper/Block.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ class Mage_Admin_Helper_Block
*/
protected $_allowedTypes;

/**
* Construct
*/
public function __construct()
{
$this->_allowedTypes = Mage::getResourceModel('admin/block')->getAllowedTypes();
Expand Down
5 changes: 1 addition & 4 deletions app/code/core/Mage/Admin/Helper/Variable.php
View file
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 @@ -34,9 +34,6 @@ class Mage_Admin_Helper_Variable
*/
protected $_allowedPaths;

/**
* Construct
*/
public function __construct()
{
$this->_allowedPaths = Mage::getResourceModel('admin/variable')->getAllowedPaths();
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
View file
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/User.php
View file
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/User.php
View file
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
3 changes: 0 additions & 3 deletions app/code/core/Mage/Admin/Model/Resource/Block.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstra
*/
protected $disallowedBlockNames = ['install/end'];

/**
* Define main table
*/
protected function _construct()
{
$this->_init('admin/permission_block', 'block_id');
Expand Down
4 changes: 0 additions & 4 deletions app/code/core/Mage/Admin/Model/Resource/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ class Mage_Admin_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstra
*/
protected $_ruleTable;

/**
* Define main table
*
*/
protected function _construct()
{
$this->_init('admin/role', 'role_id');
Expand Down
8 changes: 1 addition & 7 deletions app/code/core/Mage/Admin/Model/Resource/User.php
View file
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,18 +27,12 @@
*/
class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Define main table
*
*/
protected function _construct()
{
$this->_init('admin/user', 'user_id');
}

/**
* Initialize unique fields
*
* @return $this
*/
protected function _initUniqueFields()
Expand Down
11 changes: 1 addition & 10 deletions app/code/core/Mage/Admin/Model/Resource/Variable.php
View file
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,22 +27,13 @@
*/
class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Cache id
*/
const CACHE_ID = 'permission_variable';

/**
* Define main table
*/
protected function _construct()
{
$this->_init('admin/permission_variable', 'variable_id');
}

/**
* Regenerate cache
*/
protected function _generateCache()
{
/** @var Mage_Admin_Model_Resource_Variable_Collection $collection */
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/User.php
View file
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: 5 additions & 1 deletion app/code/core/Mage/Admin/Model/Variable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
* @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)
*/

/**
* Class Mage_Admin_Model_Variable
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Admin_Model_Resource_Variable _getResource()
* @method Mage_Admin_Model_Resource_Variable getResource()
* @method Mage_Admin_Model_Resource_Variable_Collection getCollection()
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @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)
* @license https://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/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php
View file
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)
*/

/** @var Mage_Core_Model_Resource_Setup $installer */
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php
View file
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)
*/

/** @var Mage_Core_Model_Resource_Setup $installer */
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php
View file
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)
*/

/** @var Mage_Core_Model_Resource_Setup $installer */
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php
View file
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)
*/

/** @var Mage_Core_Model_Resource_Setup $installer */
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/AdminNotification/etc/adminhtml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @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)
* @license https://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/AdminNotification/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @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)
* @license https://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/system.xml
View file
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 https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0)
*/
-->
<config>
Expand Down
5 changes: 1 addition & 4 deletions app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
View file
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 @@ -29,9 +29,6 @@
*/
class Mage_Adminhtml_Block_Api_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid
{
/**
* Mage_Adminhtml_Block_Api_Role_Grid_User constructor.
*/
public function __construct()
{
parent::__construct();
Expand Down
10 changes: 7 additions & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +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)
*/

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

public function __construct()
{
parent::__construct();
Expand All @@ -39,5 +44,4 @@ public function __construct()
->assign('roles', $roles)
->assign('user_roles', $user_roles);
}

}
3 changes: 1 addition & 2 deletions app/code/core/Mage/Adminhtml/Block/Api/User.php
View file
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 extends Mage_Adminhtml_Block_Widget_Grid_Container
{

public function __construct()
{
$this->_controller = 'api_user';
Expand Down
6 changes: 3 additions & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
/**
* Class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*
* @method Mage_Api_Model_Resource_Role_Collection getCollection()
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php
View file
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
4 changes: 1 addition & 3 deletions app/code/core/Mage/Adminhtml/Block/Api/Users.php
View file
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_Users extends Mage_Adminhtml_Block_Template
{

public function __construct()
{
parent::__construct();
Expand All @@ -43,6 +42,5 @@ public function getGridHtml()
{
return $this->getLayout()->createBlock('adminhtml/api_grid_user')->toHtml();
}

}

4 changes: 3 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +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)
*/

/**
* Categories tree with checkboxes
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree extends Mage_Adminhtml_Block_Catalog_Category_Tree
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php
View file
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
3 changes: 1 addition & 2 deletions app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
View file
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_Catalog_Category_Tree extends Mage_Adminhtml_Block_Catalog_Category_Abstract
{

protected $_withProductCount;

public function __construct()
Expand Down
Loading

0 comments on commit 32d1591

Please sign in to comment.