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

Commit 6a8c4b1

Browse files
authored
Merge branch 'master' into db_guild
2 parents f831348 + 958c1c9 commit 6a8c4b1

File tree

14 files changed

+18
-18
lines changed

14 files changed

+18
-18
lines changed

src/_includes/cloud/log-in-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The following steps provide an example of accessing a database:
1414

1515
Sample output follows:
1616

17-
```php
17+
```terminal
1818
Array
1919
(
2020
[0] => stdClass Object

src/_includes/config/split-deploy/example_update-prod.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To update the production system:
1515

1616
1. Stop any running queue workers by setting `cron_run` to `false` in `app/etc/env.php` as follows:
1717

18-
```php
18+
```php?start_inline=1
1919
'cron_consumers_runner' => [
2020
'cron_run' => false
2121
]

src/_videos/fundamentals/add-a-javascript-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Now create two files:
4545

4646
{% collapsible Show source code %}
4747

48-
```php?start_inline=1
48+
```php
4949
<?php
5050
\Magento\Framework\Component\ComponentRegistrar::register(
5151
\Magento\Framework\Component\ComponentRegistrar::MODULE,

src/_videos/fundamentals/add-new-product-attribute.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
7272

7373
{% collapsible Show code %}
7474

75-
```php?start_inline=1
75+
```php
7676
<?php
7777
/**
7878
* Copyright © 2016 Magento. All rights reserved.
@@ -97,7 +97,7 @@ Create the file `app/code/Learning/ClothingMaterial/Setup/InstallData.php`:
9797

9898
{% collapsible Show code %}
9999

100-
```php?start_inline=1
100+
```php
101101
<?php
102102
/**
103103
* Copyright © 2016 Magento. All rights reserved.
@@ -204,7 +204,7 @@ Next, we need to create the source model:
204204

205205
{% collapsible Show code %}
206206

207-
```php?start_inline=1
207+
```php
208208
<?php
209209
/**
210210
* Copyright © 2016 Magento. All rights reserved.
@@ -248,7 +248,7 @@ Now we will create a backend model:
248248

249249
{% collapsible Show code %}
250250

251-
```php?start_inline=1
251+
```php
252252
<?php
253253
/**
254254
* Copyright © 2016 Magento. All rights reserved.
@@ -295,7 +295,7 @@ And finally, we create a frontend model to make our value bold:
295295

296296
{% collapsible Show code %}
297297

298-
```php?start_inline=1
298+
```php
299299
<?php
300300
namespace Learning\ClothingMaterial\Model\Attribute\Frontend;
301301

src/cloud/deploy/scenario-based-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ To register a module with the {{site.data.var.ct}} package:
224224

225225
1. Create or extend the `registration.php` file in the root of your module.
226226

227-
```php
227+
```php?start_inline=1
228228
\Magento\MagentoCloud\ExtensionRegistrar::register('module-name', __DIR__);
229229
```
230230

src/cloud/env/variables-cloud.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ To [add environment variables to override configuration settings]({{ site.baseur
2929
Since values can change over time, it is best to inspect the variable at runtime and use it to configure your application. For example, we use the `MAGENTO_CLOUD_RELATIONSHIPS` variable to retrieve environment-related relationships as follows:
3030

3131
```php
32+
<?php
3233
/**
3334
* Get relationships information from cloud environment variable.
3435
*

src/cloud/project/magento-app-php-ini.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Configuring PHP settings improperly can cause issues. We recommend only advanced
1818

1919
To increase the PHP memory limit, add the following setting to the `php.ini` file:
2020

21-
```php
21+
```ini
2222
memory_limit = 1G
2323
```
2424

src/cloud/project/project-routes-more-ssi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ The following example shows how to insert a dynamic date control at the top of a
3232
3333
Add the following to any page, such as `/index.php`:
3434

35-
```php
35+
```php?start_inline=1
3636
echo date(DATE_RFC2822);
3737
<!--#include virtual="time.php" -->
3838
```
3939

4040
Add the following to `time.php`:
4141

42-
```php
42+
```php?start_inline=1
4343
header("Cache-Control: max-age=600");
4444
echo date(DATE_RFC2822);
4545
```

src/cloud/release-notes/backward-incompatible-changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ In earlier {{ site.data.var.ct }} releases, you could use the `m2-ece-build` and
8383

8484
- **Running post-deploy hooks**–The `cloud-deploy` command no longer runs post deploy hooks. You must use the new `cloud-post-deploy` command to run post deploy hooks after you deploy. Update your scripts to add the command to run post deploy hooks.
8585

86-
```php
86+
```shell
8787
bin/magento-docker ece-deploy
8888
bin/magento-docker ece-post-deploy
8989
```

src/cloud/trouble/trouble-crypt-key-variable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To verify and update the encryption key environment variable:
2929
1. Open `app/etc/env.php` in a text editor.
3030
1. Verify the existing value of `key` for `crypt`. The value should be your [{{site.data.var.ee}} key]({{ site.baseurl }}/cloud/setup/first-time-setup-import-prepare.html#encryption-key).
3131

32-
```php
32+
```php?start_inline=1
3333
return array (
3434
'crypt' =>
3535
array (

0 commit comments

Comments
 (0)