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

Small DocBlock update #4160

Merged
merged 14 commits into from
Sep 2, 2024
+15 −15
Merged

Small DocBlock update #4160

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d7eaf6
Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)
sreichel Jul 22, 2024
53ee2f8
Merge branch 'OpenMage:main' into main
sreichel Jul 24, 2024
89cc37c
Merge branch 'OpenMage:main' into main
sreichel Jul 24, 2024
e939180
Merge branch 'OpenMage:main' into main
sreichel Jul 31, 2024
35c91ef
Merge branch 'OpenMage:main' into main
sreichel Jul 31, 2024
a7fe45c
Merge branch 'OpenMage:main' into main
sreichel Aug 1, 2024
c7d6aeb
Merge branch 'OpenMage:main' into main
sreichel Aug 7, 2024
63108c1
Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)"
sreichel Aug 21, 2024
23c51bf
DocBlock update
sreichel Aug 21, 2024
8e23bd5
Update app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php
sreichel Aug 21, 2024
947543b
Update app/code/core/Mage/Core/Model/Session/Abstract.php
sreichel Aug 21, 2024
4209425
Update app/code/core/Mage/Core/Model/Session/Abstract.php
sreichel Aug 21, 2024
ae3bfd5
Merge branch 'main' into docsblocks-1
kiatng Aug 22, 2024
bd38b70
Merge branch 'main' into docsblocks-1
kiatng Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ protected function findInMapping($frontModule, $controllerName, $actionName)
/**
* Determine which version of docs should target onto
*
* @return string
* @return false|Varien_Simplexml_Element
sreichel marked this conversation as resolved.
Show resolved Hide resolved
*/
protected function getHelpTargetVersion()
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected function _hasAttributeOptionsAndSearchable($attribute)
* Retrieve SQL for search entities
*
* @param string $query
* @return string
* @return Varien_Db_Select
*/
protected function _getSearchEntityIdsSql($query)
{
Expand Down Expand Up @@ -168,7 +168,7 @@ protected function _getSearchEntityIdsSql($query)
* Retrieve SQL for search entities by option
*
* @param string $query
* @return false|string
* @return false|Varien_Db_Select
*/
protected function _getSearchInOptionSql($query)
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Core/Model/Session/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ public function getSessionHosts()
/**
* Retrieve session save method
*
* @return string
* @return string|Varien_Simplexml_Element
sreichel marked this conversation as resolved.
Show resolved Hide resolved
*/
public function getSessionSaveMethod()
{
Expand All @@ -537,7 +537,7 @@ public function getSessionSaveMethod()
/**
* Get session save path
*
* @return string
* @return string|Varien_Simplexml_Element
sreichel marked this conversation as resolved.
Show resolved Hide resolved
*/
public function getSessionSavePath()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function showStoreInfo()
* @deprecated after 1.4.0.0-rc1
*
* @param string $field
* @return string
* @return string|Zend_Db_Expr
*/
public function _getFieldTableAlias($field)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order extends Mage_Sa
/**
* Period format
*
* @var string
* @var Zend_Db_Expr
*/
protected $_periodFormat;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Mage_Sales_Model_Resource_Report_Order_Collection extends Mage_Sales_Model
/**
* Period format
*
* @var string
* @var Zend_Db_Expr
*/
protected $_periodFormat;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Mage_Sales_Model_Resource_Report_Refunded_Collection_Order extends Mage_Sa
/**
* Period format
*
* @var string
* @var Zend_Db_Expr
*/
protected $_periodFormat;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Mage_Sales_Model_Resource_Report_Shipping_Collection_Order extends Mage_Sa
/**
* Period format
*
* @var string
* @var Zend_Db_Expr
*/
protected $_periodFormat;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Mage_SalesRule_Model_Resource_Report_Collection extends Mage_Sales_Model_R
/**
* Period format for report (day, month, year)
*
* @var string
* @var Zend_Db_Expr
*/
protected $_periodFormat;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Tax/Model/Resource/Report/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class Mage_Tax_Model_Resource_Report_Collection extends Mage_Sales_Model_Resource_Report_Collection_Abstract
{
/**
* @var string
* @var Zend_Db_Expr
*/
protected $_periodFormat;

Expand Down
6 changes: 3 additions & 3 deletions lib/Varien/Db/Adapter/Pdo/Mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public function getTransactionLevel()
* Convert date to DB format
*
* @param int|string|Zend_Date $date
* @return string
* @return Zend_Db_Expr
*/
public function convertDate($date)
{
Expand All @@ -288,11 +288,11 @@ public function convertDate($date)
* Convert date and time to DB format
*
* @param int|string|Zend_Date $datetime
* @return string
* @return Zend_Db_Expr
*/
public function convertDateTime($datetime)
{
return $this->formatDate($datetime, true);
return $this->formatDate($datetime);
}

/**
Expand Down
Loading