Merge remote-tracking branch 'upstream/3.3' into 3.3

Author: javiereguiluz

components/workflow.rst

@@ -44,8 +44,8 @@ these statuses are called **places**. You can define the workflow like this::
     use Symfony\Component\Workflow\Workflow;
     use Symfony\Component\Workflow\MarkingStore\SingleStateMarkingStore;
 
-    $definition = new DefinitionBuilder();
-    $definition->addPlaces(['draft', 'review', 'rejected', 'published'])
+    $definitionBuilder = new DefinitionBuilder();
+    $definition = $definitionBuilder->addPlaces(['draft', 'review', 'rejected', 'published'])
         // Transitions are defined with a unique name, an origin place and a destination place
         ->addTransition(new Transition('to_review', 'draft', 'review'))
         ->addTransition(new Transition('publish', 'review', 'published'))

contributing/code/standards.rst

@@ -226,7 +226,8 @@ Service Naming Conventions
 Documentation
 -------------
 
-* Add PHPDoc blocks for all classes, methods, and functions;
+* Add PHPDoc blocks for all classes, methods, and functions (though you may
+  be asked to remove PHPDoc that do not add value);
 
 * Group annotations together so that annotations of the same type immediately
   follow each other, and annotations of a different type are separated by a

frontend/encore/babel.rst

@@ -19,13 +19,39 @@ Need to extend the Babel configuration further? The easiest way is via
         // first, install any presets you want to use (e.g. yarn add babel-preset-es2017)
         // then, modify the default Babel configuration
         .configureBabel(function(babelConfig) {
+            // add additional presets
             babelConfig.presets.push('es2017');
+
+            // no plugins are added by default, but you can add some
+            // babelConfig.plugins = ['styled-jsx/babel'];
         })
     ;
 
-You can also create a standard ``.babelrc`` file at the root of your project.
-Just make sure to configure it with all the presets you need: as soon as a
-``.babelrc`` is present, Encore can no longer add *any* Babel configuration for
-you!
+Creating a .babelrc File
+------------------------
+
+Instead of calling ``configureBabel()``, you could create a ``.babelrc`` file
+at the root of your project. This is a more "standard" way of configuring
+Babel, but it has a downside: as soon as a ``.babelrc`` file is present,
+**Encore can no longer add any Babel configuration for you**. For example,
+if you call ``Encore.enableReactPreset()``, the ``react`` preset will *not*
+automatically be added to Babel: you must add it yourself in ``.babelrc``.
+
+An example ``.babelrc`` file might look like this:
+
+.. code-block:: json
+
+    {
+        presets: [
+            ['env', {
+                modules: false,
+                targets: {
+                    browsers: '> 1%',
+                    uglify: true
+                },
+                useBuiltIns: true
+            }]
+        ]
+    }
 
 .. _`Babel`: http://babeljs.io/

reference/constraints/Blank.rst

@@ -1,10 +1,18 @@
 Blank
 =====
 
-Validates that a value is blank, defined as equal to a blank string or equal
-to ``null``. To force that a value strictly be equal to ``null``, see the
-:doc:`/reference/constraints/IsNull` constraint. To force that a value is
-*not* blank, see :doc:`/reference/constraints/NotBlank`.
+Validates that a value is blank - meaning equal to an empty string or ``null``::
+
+    if ('' !== $value && null !== $value) {
+        // validation will fail
+    }
+
+To force that a value strictly be equal to ``null``, see the
+:doc:`/reference/constraints/IsNull` constraint.
+
+
+To force that a value is *not* blank, see :doc:`/reference/constraints/NotBlank`.
+But be careful as ``NotBlank`` is *not* strictly the opposite of ``Blank``.
 
 +----------------+---------------------------------------------------------------------+
 | Applies to     | :ref:`property or method <validation-property-target>`              |

reference/constraints/NotBlank.rst

@@ -1,9 +1,14 @@
 NotBlank
 ========
 
-Validates that a value is not blank, defined as not strictly ``false``,
-not equal to a blank string and also not equal to ``null``. To force that
-a value is simply not equal to ``null``, see the
+Validates that a value is not blank - meaning not equal to a blank string,
+a blank array or ``null``::
+
+    if (false === $value || (empty($value) && '0' != $value)) {
+        // validation will fail
+    }
+
+To force that a value is simply not equal to ``null``, see the
 :doc:`/reference/constraints/NotNull` constraint.
 
 +----------------+------------------------------------------------------------------------+

reference/requirements.rst

@@ -6,50 +6,29 @@
 Requirements for Running Symfony
 ================================
 
-To run Symfony, your system needs to adhere to a list of requirements. You
-can easily see if your system passes all requirements by running the
-``web/config.php`` in your Symfony distribution. Since the CLI often uses
-a different ``php.ini`` configuration file, it's also a good idea to check
-your requirements from the command line via:
+Symfony 3.3 requires **PHP 5.5.9** or higher to run, in addition to other minor
+requirements. To make things simple, Symfony provides a tool to quickly check if
+your system meets all those requirements.
 
-.. code-block:: terminal
-
-    $ php bin/symfony_requirements
-
-Below is the list of required and optional requirements.
+Beware that PHP can define a different configuration for the command console and
+the web server, so you need to check requirements in both environments.
 
-Required
---------
+Checking Requirements for the Web Server
+----------------------------------------
 
-* PHP needs to be a minimum version of PHP 5.5.9
-* `JSON extension`_ needs to be enabled
-* `ctype extension`_ needs to be enabled
-* Your ``php.ini`` needs to have the ``date.timezone`` setting
+Symfony includes a ``config.php`` file in the ``web/`` directory of your project.
+Open that file with your browser to check the requirements.
 
-Optional
---------
+Once you've fixed all the reported issues, delete the ``web/config.php`` file
+to avoid leaking internal information about your application to visitors.
 
-* You need to have the PHP-XML module installed
-* You need to have at least version 2.6.21 of libxml
-* PHP tokenizer needs to be enabled
-* mbstring functions need to be enabled
-* iconv needs to be enabled
-* POSIX needs to be enabled (only on \*nix)
-* Intl needs to be installed with ICU 4+
-* APC 3.0.17+ (or another opcode cache needs to be installed)
-* ``php.ini`` recommended settings
+Checking Requirements for the Command Console
+---------------------------------------------
 
-  * ``short_open_tag = Off``
-  * ``magic_quotes_gpc = Off``
-  * ``register_globals = Off``
-  * ``session.auto_start = Off``
+Open your console or terminal, enter in your project directory, execute this
+command and fix the reported issues:
 
-Doctrine
---------
-
-If you want to use Doctrine, you will need to have PDO installed. Additionally,
-you need to have the PDO driver installed for the database server you want
-to use.
+.. code-block:: terminal
 
-.. _`JSON extension`: https://php.net/manual/book.json.php
-.. _`ctype extension`: https://php.net/manual/book.ctype.php
+    $ cd my-project/
+    $ php bin/symfony_requirements

service_container/3.3-di-changes.rst

@@ -78,7 +78,7 @@ Symfony Standard Edition:
 
                 <prototype namespace="AppBundle\" resource="../../src/AppBundle/*" exclude="../../src/AppBundle/{Entity,Repository}" />
 
-                <prototype namespace="AppBundle\Controller" resource="../../src/AppBundle/Controller" public="true">
+                <prototype namespace="AppBundle\Controller\" resource="../../src/AppBundle/Controller" public="true">
                     <tag name="controller.service_arguments" />
                 </prototype>
             </services>
@@ -338,7 +338,7 @@ The third big change is that, in a new Symfony 3.3 project, your controllers are
             <services>
                 <!-- ... -->
 
-                <prototype namespace="AppBundle\Controller" resource="../../src/AppBundle/Controller" public="true">
+                <prototype namespace="AppBundle\Controller\" resource="../../src/AppBundle/Controller" public="true">
                     <tag name="controller.service_arguments" />
                 </prototype>
             </services>