Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit c1eaeeb

Browse files
doboothdobooth
authored
Merge branch 'master' into patch-60
2 parents 289a03c + d2f94f6 commit c1eaeeb

File tree

15 files changed

+232
-111
lines changed

15 files changed

+232
-111
lines changed

‎src/cloud/project/project-webint-basic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ functional_areas:
1010
- Configuration
1111
---
1212

13-
The {{site.data.var.ece}} [Project Web Interface](https://accounts.magento.cloud) enables you to do the following for all Starter and Pro environments:
13+
The {{site.data.var.ece}} [Project Web Interface](https://account.magento.com/customer/account/login/) enables you to do the following for all Starter and Pro environments:
1414

1515
- [Access projects](#project-access)
1616
- Create and manage projects
@@ -31,7 +31,7 @@ The Project Web Interface provides several ways to access your project and envir
3131

3232
To access projects and environments through the Project Web Interface:
3333

34-
1. [Log in to your project](https://accounts.magento.cloud).
34+
1. [Log in to your project](https://account.magento.com/customer/account/login/).
3535
1. Click **Access Project** for a list of URLs and SSH.
3636

3737
![Access your project by URL or SSH]({{ site.baseurl }}/common/images/cloud_project-access.png){:width="600px"}

‎src/guides/v2.3/architecture/archi_perspectives/ABasics_intro.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Magento incorporates the core architectural principles of object-oriented, PHP-b
88

99
The following discussion focuses on how these topics apply directly to Magento:
1010

11-
* Magento technology stack
12-
* Magento View Model
13-
* Extensibility
14-
* Modularity
15-
* Event-driven architecture
16-
* Security
11+
* [Magento technology stack]({{page.baseurl}}/architecture/tech-stack.html)
12+
* [Magento View Model]({{page.baseurl}}/extension-dev-guide/view-models.html)
13+
* [Extensibility]({{page.baseurl}}/architecture/extensibility.html)
14+
* [Modularity]({{page.baseurl}}/architecture/extensibility.html#modularity)
15+
* [Event-driven architecture]({{page.baseurl}}/extension-dev-guide/events-and-observers.html)
16+
* [Security]({{page.baseurl}}/architecture/security_intro.html)
1717

1818
{:.ref-header}
1919
Related topics

‎src/guides/v2.3/extension-dev-guide/build/composer-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Where:
222222
[2]: https://packagist.org/
223223
[3]: https://getcomposer.org/doc/05-repositories.md#path
224224
[4]: https://www.iso.org/iso-639-language-codes.html
225-
[5]: https://docs.magento.com/marketplace/sellers/company-profile.html
225+
[5]: https://devdocs.magento.com/marketplace/sellers/profile-company.html
226226
[6]: https://marketplace.magento.com/
227227
[7]: https://marketplace.magento.com
228228
[8]: {{ page.baseurl }}/extension-dev-guide/package/package_module.html#package-metapackage

‎src/guides/v2.3/extension-dev-guide/prepare/lifecycle.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,5 @@ Avoid this situation by not including dependencies in your uninstall event class
309309
[`ModuleDataSetupInterface`]: {{ site.mage2bloburl }}/{{page.guide_version}}/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
310310
[Customer module's DefaultCustomerGroupsAndAttributes.php]: {{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
311311
[`ModuleContextInterface`]: {{ site.mage2bloburl }}/{{page.guide_version}}/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
312-
[User module's UpgradeData.php]: {{ site.mage2bloburl }}/{{page.guide_version}}/app/code/Magento/User/Setup/UpgradeData.php
313312
[Component Manager]: {{ page.baseurl }}/comp-mgr/extens-man/extensman-uninst-final.html
314313
[`UninstallInterface`]: {{ site.mage2bloburl }}/{{page.guide_version}}/lib/internal/Magento/Framework/Setup/UninstallInterface.php

‎src/guides/v2.3/extension-dev-guide/security/non-secure-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ As a developer, you should avoid using functions that introduce vulnerabilities
1616
The following is a list of [PHP](https://glossary.magento.com/php) functions that are known to be vulnerable and exploitable.
1717
Avoid using these functions in your code.
1818

19-
* [`eval`](http://php.net/manual/en/function.eval.php){:target="_blank"} - Using `eval` is considered bad practice because of its ability to [execute arbitrary PHP code](https://www.owasp.org/index.php/PHP_Security_Cheat_Sheet#Code_Injection){:target="_blank"}.
19+
* [`eval`](http://php.net/manual/en/function.eval.php){:target="_blank"} - Using `eval` is considered bad practice because of its ability to [execute arbitrary PHP code](https://cheatsheetseries.owasp.org/cheatsheets/Injection_Prevention_Cheat_Sheet.html){:target="_blank"}.
2020
* [`serialize`](http://php.net/manual/en/function.serialize.php){:target="_blank"}/[`unserialize`](http://php.net/manual/en/function.unserialize.php){:target="_blank"} - Attackers can create an exploit for these functions by passing a string with a serialized arbitrary object to the `unserialize` function to [run arbitrary code](https://www.owasp.org/index.php/PHP_Object_Injection){:target="_blank"}.
2121
* [`md5`](http://php.net/manual/en/function.md5.php){:target="_blank"} - The algorithm for this function is known to have [cryptographic weaknesses](https://www.owasp.org/index.php/Guide_to_Cryptography#Hashes){:target="_blank"}.
2222
You should never use this function for hashing passwords or any other sensitive data.

‎src/guides/v2.3/graphql/product/bundle-product.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The following query returns information about bundle product `24-WG080`, which i
6969
{
7070
items{
7171
sku
72-
type_id
72+
__typename
7373
id
7474
name
7575
... on BundleProduct {
@@ -98,7 +98,7 @@ The following query returns information about bundle product `24-WG080`, which i
9898
id
9999
name
100100
sku
101-
type_id
101+
__typename
102102
}
103103
}
104104
}
@@ -117,7 +117,7 @@ The following query returns information about bundle product `24-WG080`, which i
117117
"items": [
118118
{
119119
"sku": "24-WG080",
120-
"type_id": "bundle",
120+
"__typename": "bundle",
121121
"id": 46,
122122
"name": "Sprite Yoga Companion Kit",
123123
"dynamic_sku": true,
@@ -147,7 +147,7 @@ The following query returns information about bundle product `24-WG080`, which i
147147
"id": 26,
148148
"name": "Sprite Stasis Ball 55 cm",
149149
"sku": "24-WG081-blue",
150-
"type_id": "simple"
150+
"__typename": "simple"
151151
}
152152
},
153153
{
@@ -163,7 +163,7 @@ The following query returns information about bundle product `24-WG080`, which i
163163
"id": 29,
164164
"name": "Sprite Stasis Ball 65 cm",
165165
"sku": "24-WG082-blue",
166-
"type_id": "simple"
166+
"__typename": "simple"
167167
}
168168
},
169169
{
@@ -179,7 +179,7 @@ The following query returns information about bundle product `24-WG080`, which i
179179
"id": 32,
180180
"name": "Sprite Stasis Ball 75 cm",
181181
"sku": "24-WG083-blue",
182-
"type_id": "simple"
182+
"__typename": "simple"
183183
}
184184
}
185185
]
@@ -205,7 +205,7 @@ The following query returns information about bundle product `24-WG080`, which i
205205
"id": 21,
206206
"name": "Sprite Foam Yoga Brick",
207207
"sku": "24-WG084",
208-
"type_id": "simple"
208+
"__typename": "simple"
209209
}
210210
}
211211
]
@@ -231,7 +231,7 @@ The following query returns information about bundle product `24-WG080`, which i
231231
"id": 33,
232232
"name": "Sprite Yoga Strap 6 foot",
233233
"sku": "24-WG085",
234-
"type_id": "simple"
234+
"__typename": "simple"
235235
}
236236
},
237237
{
@@ -247,7 +247,7 @@ The following query returns information about bundle product `24-WG080`, which i
247247
"id": 34,
248248
"name": "Sprite Yoga Strap 8 foot",
249249
"sku": "24-WG086",
250-
"type_id": "simple"
250+
"__typename": "simple"
251251
}
252252
},
253253
{
@@ -263,7 +263,7 @@ The following query returns information about bundle product `24-WG080`, which i
263263
"id": 35,
264264
"name": "Sprite Yoga Strap 10 foot",
265265
"sku": "24-WG087",
266-
"type_id": "simple"
266+
"__typename": "simple"
267267
}
268268
}
269269
]
@@ -289,7 +289,7 @@ The following query returns information about bundle product `24-WG080`, which i
289289
"id": 22,
290290
"name": "Sprite Foam Roller",
291291
"sku": "24-WG088",
292-
"type_id": "simple"
292+
"__typename": "simple"
293293
}
294294
}
295295
]

‎src/guides/v2.3/graphql/product/configurable-product.md

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ The following `products` query returns `ConfigurableProduct` information about t
9292
attribute_set_id
9393
name
9494
sku
95-
type_id
96-
price {
97-
regularPrice {
98-
amount {
95+
__typename
96+
price_range{
97+
minimum_price{
98+
regular_price{
9999
value
100100
currency
101101
}
@@ -127,9 +127,9 @@ The following `products` query returns `ConfigurableProduct` information about t
127127
... on PhysicalProductInterface {
128128
weight
129129
}
130-
price {
131-
regularPrice {
132-
amount {
130+
price_range{
131+
minimum_price{
132+
regular_price{
133133
value
134134
currency
135135
}
@@ -160,10 +160,10 @@ The following `products` query returns `ConfigurableProduct` information about t
160160
"attribute_set_id": 9,
161161
"name": "Mona Pullover Hoodlie",
162162
"sku": "WH01",
163-
"type_id": "configurable",
164-
"price": {
165-
"regularPrice": {
166-
"amount": {
163+
"__typename": "configurable",
164+
"price_range": {
165+
"minimum_price": {
166+
"regular_price": {
167167
"value": 57,
168168
"currency": "USD"
169169
}
@@ -247,9 +247,9 @@ The following `products` query returns `ConfigurableProduct` information about t
247247
"sku": "WH01-XS-Green",
248248
"attribute_set_id": 9,
249249
"weight": 1,
250-
"price": {
251-
"regularPrice": {
252-
"amount": {
250+
"price_range": {
251+
"minimum_price": {
252+
"regular_price": {
253253
"value": 57,
254254
"currency": "USD"
255255
}
@@ -276,9 +276,9 @@ The following `products` query returns `ConfigurableProduct` information about t
276276
"sku": "WH01-XS-Orange",
277277
"attribute_set_id": 9,
278278
"weight": 1,
279-
"price": {
280-
"regularPrice": {
281-
"amount": {
279+
"price_range": {
280+
"minimum_price": {
281+
"regular_price": {
282282
"value": 57,
283283
"currency": "USD"
284284
}
@@ -305,9 +305,9 @@ The following `products` query returns `ConfigurableProduct` information about t
305305
"sku": "WH01-XS-Purple",
306306
"attribute_set_id": 9,
307307
"weight": 1,
308-
"price": {
309-
"regularPrice": {
310-
"amount": {
308+
"price_range": {
309+
"minimum_price": {
310+
"regular_price": {
311311
"value": 57,
312312
"currency": "USD"
313313
}
@@ -334,9 +334,9 @@ The following `products` query returns `ConfigurableProduct` information about t
334334
"sku": "WH01-S-Green",
335335
"attribute_set_id": 9,
336336
"weight": 1,
337-
"price": {
338-
"regularPrice": {
339-
"amount": {
337+
"price_range": {
338+
"minimum_price": {
339+
"regular_price": {
340340
"value": 57,
341341
"currency": "USD"
342342
}
@@ -363,9 +363,9 @@ The following `products` query returns `ConfigurableProduct` information about t
363363
"sku": "WH01-S-Orange",
364364
"attribute_set_id": 9,
365365
"weight": 1,
366-
"price": {
367-
"regularPrice": {
368-
"amount": {
366+
"price_range": {
367+
"minimum_price": {
368+
"regular_price": {
369369
"value": 57,
370370
"currency": "USD"
371371
}
@@ -392,9 +392,9 @@ The following `products` query returns `ConfigurableProduct` information about t
392392
"sku": "WH01-S-Purple",
393393
"attribute_set_id": 9,
394394
"weight": 1,
395-
"price": {
396-
"regularPrice": {
397-
"amount": {
395+
"price_range": {
396+
"minimum_price": {
397+
"regular_price": {
398398
"value": 57,
399399
"currency": "USD"
400400
}
@@ -421,9 +421,9 @@ The following `products` query returns `ConfigurableProduct` information about t
421421
"sku": "WH01-M-Green",
422422
"attribute_set_id": 9,
423423
"weight": 1,
424-
"price": {
425-
"regularPrice": {
426-
"amount": {
424+
"price_range": {
425+
"minimum_price": {
426+
"regular_price": {
427427
"value": 57,
428428
"currency": "USD"
429429
}
@@ -450,9 +450,9 @@ The following `products` query returns `ConfigurableProduct` information about t
450450
"sku": "WH01-M-Orange",
451451
"attribute_set_id": 9,
452452
"weight": 1,
453-
"price": {
454-
"regularPrice": {
455-
"amount": {
453+
"price_range": {
454+
"minimum_price": {
455+
"regular_price": {
456456
"value": 57,
457457
"currency": "USD"
458458
}
@@ -479,9 +479,9 @@ The following `products` query returns `ConfigurableProduct` information about t
479479
"sku": "WH01-M-Purple",
480480
"attribute_set_id": 9,
481481
"weight": 1,
482-
"price": {
483-
"regularPrice": {
484-
"amount": {
482+
"price_range": {
483+
"minimum_price": {
484+
"regular_price": {
485485
"value": 57,
486486
"currency": "USD"
487487
}
@@ -508,9 +508,9 @@ The following `products` query returns `ConfigurableProduct` information about t
508508
"sku": "WH01-L-Green",
509509
"attribute_set_id": 9,
510510
"weight": 1,
511-
"price": {
512-
"regularPrice": {
513-
"amount": {
511+
"price_range": {
512+
"minimum_price": {
513+
"regular_price": {
514514
"value": 57,
515515
"currency": "USD"
516516
}
@@ -537,9 +537,9 @@ The following `products` query returns `ConfigurableProduct` information about t
537537
"sku": "WH01-L-Orange",
538538
"attribute_set_id": 9,
539539
"weight": 1,
540-
"price": {
541-
"regularPrice": {
542-
"amount": {
540+
"price_range": {
541+
"minimum_price": {
542+
"regular_price": {
543543
"value": 57,
544544
"currency": "USD"
545545
}
@@ -566,9 +566,9 @@ The following `products` query returns `ConfigurableProduct` information about t
566566
"sku": "WH01-L-Purple",
567567
"attribute_set_id": 9,
568568
"weight": 1,
569-
"price": {
570-
"regularPrice": {
571-
"amount": {
569+
"price_range": {
570+
"minimum_price": {
571+
"regular_price": {
572572
"value": 57,
573573
"currency": "USD"
574574
}
@@ -595,9 +595,9 @@ The following `products` query returns `ConfigurableProduct` information about t
595595
"sku": "WH01-XL-Green",
596596
"attribute_set_id": 9,
597597
"weight": 1,
598-
"price": {
599-
"regularPrice": {
600-
"amount": {
598+
"price_range": {
599+
"minimum_price": {
600+
"regular_price": {
601601
"value": 57,
602602
"currency": "USD"
603603
}
@@ -624,9 +624,9 @@ The following `products` query returns `ConfigurableProduct` information about t
624624
"sku": "WH01-XL-Orange",
625625
"attribute_set_id": 9,
626626
"weight": 1,
627-
"price": {
628-
"regularPrice": {
629-
"amount": {
627+
"price_range": {
628+
"minimum_price": {
629+
"regular_price": {
630630
"value": 57,
631631
"currency": "USD"
632632
}
@@ -653,9 +653,9 @@ The following `products` query returns `ConfigurableProduct` information about t
653653
"sku": "WH01-XL-Purple",
654654
"attribute_set_id": 9,
655655
"weight": 1,
656-
"price": {
657-
"regularPrice": {
658-
"amount": {
656+
"price_range": {
657+
"minimum_price": {
658+
"regular_price": {
659659
"value": 57,
660660
"currency": "USD"
661661
}

0 commit comments

Comments
 (0)