Skip to content

Fix wrong type for group #40181

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

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
+9 −7
Open

Fix wrong type for group #40181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions app/code/Magento/Store/Model/Website.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert irrelevant changes.

Also, declaring strict types does not make sense without adding actual type declarations, please remove this as well.


namespace Magento\Store\Model;

use Magento\Config\Model\ResourceModel\Config\Data;
Expand Down Expand Up @@ -72,7 +74,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
/**
* Website Group Collection array
*
* @var \Magento\Store\Model\Store[]
* @var \Magento\Store\Model\Group[]
*/
protected $_groups;

Expand Down Expand Up @@ -121,7 +123,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
/**
* Website default group
*
* @var \Magento\Store\Model\Store
* @var \Magento\Store\Model\Group
*/
protected $_defaultGroup;

Expand Down Expand Up @@ -316,7 +318,7 @@ protected function _loadGroups()
/**
* Set website groups
*
* @param array $groups
* @param \Magento\Store\Model\Group[] $groups
* @return $this
*/
public function setGroups($groups)
Expand Down Expand Up @@ -348,7 +350,7 @@ public function getGroupCollection()
/**
* Retrieve website groups
*
* @return \Magento\Store\Model\Store[]
* @return \Magento\Store\Model\Group[]
*/
public function getGroups()
{
Expand Down Expand Up @@ -387,7 +389,7 @@ public function getGroupsCount()
/**
* Retrieve default group model
*
* @return \Magento\Store\Model\Store
* @return \Magento\Store\Model\Group
*/
public function getDefaultGroup()
{
Expand Down