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

Author: javiereguiluz

.platform.app.yaml

@@ -57,4 +57,5 @@ hooks:
       export PIP_USER=
       pip install pip==9.0.1 wheel==0.29.0
       pip install -r _build/.requirements.txt
+      find .virtualenv -type f -name "*.rst" -delete
       make -C _build html

.travis.yml

@@ -6,9 +6,9 @@ sudo: false
 cache:
   directories: [$HOME/.cache/pip]
 
-install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
+install: pip install -r _build/.requirements.txt
 
-script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
+script: make -C _build SPHINXOPTS=-nW html
 
 branches:
   except:

_build/.requirements.txt

@@ -1,14 +1,13 @@
-alabaster==0.7.9
-Babel==2.3.4
+alabaster==0.7.10
+Babel==2.4.0
 docutils==0.13.1
 imagesize==0.7.1
-Jinja2==2.9.4
-MarkupSafe==0.23
+Jinja2==2.9.6
+MarkupSafe==1.0
 Pygments==2.2.0
-pytz==2016.10
+pytz==2017.2
 requests==2.12.5
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.5.2
+Sphinx==1.3.6
 git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
-

_build/redirection_map

@@ -162,7 +162,7 @@
 /cookbook/form/inherit_data_option /form/inherit_data_option
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
-/cookbook/frontend/bower /frontend/bower
+/cookbook/frontend/bower /frontend
 /cookbook/frontend/index /frontend
 /cookbook/install/unstable_versions /setup/unstable_versions
 /cookbook/install/bundles /setup/bundles

contributing/code/standards.rst

@@ -186,7 +186,7 @@ Naming Conventions
 * Use camelCase, not underscores, for variable, function and method
   names, arguments;
 
-* Use underscores for option names and parameter names;
+* Use underscores for configuration options and parameters;
 
 * Use namespaces for all classes;
 

deployment.rst

@@ -197,7 +197,7 @@ Don't forget that deploying your application also involves updating any dependen
 (typically via Composer), migrating your database, clearing your cache and
 other potential things like pushing assets to a CDN (see `Common Post-Deployment Tasks`_).
 
-.. _`Capifony`: http://capifony.org/
+.. _`Capifony`: https://github.com/everzet/capifony
 .. _`Capistrano`: http://capistranorb.com/
 .. _`sf2debpkg`: https://github.com/liip/sf2debpkg
 .. _`Fabric`: http://www.fabfile.org/

email.rst

@@ -103,7 +103,7 @@ an email is pretty straightforward::
 
     public function indexAction($name)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('[email protected]')
             ->setTo('[email protected]')
             ->setBody(
@@ -125,6 +125,7 @@ an email is pretty straightforward::
             )
             */
         ;
+
         $this->get('mailer')->send($message);
 
         return $this->render(...);

email/dev_environment.rst

@@ -100,7 +100,7 @@ Now, suppose you're sending an email to ``[email protected]``.
 
     public function indexAction($name)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('[email protected]')
             ->setTo('[email protected]')
             ->setBody(
@@ -110,6 +110,7 @@ Now, suppose you're sending an email to ``[email protected]``.
                 )
             )
         ;
+
         $this->get('mailer')->send($message);
 
         return $this->render(...);

email/testing.rst

@@ -14,7 +14,7 @@ Start with an easy controller action that sends an email::
 
     public function sendEmailAction($name)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('[email protected]')
             ->setTo('[email protected]')
             ->setBody('You should see me from the profiler!')

form/type_guesser.rst

@@ -136,7 +136,7 @@ With this knowledge, you can easily implement the ``guessType()`` method of the
             $phpdoc = $reflectionProperty->getDocComment();
 
             // parse the $phpdoc into an array like:
-            // array('type' => 'string', 'since' => '1.0')
+            // array('var' => 'string', 'since' => '1.0')
             $phpdocTags = ...;
 
             return $phpdocTags;