Skip to content

Commit 054e67c

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Upgrade doctor rst 1.41.3
2 parents e3cfa6d + cb0b5ba commit 054e67c

File tree

8 files changed

+3
-36
lines changed

8 files changed

+3
-36
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
7474

7575
- name: "Run DOCtor-RST"
76-
uses: docker://oskarstark/doctor-rst:1.41.0
76+
uses: docker://oskarstark/doctor-rst:1.41.3
7777
with:
7878
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7979

components/runtime.rst

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ The Runtime component abstracts most bootstrapping logic as so-called
2626
For instance, the Runtime component allows Symfony's ``public/index.php``
2727
to look like this::
2828

29-
<?php
3029
// public/index.php
3130
use App\Kernel;
3231

@@ -116,7 +115,6 @@ Resolvable Arguments
116115

117116
The closure returned from the front-controller may have zero or more arguments::
118117

119-
<?php
120118
// public/index.php
121119
use Symfony\Component\Console\Input\InputInterface;
122120
use Symfony\Component\Console\Output\OutputInterface;
@@ -163,7 +161,6 @@ Resolvable Applications
163161
The application returned by the closure below is a Symfony Kernel. However,
164162
a number of different applications are supported::
165163

166-
<?php
167164
// public/index.php
168165
use App\Kernel;
169166

@@ -183,7 +180,6 @@ The ``SymfonyRuntime`` can handle these applications:
183180
The Response will be printed by
184181
:class:`Symfony\\Component\\Runtime\\Runner\\Symfony\\ResponseRunner`::
185182

186-
<?php
187183
// public/index.php
188184
use Symfony\Component\HttpFoundation\Response;
189185

@@ -197,8 +193,6 @@ The ``SymfonyRuntime`` can handle these applications:
197193
To write single command applications. This will use the
198194
:class:`Symfony\\Component\\Runtime\\Runner\\Symfony\\ConsoleApplicationRunner`::
199195

200-
<?php
201-
202196
use Symfony\Component\Console\Command\Command;
203197
use Symfony\Component\Console\Input\InputInterface;
204198
use Symfony\Component\Console\Output\OutputInterface;
@@ -217,8 +211,6 @@ The ``SymfonyRuntime`` can handle these applications:
217211
Useful with console applications with more than one command. This will use the
218212
:class:`Symfony\\Component\\Runtime\\Runner\\Symfony\\ConsoleApplicationRunner`::
219213

220-
<?php
221-
222214
use Symfony\Component\Console\Application;
223215
use Symfony\Component\Console\Command\Command;
224216
use Symfony\Component\Console\Input\InputInterface;
@@ -246,7 +238,6 @@ applications:
246238
The ``RunnerInterface`` is a way to use a custom application with the
247239
generic Runtime::
248240

249-
<?php
250241
// public/index.php
251242
use Symfony\Component\Runtime\RunnerInterface;
252243

@@ -267,9 +258,7 @@ applications:
267258
Your "application" can also be a ``callable``. The first callable will return
268259
the "application" and the second callable is the "application" itself::
269260

270-
<?php
271261
// public/index.php
272-
273262
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
274263

275264
return function () {
@@ -286,8 +275,6 @@ applications:
286275
If the callable doesn't return anything, the ``SymfonyRuntime`` will assume
287276
everything is fine::
288277

289-
<?php
290-
291278
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
292279

293280
return function () {
@@ -300,8 +287,6 @@ Using Options
300287
Some behavior of the Runtimes can be modified through runtime options. They
301288
can be set using the ``APP_RUNTIME_OPTIONS`` environment variable::
302289

303-
<?php
304-
305290
$_SERVER['APP_RUNTIME_OPTIONS'] = [
306291
'project_dir' => '/var/task',
307292
];
@@ -482,8 +467,6 @@ always using this ``ReactPHPRunner``::
482467

483468
The end user will now be able to create front controller like::
484469

485-
<?php
486-
487470
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
488471

489472
return function (array $context) {

components/uid.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,15 @@ configure the behavior of the factory using configuration files::
129129
.. code-block:: php
130130
131131
// config/packages/uid.php
132-
<?php
133-
134132
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
135133
136134
return static function (ContainerConfigurator $containerConfigurator): void {
137-
$services = $configurator->services()
135+
$services = $containerConfigurator->services()
138136
->defaults()
139137
->autowire()
140138
->autoconfigure();
141139
142-
$configurator->extension('framework', [
140+
$containerConfigurator->extension('framework', [
143141
'uid' => [
144142
'default_uuid_version' => 6,
145143
'name_based_uuid_version' => 5,
@@ -153,8 +151,6 @@ configure the behavior of the factory using configuration files::
153151
Then, you can inject the factory in your services and use it to generate UUIDs based
154152
on the configuration you defined::
155153

156-
<?php
157-
158154
namespace App\Service;
159155

160156
use Symfony\Component\Uid\Factory\UuidFactory;
@@ -354,8 +350,6 @@ following methods to create a ``Ulid`` object from it::
354350

355351
Like UUIDs, ULIDs have their own factory, ``UlidFactory``, that can be used to generate them::
356352

357-
<?php
358-
359353
namespace App\Service;
360354

361355
use Symfony\Component\Uid\Factory\UlidFactory;

components/var_exporter.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ following class hierarchy::
7575
When exporting the ``ConcreteClass`` data with VarExporter, the generated PHP
7676
file looks like this::
7777

78-
<?php
7978
return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
8079
$o = [
8180
clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\ConcreteClass'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\ConcreteClass')),

page_creation.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ Suppose you want to create a page - ``/lucky/number`` - that generates a lucky (
4444
random) number and prints it. To do that, create a "Controller" class and a
4545
"controller" method inside of it::
4646

47-
<?php
4847
// src/Controller/LuckyController.php
4948
namespace App\Controller;
5049

quick_tour/flex_recipes.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ Rich API Support
152152

153153
Are you building an API? You can already return JSON from any controller::
154154

155-
<?php
156155
// src/Controller/DefaultController.php
157156
namespace App\Controller;
158157

@@ -188,7 +187,6 @@ But like usual, we can immediately start using the new library. Want to create a
188187
rich API for a ``product`` table? Create a ``Product`` entity and give it the
189188
``#[ApiResource]`` attribute::
190189

191-
<?php
192190
// src/Entity/Product.php
193191
namespace App\Entity;
194192

quick_tour/the_architecture.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Want a logging system? No problem:
2121
This installs and configures (via a recipe) the powerful `Monolog`_ library. To
2222
use the logger in a controller, add a new argument type-hinted with ``LoggerInterface``::
2323

24-
<?php
2524
// src/Controller/DefaultController.php
2625
namespace App\Controller;
2726

@@ -86,7 +85,6 @@ To keep your code organized, you can even create your own services! Suppose you
8685
want to generate a random greeting (e.g. "Hello", "Yo", etc). Instead of putting
8786
this code directly in your controller, create a new class::
8887

89-
<?php
9088
// src/GreetingGenerator.php
9189
namespace App;
9290

@@ -103,7 +101,6 @@ this code directly in your controller, create a new class::
103101

104102
Great! You can use it immediately in your controller::
105103

106-
<?php
107104
// src/Controller/DefaultController.php
108105
namespace App\Controller;
109106

@@ -163,7 +160,6 @@ by creating an event subscriber or a security voter for complex authorization
163160
rules. Let's add a new filter to Twig called ``greet``. How? Create a class
164161
that extends ``AbstractExtension``::
165162

166-
<?php
167163
// src/Twig/GreetExtension.php
168164
namespace App\Twig;
169165

quick_tour/the_big_picture.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ doesn't exist yet, so let's create it!
8080
In ``src/Controller``, create a new ``DefaultController`` class and an ``index``
8181
method inside::
8282

83-
<?php
8483
// src/Controller/DefaultController.php
8584
namespace App\Controller;
8685

@@ -175,7 +174,6 @@ This works just like before! But by using attributes, the route and controller
175174
live right next to each other. Need another page? Add another route and method
176175
in ``DefaultController``::
177176

178-
<?php
179177
// src/Controller/DefaultController.php
180178
namespace App\Controller;
181179

0 commit comments

Comments
 (0)