8000 Merge branch '2.8' into 3.1 · symfony/symfony-docs@8f4aeb0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f4aeb0

Browse files
xabbuhxabbuh
committed
Merge branch '2.8' into 3.1
* 2.8: Rename "console tasks" to "console commands" Reworded the user checker aliases explanation Remove duplicate use operator [Fix][Console] Missing autoloading by Composer Revert "Fixed wrong inheritance information" [#7318] Removing unnecessary word Minor fixes Explain what is the Symfony Core team Added the references to security vulnerabilities discovered in 2016 update year in license template describe should have an 's' on the end Removed an unneeded note
2 parents 152fd70 + d6efc43 commit 8f4aeb0

File tr 10000 ee

16 files changed

+32
-30
lines changed

16 files changed

+32
-30
lines changed

‎components/console/usage.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ built-in options as well as a couple of built-in commands for the Console compon
1616
<?php
1717
// application.php
1818

19+
require __DIR__.'/vendor/autoload.php';
20+
1921
use Symfony\Component\Console\Application;
2022

2123
$application = new Application();

‎console/input.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Next, use this in the command to print the message multiple times::
134134
$output->writeln($text);
135135
}
136136

137-
Now, when you run the task, you can optionally specify a ``--iterations``
137+
Now, when you run the command, you can optionally specify a ``--iterations``
138138
flag:
139139

140140
.. code-block:: terminal

‎contributing/code/core_team.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
Symfony Core Team
22
=================
33

4-
This document states the rules that govern the Symfony Core group. These rules
4+
The **Symfony Core** team is the group of developers that determine the
5+
direction and evolution of the Symfony project. Their votes rule if the
6+
features and patches proposed by the community are approved or rejected.
7+
8+
All the Symfony Core members are long-time contributors with solid technical
9+
expertise and they have demonstrated a strong commitment to drive the project
10+
forward.
11+
12+
This document states the rules that govern the Symfony Core team. These rules
513
are effective upon publication of this document and all Symfony Core members
614
must adhere to said rules and protocol.
715

‎contributing/code/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ According to `Wikipedia`_:
1616
The License
1717
-----------
1818

19-
Copyright (c) 2004-2016 Fabien Potencier
19+
Copyright (c) 2004-2017 Fabien Potencier
2020

2121
Permission is hereby granted, free of charge, to any person obtaining a copy
2222
of this software and associated documentation files (the "Software"), to deal

‎contributing/code/security.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,11 @@ Security Advisories
103103
This section indexes security vulnerabilities that were fixed in Symfony
104104
releases, starting from Symfony 1.0.0:
105105

106-
* November 23, 2015: `CVE-2015-8125: Potential Remote Timing Attack Vulnerability in Security Remember-Me Service <http://symfony.com/blog/cve-2015-8125-potential-remote-timing-attack-vulnerability-in-security-remember-me-service>`_ (2.3.35, 2.6.12 and 2.7.7)
107-
* November 23, 2015: `CVE-2015-8124: Session Fixation in the "Remember Me" Login Feature <http://symfony.com/blog/cve-2015-8124-session-fixation-in-the-remember-me-login-feature>`_ (2.3.35, 2.6.12 and 2.7.7)
106+
* May 9, 2016: `CVE-2016-2403: Unauthorized access on a misconfigured Ldap server when using an empty password <http://symfony.com/blog/cve-2016-2403-unauthorized-access-on-a-misconfigured-ldap-server-when-using-an-empty-password>`_ (2.8.0-2.8.5, 3.0.0-3.0.5)
107+
* May 9, 2016: `CVE-2016-4423: Large username storage in session <https://symfony.com/blog/cve-2016-4423-large-username-storage-in-session>`_ (2.3.0-2.3.40, 2.7.0-2.7.12, 2.8.0-2.8.5, 3.0.0-3.0.5)
108+
* January 18, 2016: `CVE-2016-1902: SecureRandom's fallback not secure when OpenSSL fails <https://symfony.com/blog/cve-2016-1902-securerandom-s-fallback-not-secure-when-openssl-fails>`_ (2.3.0-2.3.36, 2.6.0-2.6.12, 2.7.0-2.7.8)
109+
* November 23, 2015: `CVE-2015-8125: Potential Remote Timing Attack Vulnerability in Security Remember-Me Service <https://symfony.com/blog/cve-2015-8125-potential-remote-timing-attack-vulnerability-in-security-remember-me-service>`_ (2.3.35, 2.6.12 and 2.7.7)
110+
* November 23, 2015: `CVE-2015-8124: Session Fixation in the "Remember Me" Login Feature <https://symfony.com/blog/cve-2015-8124-session-fixation-in-the-remember-me-login-feature>`_ (2.3.35, 2.6.12 and 2.7.7)
108111
* May 26, 2015: `CVE-2015-4050: ESI unauthorized access <https://symfony.com/blog/cve-2015-4050-esi-unauthorized-access>`_ (Symfony 2.3.29, 2.5.12 and 2.6.8)
109112
* April 1, 2015: `CVE-2015-2309: Unsafe methods in the Request class <https://symfony.com/blog/cve-2015-2309-unsafe-methods-in-the-request-class>`_ (Symfony 2.3.27, 2.5.11 and 2.6.6)
110113
* April 1, 2015: `CVE-2015-2308: Esi Code Injection <https://symfony.com/blog/cve-2015-2308-esi-code-injection>`_ (Symfony 2.3.27, 2.5.11 and 2.6.6)

‎create_framework/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Instead of an array for the URL map, the Routing component relies on a
5656

5757
$routes = new RouteCollection();
5858

59-
Let's add a route that describe the ``/hello/SOMETHING`` URL and add another
59+
Let's add a route that describes the ``/hello/SOMETHING`` URL and add another
6060
one for the simple ``/bye`` one::
6161

6262
use Symfony\Component\Routing\Route;

‎doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ in your application. To do this, run:
518518
your entities) with how it *actually* looks, and executes the SQL statements
519519
needed to *update* the database schema to where it should be. In other
520520
words, if you add a new property with mapping metadata to ``Product``
521-
and run this task, it will execute the "ALTER TABLE" statement needed
521+
and run this command, it will execute the "ALTER TABLE" statement needed
522522
to add that new column to the existing ``product`` table.
523523

524524
An even better way to take advantage of this functionality is via

‎doctrine/associations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ the class for you.
1818
--entity="AppBundle:Category" \
1919
--fields="name:string(255)"
2020
21-
This task generates the ``Category`` entity for you, with an ``id`` field,
21+
This command generates the ``Category`` entity for you, with an ``id`` field,
2222
a ``name`` field and the associated getter and setter functions.
2323

2424
Relationship Mapping Metadata

‎doctrine/console.rst

Lines changed: 2 additions & 2 deletions
  • 10000
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ command:
1616
A list of available commands will print out. You can find out more information
1717
about any of these commands (or any Symfony command) by running the ``help``
1818
command. For example, to get details about the ``doctrine:database:create``
19-
task, run:
19+
command, run:
2020

2121
.. code-block:: terminal
2222
2323
$ php bin/console help doctrine:database:create
2424
25-
Some notable or interesting tasks include:
25+
Some notable or interesting commands include:
2626

2727
* ``doctrine:ensure-production-settings`` - checks to see if the current
2828
environment is configured efficiently for production. This should always

‎forms.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,6 @@ the choice is ultimately up to you.
641641

642642
use AppBundle\Entity\Task;
643643
use Symfony\Component\OptionsResolver\OptionsResolver;
644-
use AppBundle\Entity\Task;
645644

646645
// ...
647646
public function configureOptions(OptionsResolver $resolver)

‎reference/dic_tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ kernel.cache_warmer
500500
process
501501

502502
Cache warming occurs whenever you run the ``cache:warmup`` or ``cache:clear``
503-
task (unless you pass ``--no-warmup`` to ``cache:clear``). It is also run
503+
command (unless you pass ``--no-warmup`` to ``cache:clear``). It is also run
504504
when handling the request, if it wasn't done by one of the commands yet.
505505
The purpose is to initialize any cache that will be needed by the application
506506
and prevent the first user from any significant "cache hit" where th 10000 e cache

‎security/acl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ First, you need to configure the connection the ACL system is supposed to use:
9191
domain objects. You can use whatever mapper you like for your objects, be it
9292
Doctrine ORM, MongoDB ODM, Propel, raw SQL, etc. The choice is yours.
9393

94-
After the connection is configured, you have to import the database structure.
95-
Fortunately, there is a task for this. Simply run the following command:
94+
After the connection is configured, you have to import the database structure
95+
running the following command:
9696

9797
.. code-block:: terminal
9898

‎security/custom_provider.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,6 @@ Now you make the user provider available as a service:
211211
dependencies or configuration options or other services. Add these as
212212
arguments in the service definition.
213213

214-
.. note::
215-
216-
Make sure the services file is being imported. See :ref:`service-container-imports-directive`
217-
for details.
218-
219214
Modify ``security.yml``
220215
-----------------------
221216

‎security/user_checkers.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,3 @@ It's possible to have a different user checker per firewall.
207207
),
208208
),
209209
));
210-
211-
.. note::
212-
213-
Internally the user checkers are aliased per firewall. For ``secured_area``
214-
the alias ``security.user_checker.secured_area`` would point to ``app.user_checker``.

‎testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ Injection Container::
457457
$container = $client->getContainer();
458458

459459
For a list of services available in your application, use the ``debug:container``
460-
console task.
460+
command.
461461

462462
.. tip::
463463

‎validation/groups.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ the class name or the string ``Default``.
166166
object that's actually the one being validated.
167167

168168
If you have inheritance (e.g. ``User extends BaseUser``) and you validate
169-
with the class name of the subclass (i.e. ``User``), then only constraints
170-
in the ``User`` will be validated. To validate the parent constraints as
171-
  well you need to provide multiple groups (i.e ``User`` and ``BaseUser``) or
172-
   ``Default``.
173-
169+
with the class name of the subclass (i.e. ``User``), then all constraints
170+
in the ``User`` and ``BaseUser`` will be validated. However, if you
171+
validate using the base class (i.e. ``BaseUser``), then only the default
172+
constraints in the ``BaseUser`` class will be validated.
173+
174174
To tell the validator to use a specific group, pass one or more group names
175175
as the third argument to the ``validate()`` method::
176176

0 commit comments

Comments
 (0)
0