Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 93028665aa38 · 2016-12-25T14:59:06.000+01:00
* 2.7:
  Update routing.rst
  fix build command for Linux
  Changing field type in MySQL example
  Fixed wrong inheritance information
  Mention schema validation command
  [Console] Reword a subheading of console/logging.rst
  Fix spelling error in Travis CI code
  PHP sample had mistake
diff --git a/components/routing.rst b/components/routing.rst
@@ -35,7 +35,7 @@ your autoloader to load the Routing component::
     use Symfony\Component\Routing\RouteCollection;
     use Symfony\Component\Routing\Route;
 
-    $route = new Route('/foo', array('controller' => 'MyController'));
+    $route = new Route('/foo', array('_controller' => 'MyController'));
     $routes = new RouteCollection();
     $routes->add('route_name', $route);
 
@@ -44,7 +44,7 @@ your autoloader to load the Routing component::
     $matcher = new UrlMatcher($routes, $context);
 
     $parameters = $matcher->match('/foo');
-    // array('controller' => 'MyController', '_route' => 'route_name')
+    // array('_controller' => 'MyController', '_route' => 'route_name')
 
 .. note::
 
@@ -102,7 +102,7 @@ Take the following route, which combines several of these ideas::
 
    $route = new Route(
        '/archive/{month}', // path
-       array('controller' => 'showArchive'), // default values
+       array('_controller' => 'showArchive'), // default values
        array('month' => '[0-9]{4}-[0-9]{2}', 'subdomain' => 'www|m'), // requirements
        array(), // options
        '{subdomain}.example.com', // host
@@ -114,7 +114,7 @@ Take the following route, which combines several of these ideas::
 
    $parameters = $matcher->match('/archive/2012-01');
    // array(
-   //     'controller' => 'showArchive',
+   //     '_controller' => 'showArchive',
    //     'month' => '2012-01',
    //     'subdomain' => 'www',
    //     '_route' => ...
@@ -279,7 +279,7 @@ have to provide the name of a PHP file which returns a :class:`Symfony\\Componen
     $collection = new RouteCollection();
     $collection->add(
         'route_name',
-        new Route('/foo', array('controller' => 'ExampleController'))
+        new Route('/foo', array('_controller' => 'ExampleController'))
     );
     // ...
 
diff --git a/console/logging.rst b/console/logging.rst
@@ -167,12 +167,15 @@ service configuration. Your method receives a
 :class:`Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent` object,
 which has methods to get information about the event and the exception.
 
-Logging non-0 Exit Statuses
+.. _logging-non-0-exit-statuses:
+
+Logging Error Exit Statuses
 ---------------------------
 
 The logging capabilities of the console can be further extended by logging
-non-0 exit statuses. This way you will know if a command had any errors, even
-if no exceptions were thrown.
+commands that return error exit statuses, which are any number different than
+zero. This way you will know if a command had any errors, even if no exceptions
+were thrown.
 
 First configure a listener for console terminate events in the service container:
 
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -280,7 +280,8 @@ purposes following these steps:
    .. code-block:: terminal
 
        # Linux and macOS
-       $ ./_build/make html
+       $ cd _build/
+       $ make html
 
        # Windows
        $ _build\make html
diff --git a/doctrine.rst b/doctrine.rst
@@ -382,6 +382,15 @@ see the :ref:`doctrine-field-types` section.
         class Product
         // ...
 
+.. tip::
+
+    After creating your entities you should validate the mappings with the
+    following command::
+
+    .. code-block:: terminal
+
+        $ php bin/console doctrine:schema:validate
+
 .. _doctrine-generating-getters-and-setters:
 
 Generating Getters and Setters
diff --git a/doctrine/pdo_session_storage.rst b/doctrine/pdo_session_storage.rst
@@ -190,7 +190,7 @@ MySQL
 .. code-block:: sql
 
     CREATE TABLE `sessions` (
-        `sess_id` VARBINARY(128) NOT NULL PRIMARY KEY,
+        `sess_id` VARCHAR(128) NOT NULL PRIMARY KEY,
         `sess_data` BLOB NOT NULL,
         `sess_time` INTEGER UNSIGNED NOT NULL,
         `sess_lifetime` MEDIUMINT NOT NULL
diff --git a/reference/constraints/NotEqualTo.rst b/reference/constraints/NotEqualTo.rst
@@ -102,7 +102,7 @@ the following:
         {
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
-                $metadata->addPropertyConstraint('age', new Assert\NotEqualTo('Mary'));
+                $metadata->addPropertyConstraint('firstName', new Assert\NotEqualTo('Mary'));
 
                 $metadata->addPropertyConstraint('age', new Assert\NotEqualTo(array(
                     'value' => 15,
diff --git a/setup/bundles.rst b/setup/bundles.rst
@@ -151,7 +151,7 @@ following recommended configuration as the starting point of your own configurat
             - php: 5.6
               env: SYMFONY_VERSION='3.1.*'
             - php: 5.6
-              env: DEPENDENCES='dev' SYMFONY_VERSION='3.2.*@dev'
+              env: DEPENDENCIES='dev' SYMFONY_VERSION='3.2.*@dev'
 
     before_install:
         - composer self-update
diff --git a/validation/groups.rst b/validation/groups.rst
@@ -166,11 +166,11 @@ the class name or the string ``Default``.
     object that's actually the one being validated.
 
     If you have inheritance (e.g. ``User extends BaseUser``) and you validate
-    with the class name of the subclass (i.e. ``User``), then all constraints
-    in the ``User`` and ``BaseUser`` will be validated. However, if you
-    validate using the base class (i.e. ``BaseUser``), then only the default
-    constraints in the ``BaseUser`` class will be validated.
-
+    with the class name of the subclass (i.e. ``User``), then only constraints
+    in the ``User`` will be validated. To validate the parent constraints as 
+    well you need to provide multiple groups (i.e ``User`` and ``BaseUser``) or
+    ``Default``.
+    
 To tell the validator to use a specific group, pass one or more group names
 as the third argument to the ``validate()`` method::
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ the following:`
`102`	`102`	`{`
`103`	`103`	`public static function loadValidatorMetadata(ClassMetadata $metadata)`
`104`	`104`	`{`
`105`		`- $metadata->addPropertyConstraint('age', new Assert\NotEqualTo('Mary'));`
	`105`	`+ $metadata->addPropertyConstraint('firstName', new Assert\NotEqualTo('Mary'));`
`106`	`106`
`107`	`107`	`$metadata->addPropertyConstraint('age', new Assert\NotEqualTo(array(`
`108`	`108`	`'value' => 15,`