Merge remote-tracking branch 'upstream/master'

Author: javiereguiluz

.platform.app.yaml

@@ -0,0 +1,55 @@
+# This file describes an application. You can have multiple applications
+# in the same project.
+
+# The name of this app. Must be unique within a project.
+name: symfonydocs
+
+# The toolstack used to build the application.
+type: "php"
+
+build:
+    flavor: "composer"
+
+# The configuration of app when it is exposed to the web.
+web:
+    # The public directory of the app, relative to its root.
+    document_root: "/_build/html"
+    index_files:
+      - index.html
+    whitelist:
+      - \.html$
+      - \.txt$
+
+      # CSS and Javascript.
+      - \.css$
+      - \.js$
+      - \.hbs$
+
+      # image/* types.
+      - \.gif$
+      - \.png$
+      - \.ico$
+      - \.svgz?$
+
+      # fonts types.
+      - \.ttf$
+      - \.eot$
+      - \.woff$
+      - \.otf$
+
+      # robots.txt.
+      - /robots\.txt$
+
+# The size of the persistent disk of the application (in MB).
+disk: 512
+
+# Build time dependencies.
+dependencies:
+  python:
+    sphinx: ">=1"
+
+# The hooks that will be performed when the package is deployed.
+hooks:
+    build: |
+      pip install git+https://github.com/fabpot/sphinx-php.git
+      make html

.platform/routes.yaml

@@ -0,0 +1,16 @@
+http://www.{default}/:
+  to: http://{default}/
+  type: redirect
+http://{default}/:
+  cache:
+    cookies:
+    - '*'
+    default_ttl: 0
+    enabled: true
+    headers:
+    - Accept
+    - Accept-Language
+  ssi:
+    enabled: false
+  type: upstream
+  upstream: symfonydocs:php

.platform/services.yaml

@@ -0,0 +1 @@
+# Keeping this file empty to not deploy unused services.

.travis.yml

@@ -1,16 +1,18 @@
 language: python
 
-python:
-    - "2.7"
+python: "2.7"
 
 sudo: false
 
-install: 
-    - "pip install -q -r requirements.txt --use-mirrors"
+cache:
+    directories:
+        - $HOME/.cache/pip
+        - _build
+
+install: pip install sphinx==1.1.3
 
 script: sphinx-build -nW -b html -d _build/doctrees . _build/html
 
 branches:
   except:
     - github-comments
-

README.markdown

@@ -14,3 +14,8 @@ Contributing
 We love contributors! For more information on how you can contribute to the
 Symfony documentation, please read
 [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
+
+Platform.sh
+-----------
+
+Pull requests are automatically built by [Platform.sh](https://platform.sh).

book/forms.rst

@@ -1145,6 +1145,8 @@ the choice is ultimately up to you.
 
         $form->get('dueDate')->setData(new \DateTime());
 
+.. _form-as-services:
+
 Defining your Forms as Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

book/http_fundamentals.rst

@@ -96,9 +96,11 @@ delete a specific blog entry, for example:
 
 .. note::
 
-    There are actually nine HTTP methods defined by the HTTP specification,
-    but many of them are not widely used or supported. In reality, many modern
-    browsers don't even support the ``PUT`` and ``DELETE`` methods.
+    There are actually nine HTTP methods (also known as verbs) defined by
+    the HTTP specification, but many of them are not widely used or supported.
+    In reality, many modern browsers only support ``POST`` and ``GET`` in 
+    HTML forms. Various others are however supported in XMLHttpRequests,
+    as well as by Symfony's router.  
 
 In addition to the first line, an HTTP request invariably contains other
 lines of information called request headers. The headers can supply a wide

book/installation.rst

@@ -127,7 +127,7 @@ based on `Composer`_.
 
 Composer is the dependency manager used by modern PHP applications and it can
 also be used to create new applications based on the Symfony Framework. If you
-don't have installed it globally, start by reading the next section.
+don't have it installed globally, start by reading the next section.
 
 Installing Composer Globally
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

book/routing.rst

@@ -830,36 +830,36 @@ be accomplished with the following route configuration:
         class MainController extends Controller
         {
             /**
-             * @Route("/contact")
+             * @Route("/news")
              * @Method("GET")
              */
-            public function contactAction()
+            public function newsAction()
             {
-                // ... display contact form
+                // ... display your news
             }
 
             /**
              * @Route("/contact")
-             * @Method("POST")
+             * @Method({"GET", "POST"})
              */
-            public function processContactAction()
+            public function contactFormAction()
             {
-                // ... process contact form
+                // ... display and process a contact form
             }
         }
 
     .. code-block:: yaml
 
         # app/config/routing.yml
-        contact:
-            path:     /contact
-            defaults: { _controller: AppBundle:Main:contact }
+        news:
+            path:     /news
+            defaults: { _controller: AppBundle:Main:news }
             methods:  [GET]
 
-        contact_process:
+        contact_form:
             path:     /contact
-            defaults: { _controller: AppBundle:Main:processContact }
-            methods:  [POST]
+            defaults: { _controller: AppBundle:Main:contactForm }
+            methods:  [GET, POST]
 
     .. code-block:: xml
 
@@ -870,12 +870,12 @@ be accomplished with the following route configuration:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="contact" path="/contact" methods="GET">
-                <default key="_controller">AppBundle:Main:contact</default>
+            <route id="news" path="/news" methods="GET">
+                <default key="_controller">AppBundle:Main:news</default>
             </route>
 
-            <route id="contact_process" path="/contact" methods="POST">
-                <default key="_controller">AppBundle:Main:processContact</default>
+            <route id="contact_form" path="/contact" methods="GET|POST">
+                <default key="_controller">AppBundle:Main:contactForm</default>
             </route>
         </routes>
 
@@ -886,13 +886,13 @@ be accomplished with the following route configuration:
         use Symfony\Component\Routing\Route;
 
         $collection = new RouteCollection();
-        $collection->add('contact', new Route('/contact', array(
+        $collection->add('news', new Route('/news', array(
             '_controller' => 'AppBundle:Main:contact',
         ), array(), array(), '', array(), array('GET')));
 
-        $collection->add('contact_process', new Route('/contact', array(
-            '_controller' => 'AppBundle:Main:processContact',
-        ), array(), array(), '', array(), array('POST')));
+        $collection->add('contact_form', new Route('/contact', array(
+            '_controller' => 'AppBundle:Main:contactForm',
+        ), array(), array(), '', array(), array('GET', 'POST')));
 
         return $collection;
 

book/security.rst

@@ -994,10 +994,10 @@ other users. Also, as the admin user, you yourself want to be able to edit
 
 To accomplish this you have 2 options:
 
-* :doc:`Voters </cookbook/security/voters_data_permission>` allow you to
-  use business logic (e.g. the user can edit this post because they were
-  the creator) to determine access. You'll probably want this option - it's
-  flexible enough to solve the above situation.
+* :doc:`Voters </cookbook/security/voters>` allow you to write own business logic
+  (e.g. the user can edit this post because they were the creator) to determine
+  access. You'll probably want this option - it's flexible enough to solve the
+  above situation.
 
 * :doc:`ACLs </cookbook/security/acl>` allow you to create a database structure
   where you can assign *any* arbitrary user *any* access (e.g. EDIT, VIEW)
@@ -1378,7 +1378,7 @@ Learn More from the Cookbook
 
 * :doc:`Forcing HTTP/HTTPS </cookbook/security/force_https>`
 * :doc:`Impersonating a User </cookbook/security/impersonating_user>`
-* :doc:`/cookbook/security/voters_data_permission`
+* :doc:`/cookbook/security/voters`
 * :doc:`Access Control Lists (ACLs) </cookbook/security/acl>`
 * :doc:`/cookbook/security/remember_me`
 * :doc:`/cookbook/security/multiple_user_providers`