Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
7b8522c
fix undefined method isAllowedForRuleCondition
yaroslav-zenin Oct 13, 2020
e130be7
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Oct 26, 2020
981cd29
add unit test
engcom-Charlie Oct 26, 2020
9d53776
Removed unnecessary spacing on backend grid
Bartlomiejsz Mar 29, 2021
ec91036
Cleaning up unused code.
tiagosampaio Jul 16, 2021
393f695
:bug: Rename variable
avoelkl Jul 20, 2021
41b6911
:wrench: Remove uneccessary variable
avoelkl Jul 20, 2021
c2f3b12
Merge branch '2.4-develop' into 2.4-develop-003
ihor-sviziev Aug 2, 2021
920c7dd
Merge branch 'magento:2.4-develop' into 2.4-develop
yaroslav-zenin Jan 6, 2022
729dfb0
Remove forbidden @author tag
fredden Mar 6, 2023
0059b1f
Fix static test failures
fredden Mar 7, 2023
779c5f6
Merge branch '2.4-develop' into no-author/backend
engcom-Lima May 22, 2023
32a5ef7
Merge branch '2.4-develop' into patch-1
engcom-Lima Jul 21, 2023
4f90f2e
Merge branch '2.4-develop' into bugfix/grid_selected_spacing
Bartlomiejsz Sep 20, 2023
6ad01a0
Merge branch '2.4-develop' into no-author/backend
engcom-Echo Sep 21, 2023
a1680e1
Fixed static test failure
abhattGlo Dec 18, 2023
39d3981
Merge branch '2.4-develop' into no-author/backend
engcom-Echo Dec 18, 2023
5443630
Merge branch '2.4-develop' into bugfix/grid_selected_spacing
engcom-Echo May 29, 2024
c55abab
Fixed static test failure
engcom-Echo May 30, 2024
a29c3ea
Merge branch '2.4-develop' into no-author/backend
engcom-Echo Jun 7, 2024
7557d3d
Fixed failing test
engcom-Echo Jun 10, 2024
1e1e4c1
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Jun 17, 2024
e3cd5ff
Fix for static test failure
Jun 18, 2024
00c7880
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Jun 18, 2024
9b860fc
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Jun 18, 2024
e0aa33d
Merge branch '2.4-develop' into patch-1
engcom-November Sep 9, 2024
63f0d7d
Merge branch '2.4-develop' into patch-1
engcom-Dash Sep 11, 2024
96a4af4
Merge branch '2.4-develop' into patch-1
engcom-November Sep 12, 2024
7116daf
Merge branch '2.4-develop' into 2.4-develop-003
engcom-Charlie Oct 28, 2024
a45a0f5
Fixed few static test failures
Nov 12, 2024
fd6cfa0
Merge branch '2.4-develop' into 2.4-develop-003
engcom-Charlie Nov 12, 2024
1a44b54
Merge branch '2.4-develop' into 2.4-develop-003
engcom-Charlie Nov 26, 2024
a227f92
Fixed static tests failures
engcom-Charlie Dec 2, 2024
a42d1eb
Merge branch '2.4-develop-003' of https://github.com/tiagosampaio/mag…
engcom-Charlie Dec 2, 2024
f83a270
Update CreateDefaultStock.php
engcom-Charlie Dec 6, 2024
8dbc15f
Update UpdateStockItemsWebsite.php, fixed static tests
engcom-Charlie Dec 6, 2024
316cee2
Update StockStatusCriteria.php, fixed static tests
engcom-Charlie Dec 6, 2024
3049fae
Merge branch '2.4-develop' into 2.4-develop-003
engcom-Charlie Dec 6, 2024
8012cb8
Update CreateDefaultStock.php, fixed static test
engcom-Charlie Dec 9, 2024
ef55b90
Merge remote-tracking branch 'upstream/2.4-develop' into no-author/ba…
fredden Jan 14, 2025
836a91b
Resolved Conflicts of coyrights
engcom-Dash May 29, 2025
c86d43d
Merge branch '2.4-develop' into 2.4-develop-003
engcom-Dash May 29, 2025
973f918
Merge branch '2.4-develop' into 2.4-develop
engcom-Dash Jun 10, 2025
6e0fa3f
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Aug 6, 2025
fca5b46
Merge branch '2.4-develop' into no-author/backend
engcom-Charlie Aug 6, 2025
d53e5ec
Merge branch '2.4-develop' into patch-1
engcom-Charlie Aug 6, 2025
e16dc35
Merge branch '2.4-develop' into bugfix/grid_selected_spacing
engcom-Charlie Aug 6, 2025
aa2743e
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Aug 7, 2025
52b154f
Merge branch '2.4-develop' into bugfix/grid_selected_spacing
engcom-Charlie Aug 7, 2025
64f19a6
Updated copyright
engcom-Charlie Aug 8, 2025
5cd6c95
Merge branch '2.4-develop' into 2.4-develop
engcom-Charlie Aug 8, 2025
b19adfc
Merge branch '2.4-develop' into patch-1
engcom-Charlie Aug 8, 2025
0437d95
Merge remote-tracking branch '32622/bugfix/grid_selected_spacing' int…
engcom-Charlie Aug 12, 2025
abb25e7
Merge remote-tracking branch '36976/no-author/backend' into Aug01-comprs
engcom-Charlie Aug 12, 2025
d879dd8
Merge branch '2.4-develop' into Aug01-comprs
Indraniks Aug 12, 2025
f3d02cf
Merge branch '2.4-develop' into Aug01-comprs
Indraniks Aug 19, 2025
5e3ef31
Merge remote-tracking branch '30479/2.4-develop' into Aug01-comprs
engcom-Charlie Aug 19, 2025
53c9d62
Merge remote-tracking branch '33533/patch-1' into Aug01-comprs
engcom-Charlie Aug 19, 2025
641332d
Merge remote-tracking branch '33499/2.4-develop-003' into Aug01-comprs
engcom-Charlie Aug 19, 2025
3026734
Merge pull request #10004 from magento-gl/Aug01-comprs
internal-magento-queue-manager[bot] Aug 19, 2025
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
10 changes: 8 additions & 2 deletions app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* Adminhtml dashboard tab abstract
*
* @author Magento Core Team <[email protected]>
*/
abstract class AbstractDashboard extends \Magento\Backend\Block\Widget
{
Expand Down Expand Up @@ -40,6 +38,8 @@ public function __construct(
}

/**
* Return a collection
*
* @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
*/
public function getCollection()
Expand All @@ -48,6 +48,8 @@ public function getCollection()
}

/**
* Return items count
*
* @return int
*/
public function getCount()
Expand All @@ -66,6 +68,8 @@ public function getDataHelper()
}

/**
* Prepare any data for display, if required
*
* @return $this
*/
protected function _prepareData()
Expand All @@ -74,6 +78,8 @@ protected function _prepareData()
}

/**
* Ensure data is prepared before layout
*
* @return $this
*/
protected function _prepareLayout()
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/Dashboard/Bar.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* Adminhtml dashboard bar block
*
* @author Magento Core Team <[email protected]>
*/
class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/Dashboard/Diagrams.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
* Adminhtml dashboard diagram tabs
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
* @see dashboard.diagrams in adminhtml_dashboard_index.xml
*
* @author Magento Core Team <[email protected]>
*/
class Diagrams extends \Magento\Backend\Block\Widget\Tabs
{
Expand Down
13 changes: 2 additions & 11 deletions app/code/Magento/Backend/Block/Dashboard/Graph.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,27 @@
* Adminhtml dashboard google chart block
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
* @see dashboard.chart.amounts and dashboard.chart.orders in adminhtml_dashboard_index.xml
*
* @author Magento Core Team <[email protected]>
*/
class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
{
const API_URL = 'https://image-charts.com/chart';
public const API_URL = 'https://image-charts.com/chart';

/**
* All series
*
* @var array
*/
protected $_allSeries = [];

/**
* Axis labels
*
* @var array
*/
protected $_axisLabels = [];

/**
* Axis maps
*
* @var array
*/
protected $_axisMaps = [];

/**
* Data rows
*
* @var array
*/
protected $_dataRows = [];
Expand Down Expand Up @@ -78,6 +68,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
* Google chart api data encoding
*
* @deprecated 101.0.2 since the Google Image Charts API not accessible from March 14, 2019
* @see Nothing
* @var string
*/
protected $_encoding = 'e';
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Backend/Block/Dashboard/Grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/**
* Adminhtml dashboard grid
*
* @author Magento Core Team <[email protected]>
* @api
* @since 100.0.2
*/
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Backend/Block/Dashboard/Grids.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* Adminhtml dashboard bottom tabs
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Grids extends Tabs
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Backend/Block/Dashboard/Sales.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* Adminhtml dashboard sales statistics bar
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Sales extends Bar
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
* Adminhtml dashboard order amounts diagram
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
* @see dashboard.chart.amounts in adminhtml_dashboard_index.xml
*
* @author Magento Core Team <[email protected]>
*/
class Amounts extends \Magento\Backend\Block\Dashboard\Graph
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
* Adminhtml dashboard orders diagram
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
* @see dashboard.chart.orders in adminhtml_dashboard_index.xml
*
* @author Magento Core Team <[email protected]>
*/
class Orders extends \Magento\Backend\Block\Dashboard\Graph
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/**
* Adminhtml dashboard most ordered products grid
*
* @author Magento Core Team <[email protected]>
* @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Ordered extends \Magento\Backend\Block\Dashboard\Grid
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Backend/Block/Page.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Adminhtml page
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Backend\Block;

Expand Down Expand Up @@ -62,6 +60,8 @@ public function getLang()
}

/**
* Returns true if we are running in single store mode
*
* @return bool
*/
public function isSingleStoreMode()
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Backend/Block/Page/Footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Adminhtml footer block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Footer extends \Magento\Backend\Block\Template
Expand Down
9 changes: 6 additions & 3 deletions app/code/Magento/Backend/Block/Page/Header.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* Adminhtml header block
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Header extends \Magento\Backend\Block\Template
Expand All @@ -21,8 +20,6 @@ class Header extends \Magento\Backend\Block\Template
protected $_template = 'Magento_Backend::page/header.phtml';

/**
* Backend data
*
* @var \Magento\Backend\Helper\Data
*/
protected $_backendData = null;
Expand Down Expand Up @@ -50,6 +47,8 @@ public function __construct(
}

/**
* Return URL to homepage
*
* @return string
*/
public function getHomeLink()
Expand All @@ -58,6 +57,8 @@ public function getHomeLink()
}

/**
* Return the current user
*
* @return \Magento\User\Model\User|null
*/
public function getUser()
Expand All @@ -66,6 +67,8 @@ public function getUser()
}

/**
* Return URL to log out from admin
*
* @return string
*/
public function getLogoutLink()
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/Page/Notices.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

/**
* Adminhtml header notices block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Backend\Block\Page;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,15 @@
* "Reset to Defaults" button renderer
*
* @deprecated 100.1.6
* @author Magento Core Team <[email protected]>
* @see Nothing
*/
class Reset extends \Magento\Config\Block\System\Config\Form\Field
{
/**
* Pasge robots default instructions
* Page robots default instructions
*/
const XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS = 'design/search_engine_robots/default_custom_instructions';

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
array $data = []
) {
parent::__construct($context, $data);
}
public const XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS =
'design/search_engine_robots/default_custom_instructions';

/**
* Set template
Expand Down
5 changes: 4 additions & 1 deletion app/code/Magento/Backend/Block/System/Account/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
* Adminhtml edit admin user account
*
* @api
* @author Magento Core Team <[email protected]>
* @since 100.0.2
*/
class Edit extends \Magento\Backend\Block\Widget\Form\Container
{
/**
* Initialise the page
*
* @return void
*/
protected function _construct()
Expand All @@ -29,6 +30,8 @@ protected function _construct()
}

/**
* Return a Phrase for the header text
*
* @return \Magento\Framework\Phrase
*/
public function getHeaderText()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

/**
* Adminhtml edit admin user account form
*
*/
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
Expand Down
12 changes: 9 additions & 3 deletions app/code/Magento/Backend/Block/System/Cache/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Cache management edit page
*
* @author Magento Core Team <[email protected]>
*/
class Edit extends \Magento\Backend\Block\Widget
{
Expand All @@ -18,6 +16,8 @@ class Edit extends \Magento\Backend\Block\Widget
protected $_template = 'Magento_Backend::system/cache/edit.phtml';

/**
* Set the page title
*
* @return void
*/
protected function _construct()
Expand All @@ -28,7 +28,7 @@ protected function _construct()
}

/**
* {@inheritdoc}
* @inheritDoc
*/
protected function _prepareLayout()
{
Expand All @@ -47,6 +47,8 @@ protected function _prepareLayout()
}

/**
* Return the HTML for the save button
*
* @return string
*/
public function getSaveButtonHtml()
Expand All @@ -55,6 +57,8 @@ public function getSaveButtonHtml()
}

/**
* Return the URL to save an item
*
* @return string
*/
public function getSaveUrl()
Expand All @@ -63,6 +67,8 @@ public function getSaveUrl()
}

/**
* Initialise the form
*
* @return $this
*/
public function initForm()
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/System/Cache/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Cache management form page
*
* @author Magento Core Team <[email protected]>
*/
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/System/Store/Delete.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* Store / store view / website delete form container
*
* @author Magento Core Team <[email protected]>
*/
class Delete extends \Magento\Backend\Block\Widget\Form\Container
{
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Backend/Block/System/Store/Delete/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

/**
* Adminhtml cms block edit form
*
* @author Magento Core Team <[email protected]>
*/
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@

/**
* Adminhtml store delete group block
*
* @author Magento Core Team <[email protected]>
*/
class Group extends \Magento\Backend\Block\Template
{
/**
* {@inheritdoc}
* @inheritDoc
*/
protected function _prepareLayout()
{
Expand Down
Loading