Skip to content

Commit 0cbe3e3

Browse files
authored
Merge branch 'main' into patch-1
2 parents 971da65 + 01ca366 commit 0cbe3e3

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/pages/development/build/component-load-order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ __Component B__ introduces `gadgetlayout.xml`, which updates block `gadgetBlock`
2727
```xml
2828
<?xml version="1.0"?>
2929
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
30-
<module name="Vendor_ComponentB" setup_version="0.0.1">
30+
<module name="Vendor_ComponentB">
3131
<sequence>
3232
<!-- Vendor_ComponentB is dependent on Vendor_ComponentA: -->
3333
<module name="Vendor_ComponentA" />

src/pages/development/security/cross-site-scripting.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ When using the `\Magento\Framework\Escaper` or `$escaper`:
5757
**The following code sample illustrates XSS-safe output in templates:**
5858

5959
```php
60-
<?php echo $block->getTitleHtml() ?>
61-
<?php echo $block->getHtmlTitle() ?>
62-
<?php echo $escaper->escapeHtml($block->getTitle()) ?>
63-
<?php echo (int)$block->getId() ?>
64-
<?php echo count($var); ?>
65-
<?php echo 'some text' ?>
66-
<?php echo "some text" ?>
67-
<a href="<?php echo $escaper->escapeUrl($block->getUrl()) ?>"><?php echo $block->getAnchorTextHtml() ?></a>
60+
<?= $block->getTitleHtml() ?>
61+
<?= $block->getHtmlTitle() ?>
62+
<?= $escaper->escapeHtml($block->getTitle()) ?>
63+
<?= (int)$block->getId() ?>
64+
<?= count($var); ?>
65+
<?= 'some text' ?>
66+
<?= "some text" ?>
67+
<a href="<?= $escaper->escapeUrl($block->getUrl()) ?>"><?= $block->getAnchorTextHtml() ?></a>
6868
```
6969

7070
**When to use Escaper methods:**
@@ -98,10 +98,10 @@ If a tag is allowed, the following attributes will not be escaped: `id`, `class`
9898
`embed`, `iframe`, `video`, `source`, `object`, `audio`, `script` and `img` tags are not allowed, regardless of the content of this array.
9999
100100
```php
101-
<span class="label"><?php echo $escaper->escapeHtml($block->getLabel()) ?></span>
101+
<span class="label"><?= $escaper->escapeHtml($block->getLabel()) ?></span>
102102
// Escaping translation
103103
<div id='my-element'>
104-
<?php echo $escaper->escapeHtml(__('Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">create an account</a>', $block->getLoginUrl(), $block->getCreateAccountUrl()), ['a']) ?>
104+
<?= $escaper->escapeHtml(__('Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">create an account</a>', $block->getLoginUrl(), $block->getCreateAccountUrl()), ['a']) ?>
105105
</div>
106106
```
107107

src/pages/tutorials/backend/convert-serialized-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Convert Serialized Data to JSON | Commerce PHP Extensions
33
description: Follow this tutorial to convert database data from the defaul PHP serialized format to JSON.
44
---
55

6-
# Convert serliazed data to JSON
6+
# Convert serialized data to JSON
77

88
The following tutorial lists the steps needed to create an upgrade script that converts the data stored in the database from the default PHP serialized format to JSON format.
99

0 commit comments

Comments
 (0)