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

Jump to bottom

PHP 7.2 fixes (method signature) #450

Merged
merged 2 commits into from Mar 9, 2018
Merged

PHP 7.2 fixes (method signature) #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93c3b6e
added parameters to getAllOptions method in classes that extend Mage_…
Feb 9, 2018
da2afdb
added phpdoc params to getAllOptions methods indicating arguments hav…
Feb 12, 2018
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
9 changes: 8 additions & 1 deletion app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@
*/
class Mage_Customer_Model_Customer_Attribute_Source_Group extends Mage_Eav_Model_Entity_Attribute_Source_Table
{
public function getAllOptions()
/**
* Retrieve Full Option values array
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if (!$this->_options) {
$this->_options = Mage::getResourceModel('customer/group_collection')
Expand Down
9 changes: 8 additions & 1 deletion app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@
*/
class Mage_Customer_Model_Customer_Attribute_Source_Store extends Mage_Eav_Model_Entity_Attribute_Source_Table
{
public function getAllOptions()
/**
* Retrieve Full Option values array
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if (!$this->_options) {
$collection = Mage::getResourceModel('core/store_collection');
Expand Down
9 changes: 8 additions & 1 deletion app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@
*/
class Mage_Customer_Model_Customer_Attribute_Source_Website extends Mage_Eav_Model_Entity_Attribute_Source_Table
{
public function getAllOptions()
/**
* Retrieve Full Option values array
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if (!$this->_options) {
$this->_options = Mage::getSingleton('adminhtml/system_store')->getWebsiteValuesForForm(true, true);
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ public function __construct(array $args = array())
/**
* Retrieve all options
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions()
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if (!$this->_options) {
$this->_options = $this->_factory->getResourceModel('directory/country_collection')
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ class Mage_Customer_Model_Resource_Address_Attribute_Source_Country extends Mage
/**
* Retreive all options
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions()
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if (!$this->_options) {
$this->_options = Mage::getResourceModel('directory/country_collection')
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ class Mage_Customer_Model_Resource_Address_Attribute_Source_Region extends Mage_
/**
* Retreive all region options
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions()
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if (!$this->_options) {
$this->_options = Mage::getResourceModel('directory/region_collection')->load()->toOptionArray();
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ class Mage_Eav_Model_Entity_Attribute_Source_Store extends Mage_Eav_Model_Entity
/**
* Retrieve Full Option values array
*
* @param bool $withEmpty Argument has no effect, included for PHP 7.2 method signature compatibility
* @param bool $defaultValues Argument has no effect, included for PHP 7.2 method signature compatibility
* @return array
*/
public function getAllOptions()
public function getAllOptions($withEmpty = true, $defaultValues = false)
{
if ($this->_options === null) {
$this->_options = Mage::getResourceModel('core/store_collection')->load()->toOptionArray();
Expand Down