Skip to content

Commit ac6af9a

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into AC-12593-2
2 parents 962500d + edcd0dc commit ac6af9a

File tree

161 files changed

+7602
-434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+7602
-434
lines changed

Diff for: ‎app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Fram
3333
{
3434
$config->addData([
3535
'tinymce' => [
36-
'toolbar' => 'formatselect | bold italic underline | alignleft aligncenter alignright | '
36+
'toolbar' => ' blocks | formatselect | bold italic underline | alignleft aligncenter alignright | '
3737
. 'bullist numlist | link table charmap',
3838
'plugins' => implode(
3939
' ',

Diff for: ‎app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
<data key="path">cms/wysiwyg/editor</data>
2323
<data key="scope_id">0</data>
2424
<data key="label">Yes</data>
25-
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</data>
25+
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</data>
2626
</entity>
2727
</entities>

Diff for: ‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="UploadImageNew" type="file" selector="#upload_image"/>
2424
<element name="UploadImageSelector" type="file" selector="#fileUploader"/>
2525
<element name="UploadImageWithUploaderId" type="file" selector="#fileUploader + .uppy-Root .uppy-Dashboard-input"/>
26-
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[title='Save']"/>
26+
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[aria-label='Save']"/>
2727
<element name="insertBtn" type="button" selector="#insert"/>
2828
<element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
2929
<element name="CreateFolder" type="button" selector="#new_folder" timeout="30"/>

Diff for: ‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/TinyMCESection.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
1717
<element name="InsertVariableIcon" type="button" selector="button[aria-label='Insert Variable']"/>
1818
<element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
19-
<element name="InsertImageIcon" type="button" selector="button[title='Insert/edit image']" timeout="30"/>
20-
<element name="Style" type="button" selector="button[title='Blocks']"/>
21-
<element name="Bold" type="button" selector="button[title='Bold']"/>
22-
<element name="Italic" type="button" selector="button[title='Italic']"/>
23-
<element name="Underline" type="button" selector="button[title='Underline']"/>
24-
<element name="AlignLeft" type="button" selector="button[title='Align left']"/>
25-
<element name="AlignCenter" type="button" selector="button[title='Align center']"/>
26-
<element name="AlignRight" type="button" selector="button[title='Align right']"/>
27-
<element name="Bullet" type="button" selector="div[title='Bullet list']"/>
28-
<element name="Numlist" type="button" selector="div[title='Numbered list']"/>
29-
<element name="InsertLink" type="button" selector="button[title='Insert/edit link']"/>
30-
<element name="InsertTable" type="button" selector="button[title='Table']"/>
31-
<element name="SpecialCharacter" type="button" selector="button[title='Special character']"/>
19+
<element name="InsertImageIcon" type="button" selector="button[aria-label='Insert/edit image']" timeout="30"/>
20+
<element name="Style" type="button" selector="button[aria-label='Block Paragraph']"/>
21+
<element name="Bold" type="button" selector="button[aria-label='Bold']"/>
22+
<element name="Italic" type="button" selector="button[aria-label='Italic']"/>
23+
<element name="Underline" type="button" selector="button[aria-label='Underline']"/>
24+
<element name="AlignLeft" type="button" selector="button[aria-label='Align left']"/>
25+
<element name="AlignCenter" type="button" selector="button[aria-label='Align center']"/>
26+
<element name="AlignRight" type="button" selector="button[aria-label='Align right']"/>
27+
<element name="Bullet" type="button" selector="div[aria-label='Bullet list']"/>
28+
<element name="Numlist" type="button" selector="div[aria-label='Numbered list']"/>
29+
<element name="InsertLink" type="button" selector="button[aria-label='Insert/edit link']"/>
30+
<element name="InsertTable" type="button" selector="button[aria-label='Table']"/>
31+
<element name="SpecialCharacter" type="button" selector="button[aria-label='Special character']"/>
3232
<element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
3333
<element name="EditorContent" type="input" selector="#tinymce"/>
3434
<element name="Content" type="textarea" selector="textarea"/>

Diff for: ‎app/code/Magento/Cms/etc/adminhtml/di.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<arguments>
3838
<argument name="adapterOptions" xsi:type="array">
3939
<item name="tinymce" xsi:type="array">
40-
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</item>
41-
<item name="label" xsi:type="string" translatable="true">TinyMCE 5</item>
40+
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</item>
41+
<item name="label" xsi:type="string" translatable="true">TinyMCE 7</item>
4242
</item>
4343
</argument>
4444
</arguments>

Diff for: ‎app/code/Magento/Cms/etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<cms>
2424
<wysiwyg>
2525
<enabled>enabled</enabled>
26-
<editor>mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</editor>
26+
<editor>mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</editor>
2727
<force_valid>0</force_valid>
2828
</wysiwyg>
2929
</cms>

Diff for: ‎app/code/Magento/Developer/Model/Logger/Handler/Debug.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Magento\Framework\Exception\RuntimeException;
1616
use Magento\Framework\Filesystem\DriverInterface;
1717
use Magento\Framework\Logger\Handler\Debug as DebugHandler;
18+
use Monolog\LogRecord;
1819

1920
/**
2021
* Enable/disable debug logging based on the store config setting
@@ -53,7 +54,7 @@ public function __construct(
5354
/**
5455
* @inheritdoc
5556
*/
56-
public function isHandling(array $record): bool
57+
public function isHandling(LogRecord $record): bool
5758
{
5859
if ($this->deploymentConfig->isAvailable()) {
5960
return parent::isHandling($record) && $this->isLoggingEnabled();

Diff for: ‎app/code/Magento/Developer/Model/Logger/Handler/Syslog.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\Config\Setup\ConfigOptionsList;
1111
use Magento\Framework\App\Config\ScopeConfigInterface;
1212
use Magento\Framework\App\DeploymentConfig;
13+
use Monolog\LogRecord;
1314

1415
/**
1516
* Enable/disable syslog logging based on the deployment config setting.
@@ -22,8 +23,6 @@ class Syslog extends \Magento\Framework\Logger\Handler\Syslog
2223
public const CONFIG_PATH = 'dev/syslog/syslog_logging';
2324

2425
/**
25-
* Deployment config.
26-
*
2726
* @var DeploymentConfig
2827
*/
2928
private $deploymentConfig;
@@ -43,7 +42,7 @@ public function __construct(
4342
/**
4443
* @inheritdoc
4544
*/
46-
public function isHandling(array $record): bool
45+
public function isHandling(LogRecord $record): bool
4746
{
4847
return parent::isHandling($record)
4948
&& $this->deploymentConfig->isDbAvailable()

Diff for: ‎app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php

+31-12
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
55
*/
66
namespace Magento\Developer\Test\Unit\Model\Logger\Handler;
77

8+
use Magento\Config\Setup\ConfigOptionsList;
89
use Magento\Developer\Model\Logger\Handler\Debug;
910
use Magento\Framework\App\Config\ScopeConfigInterface;
1011
use Magento\Framework\App\DeploymentConfig;
1112
use Magento\Framework\App\State;
1213
use Magento\Framework\Filesystem\DriverInterface;
1314
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1415
use Monolog\Formatter\FormatterInterface;
16+
use Monolog\Level;
1517
use Monolog\Logger;
18+
use Monolog\LogRecord;
1619
use PHPUnit\Framework\MockObject\MockObject;
1720
use PHPUnit\Framework\TestCase;
1821

@@ -51,6 +54,11 @@ class DebugTest extends TestCase
5154
*/
5255
private $deploymentConfigMock;
5356

57+
/**
58+
* @var LogRecord
59+
*/
60+
private $logRecord;
61+
5462
/**
5563
* @inheritdoc
5664
*/
@@ -81,6 +89,13 @@ protected function setUp(): void
8189
'deploymentConfig' => $this->deploymentConfigMock
8290
]);
8391
$this->model->setFormatter($this->formatterMock);
92+
93+
$this->logRecord = new LogRecord(
94+
new \DateTimeImmutable(),
95+
'testChannel',
96+
Level::Debug,
97+
'testMessage'
98+
);
8499
}
85100

86101
/**
@@ -99,7 +114,7 @@ public function testHandleEnabledInDeveloperMode()
99114
->expects($this->never())
100115
->method('getValue');
101116

102-
$this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
117+
$this->assertTrue($this->model->isHandling($this->logRecord));
103118
}
104119

105120
/**
@@ -118,7 +133,7 @@ public function testHandleEnabledInDefaultMode()
118133
->expects($this->never())
119134
->method('getValue');
120135

121-
$this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
136+
$this->assertTrue($this->model->isHandling($this->logRecord));
122137
}
123138

124139
/**
@@ -137,7 +152,7 @@ public function testHandleDisabledByProduction()
137152
->expects($this->never())
138153
->method('getValue');
139154

140-
$this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
155+
$this->assertFalse($this->model->isHandling($this->logRecord));
141156
}
142157

143158
/**
@@ -148,15 +163,19 @@ public function testHandleDisabledByLevel()
148163
$this->deploymentConfigMock->expects($this->once())
149164
->method('isAvailable')
150165
->willReturn(true);
151-
$this->stateMock
152-
->expects($this->never())
153-
->method('getMode')
154-
->willReturn(State::MODE_DEVELOPER);
155-
$this->scopeConfigMock
156-
->expects($this->never())
157-
->method('getValue');
166+
$this->deploymentConfigMock->expects($this->once())
167+
->method('get')
168+
->with(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING)
169+
->willReturn(false);
158170

159-
$this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::API]));
171+
$this->assertFalse($this->model->isHandling(
172+
new LogRecord(
173+
new \DateTimeImmutable(),
174+
'testChannel',
175+
Level::Error,
176+
'testMessage'
177+
)
178+
));
160179
}
161180

162181
/**
@@ -174,6 +193,6 @@ public function testDeploymentConfigIsNotAvailable()
174193
->expects($this->never())
175194
->method('getValue');
176195

177-
$this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
196+
$this->assertTrue($this->model->isHandling($this->logRecord));
178197
}
179198
}

Diff for: ‎app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/SyslogTest.php

+17-15
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Magento\Framework\App\Config\ScopeConfigInterface;
1313
use Magento\Framework\App\DeploymentConfig;
1414
use Magento\Framework\Logger\Monolog;
15+
use Monolog\Handler\AbstractHandler;
16+
use Monolog\Level;
17+
use Monolog\LogRecord;
1518
use PHPUnit\Framework\MockObject\MockObject as Mock;
1619
use PHPUnit\Framework\TestCase;
1720

@@ -35,13 +38,24 @@ class SyslogTest extends TestCase
3538
*/
3639
private $deploymentConfigMock;
3740

41+
/**
42+
* @var LogRecord
43+
*/
44+
private $logRecord;
45+
3846
/**
3947
* @inheritdoc
4048
*/
4149
protected function setUp(): void
4250
{
4351
$this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
4452
$this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
53+
$this->logRecord = new LogRecord(
54+
new \DateTimeImmutable(),
55+
'testChannel',
56+
Level::Debug,
57+
'testMessage'
58+
);
4559

4660
$this->model = new Syslog(
4761
$this->deploymentConfigMock,
@@ -54,10 +68,6 @@ protected function setUp(): void
5468
*/
5569
public function testIsHandling(): void
5670
{
57-
$record = [
58-
'level' => Monolog::DEBUG,
59-
];
60-
6171
$this->scopeConfigMock
6272
->expects($this->never())
6373
->method('getValue');
@@ -72,7 +82,7 @@ public function testIsHandling(): void
7282
->willReturn(1);
7383

7484
$this->assertTrue(
75-
$this->model->isHandling($record)
85+
$this->model->isHandling($this->logRecord)
7686
);
7787
}
7888

@@ -81,10 +91,6 @@ public function testIsHandling(): void
8191
*/
8292
public function testIsHandlingNotInstalled(): void
8393
{
84-
$record = [
85-
'level' => Monolog::DEBUG,
86-
];
87-
8894
$this->scopeConfigMock
8995
->expects($this->never())
9096
->method('getValue');
@@ -94,7 +100,7 @@ public function testIsHandlingNotInstalled(): void
94100
->willReturn(false);
95101

96102
$this->assertFalse(
97-
$this->model->isHandling($record)
103+
$this->model->isHandling($this->logRecord)
98104
);
99105
}
100106

@@ -103,10 +109,6 @@ public function testIsHandlingNotInstalled(): void
103109
*/
104110
public function testIsHandlingDisabled(): void
105111
{
106-
$record = [
107-
'level' => Monolog::DEBUG,
108-
];
109-
110112
$this->scopeConfigMock
111113
->expects($this->never())
112114
->method('getValue');
@@ -121,7 +123,7 @@ public function testIsHandlingDisabled(): void
121123
->willReturn(0);
122124

123125
$this->assertFalse(
124-
$this->model->isHandling($record)
126+
$this->model->isHandling($this->logRecord)
125127
);
126128
}
127129
}

Diff for: ‎app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class ActiveEditor extends \Magento\Framework\View\Element\Template
1919
{
20-
const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter';
20+
public const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter';
2121

2222
/**
2323
* @var ScopeConfigInterface

Diff for: ‎app/code/Magento/Ui/etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</dev>
1616
<cms>
1717
<wysiwyg>
18-
<editor_version>mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</editor_version>
18+
<editor_version>mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</editor_version>
1919
</wysiwyg>
2020
</cms>
2121
</default>

Diff for: ‎app/code/Magento/Ui/view/base/requirejs-config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var config = {
88
shim: {
99
'chartjs/chartjs-adapter-moment': ['moment'],
1010
'chartjs/es6-shim.min': {},
11-
'tiny_mce_5/tinymce.min': {
11+
'tiny_mce_7/tinymce.min': {
1212
exports: 'tinyMCE'
1313
}
1414
},
@@ -28,8 +28,8 @@ var config = {
2828
buttonAdapter: 'Magento_Ui/js/form/button-adapter',
2929
chartJs: 'chartjs/Chart.min',
3030
'chart.js': 'chartjs/Chart.min',
31-
tinymce: 'tiny_mce_5/tinymce.min',
32-
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter'
31+
tinymce: 'tiny_mce_7/tinymce.min',
32+
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter'
3333
}
3434
}
3535
};

Diff for: ‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"magento/zend-cache": "^1.16",
7575
"magento/zend-db": "^1.16",
7676
"magento/zend-pdf": "^1.16",
77-
"monolog/monolog": "^2.7",
77+
"monolog/monolog": "^3.6",
7878
"opensearch-project/opensearch-php": "^1.0 || ^2.0",
7979
"pelago/emogrifier": "^7.0",
8080
"php-amqplib/php-amqplib": "^3.2",
@@ -90,7 +90,7 @@
9090
"tubalmartin/cssmin": "^4.1",
9191
"web-token/jwt-framework": "^3.1",
9292
"webonyx/graphql-php": "^15.0",
93-
"wikimedia/less.php": "^3.2"
93+
"wikimedia/less.php": "^4.4"
9494
},
9595
"require-dev": {
9696
"allure-framework/allure-phpunit": "^3",

0 commit comments

Comments
 (0)