Skip to content

Commit f0798ba

Browse files
committed
Merge remote-tracking branch 'upstream/7.0' into 7.0
* upstream/7.0: Update flex_private_recipes.rst - Update multiple_kernels.rst Add missing use statements clean up Symfony 5 versionadded directives
2 parents 1242587 + 69e97f9 commit f0798ba

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

configuration/multiple_kernels.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ resources::
117117
// src/Kernel.php
118118
namespace Shared;
119119

120-
// ...
120+
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
121+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
121122

122123
class Kernel extends BaseKernel
123124
{
@@ -257,7 +258,8 @@ the application ID to run under CLI context::
257258

258259
// bin/console
259260
use Shared\Kernel;
260-
// ...
261+
use Symfony\Component\Console\Input\InputInterface;
262+
use Symfony\Component\Console\Input\InputOption;
261263

262264
return function (InputInterface $input, array $context): Application {
263265
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG'], $input->getParameterOption(['--id', '-i'], $context['APP_ID']));

service_container.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,10 +1034,6 @@ Autconfiguration also works with attributes. Some attributes like
10341034
for autoconfiguration. Any class using these attributes will have tags applied
10351035
to them.
10361036

1037-
.. versionadded:: 5.3
1038-
1039-
Autoconfiguration through attributes was introduced in Symfony 5.3.
1040-
10411037
Linting Service Definitions
10421038
---------------------------
10431039

setup/flex_private_recipes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ computer, and execute the following command:
224224

225225
.. code-block:: terminal
226226
227-
$ composer config --global --auth gitlab-oauth.gitlab.com [token]
227+
$ composer config --global --auth gitlab-token.gitlab.com [token]
228228
229229
Replace ``[token]`` with the value of your Gitlab personal access token.
230230

0 commit comments

Comments
 (0)