1
+ diff --git a/vendor/magento/theme-adminhtml-backend/i18n/en_US.csv b/vendor/magento/theme-adminhtml-backend/i18n/en_US.csv
2
+ index 2708988e731..885d0056d4b 100644
3
+ --- a/vendor/magento/theme-adminhtml-backend/i18n/en_US.csv
4
+ +++ b/vendor/magento/theme-adminhtml-backend/i18n/en_US.csv
5
+ @@ -547,3 +547,4 @@ Dashboard,Dashboard
6
+ "Web Section","Web Section"
7
+ "Store Email Addresses Section","Store Email Addresses Section"
8
+ "Email to a Friend","Email to a Friend"
9
+ + "Invalid data type","Invalid data type"
10
+ diff --git a/vendor/magento/theme-frontend-blank/i18n/en_US.csv b/vendor/magento/theme-frontend-blank/i18n/en_US.csv
11
+ index 025866f654d..cc02ab5ac90 100644
12
+ --- a/vendor/magento/theme-frontend-blank/i18n/en_US.csv
13
+ +++ b/vendor/magento/theme-frontend-blank/i18n/en_US.csv
14
+ @@ -439,3 +439,4 @@ Summary,Summary
15
+ Test,Test
16
+ test,test
17
+ Two,Two
18
+ + "Invalid data type","Invalid data type"
19
+ diff --git a/vendor/magento/theme-frontend-luma/i18n/en_US.csv b/vendor/magento/theme-frontend-luma/i18n/en_US.csv
20
+ index e80cb58e679..3d0e8ab2650 100644
21
+ --- a/vendor/magento/theme-frontend-luma/i18n/en_US.csv
22
+ +++ b/vendor/magento/theme-frontend-luma/i18n/en_US.csv
23
+ @@ -489,3 +489,4 @@ Remove,Remove
24
+ Test,Test
25
+ test,test
26
+ Two,Two
27
+ + "Invalid data type","Invalid data type"
28
+ diff --git a/vendor/magento/framework/Webapi/ServiceInputProcessor.php b/vendor/magento/framework/Webapi/ServiceInputProcessor.php
29
+ index cd7960409e1..df31058ff32 100644
30
+ --- a/vendor/magento/framework/Webapi/ServiceInputProcessor.php
31
+ +++ b/vendor/magento/framework/Webapi/ServiceInputProcessor.php
32
+ @@ -278,6 +278,12 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface, ResetAf
33
+ // convert to string directly to avoid situations when $className is object
34
+ // which implements __toString method like \ReflectionObject
35
+ $className = (string) $className;
36
+ + if (is_subclass_of($className, \SimpleXMLElement::class)
37
+ + || is_subclass_of($className, \DOMElement::class)) {
38
+ + throw new SerializationException(
39
+ + new Phrase('Invalid data type')
40
+ + );
41
+ + }
42
+ $class = new ClassReflection($className);
43
+ if (is_subclass_of($className, self::EXTENSION_ATTRIBUTES_TYPE)) {
44
+ $className = substr($className, 0, -strlen('Interface'));
45
+ diff --git a/vendor/magento/module-jwt-user-token/Model/SecretBasedJwksFactory.php b/vendor/magento/module-jwt-user-token/Model/SecretBasedJwksFactory.php
46
+ --- a/vendor/magento/module-jwt-user-token/Model/SecretBasedJwksFactory.php (revision 022e64b08a88658667bc2d6b922eada2b7910965)
47
+ +++ b/vendor/magento/module-jwt-user-token/Model/SecretBasedJwksFactory.php (revision 8d2b0c1c6b421cdcd7f62a48a5edc9b0211d92a2)
48
+ @@ -35,6 +35,7 @@
49
+ public function __construct(DeploymentConfig $deploymentConfig, JwkFactory $jwkFactory)
50
+ {
51
+ $this->keys = preg_split('/\s+/s', trim((string)$deploymentConfig->get('crypt/key')));
52
+ + $this->keys = [end($this->keys)];
53
+ //Making sure keys are large enough.
54
+ foreach ($this->keys as &$key) {
55
+ $key = str_pad($key, 2048, '&', STR_PAD_BOTH);
0 commit comments