Skip to content

Minor: remove duplicated lines #19548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion components/dependency_injection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ You can override this behavior as follows::
// the second argument is optional and defines what to do when the service doesn't exist
$newsletterManager = $containerBuilder->get('newsletter_manager', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE);


These are all the possible behaviors:

* ``ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE``: throws an exception
Expand Down
1 change: 0 additions & 1 deletion migration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ somewhat like this::
throw new \Exception("Unhandled legacy mapping for $requestPathInfo");
}


public static function handleRequest(Request $request, Response $response, string $publicDirectory): void
{
$legacyScriptFilename = LegacyBridge::getLegacyScript($request);
Expand Down
26 changes: 0 additions & 26 deletions reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2847,32 +2847,6 @@ annotation changes). For performance reasons, it is recommended to disable
debug mode in production, which will happen automatically if you use the
default value.

secrets
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplication due to merge conflicts

#19537 (comment)

~~~~~~~

decryption_env_var
..................

**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``

The environment variable that contains the decryption key.

local_dotenv_file
.................

**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``

Path to an dotenv file that holds secrets. This is primarily used for testing.

vault_directory
...............

**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.environment%``

The directory where the vault of secrets is stored.

.. _configuration-framework-serializer:

serializer
~~~~~~~~~~

Expand Down
1 change: 0 additions & 1 deletion reference/configuration/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,6 @@ user logs out::
->domain('example.com');
};


clear_site_data
...............

Expand Down
1 change: 0 additions & 1 deletion reference/constraints/Unique.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ Options

**type**: ``array`` | ``string``


This is defines the key or keys in a collection that should be checked for
uniqueness. By default, all collection keys are checked for uniqueness.

Expand Down
1 change: 0 additions & 1 deletion workflow/workflow-and-state-machine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ machine type, use ``camelCased workflow name + StateMachine``::
// ...
}


Automatic and Manual Validation
-------------------------------

Expand Down