Merge pull request #2243 from WouterJ/revert_standard

Reverted array folding standard

Author: weaverryan

book/security.rst

@@ -1838,7 +1838,7 @@ setting:
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main'=> array(
-                    ...,
+                    // ...
                     'switch_user' => array('role' => 'ROLE_ADMIN', 'parameter' => '_want_to_be_this_user'),
                 ),
             ),

book/service_container.rst

@@ -490,7 +490,8 @@ invokes the service container extension inside the ``FrameworkBundle``:
             'form'            => array(),
             'csrf-protection' => array(),
             'router'          => array('resource' => '%kernel.root_dir%/config/routing.php'),
-            ...,
+
+            // ...
         ));
 
 When the configuration is parsed, the container looks for an extension that

book/templating.rst

@@ -1021,7 +1021,8 @@ configuration file:
 
         // app/config/config.php
         $container->loadFromExtension('framework', array(
-            ...,
+            // ...
+
             'templating' => array(
                 'engines' => array('twig'),
             ),

components/security/authentication.rst

@@ -180,7 +180,8 @@ receives an array of encoders::
     $encoders = array(
         'Symfony\\Component\\Security\\Core\\User\\User' => $defaultEncoder,
         'Acme\\Entity\\LegacyUser' => $weakEncoder,
-        ...,
+
+        // ...
     );
 
     $encoderFactory = new EncoderFactory($encoders);

contributing/documentation/overview.rst

@@ -188,17 +188,10 @@ An example::
         }
     }
 
-.. note::
-
-    * In Yaml you should put a space after ``{`` and before ``}`` (e.g. ``{ _controller: ... }``),
-      but this should not be done in Twig (e.g. ``{'hello' : 'value'}``).
-    * An array item is a part of a line, not a complete line. So you should
-      not use ``// ...`` but ``...,`` (the comma because of the Coding Standards)::
+.. caution::
 
-        array(
-            'some value',
-            ...,
-        )
+    In Yaml you should put a space after ``{`` and before ``}`` (e.g. ``{ _controller: ... }``),
+    but this should not be done in Twig (e.g.  ``{'hello' : 'value'}``).
 
 Reporting an Issue
 ------------------

cookbook/configuration/environments.rst

@@ -115,7 +115,8 @@ activated by modifying the default value in the ``dev`` configuration file:
 
         $container->loadFromExtension('web_profiler', array(
             'toolbar' => true,
-            ...,
+
+            // ...
         ));
 
 .. index::
@@ -205,9 +206,10 @@ environment by using this code and changing the environment string.
             $container->loadFromExtension('doctrine', array(
                 'dbal' => array(
                     'logging'  => '%kernel.debug%',
-                    ...,
+
+                    // ...
                 ),
-                ...
+                // ...
             ));
 
 .. index::

cookbook/configuration/pdo_session_storage.rst

@@ -82,7 +82,8 @@ configuration format of your choice):
         $container->loadFromExtension('framework', array(
             // ...
             'session' => array(
-                ...,
+                // ...
+
                 'storage_id' => 'session.storage.pdo',
             ),
         ));

cookbook/doctrine/custom_dql_functions.rst

@@ -59,10 +59,12 @@ In Symfony, you can register your custom DQL functions as follows:
         // app/config/config.php
         $container->loadFromExtension('doctrine', array(
             'orm' => array(
-                ...,
+                // ...
+
                 'entity_managers' => array(
                     'default' => array(
-                        ...,
+                        // ...
+
                         'dql' => array(
                             'string_functions' => array(
                                 'test_string'   => 'Acme\HelloBundle\DQL\StringFunction',

cookbook/email/email.rst

@@ -16,7 +16,8 @@ the power of the `Swiftmailer`_ library.
         public function registerBundles()
         {
             $bundles = array(
-                ...,
+                // ...
+
                 new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
             );
 

cookbook/email/spool.rst

@@ -47,7 +47,8 @@ In order to use the spool, use the following configuration:
 
         // app/config/config.php
         $container->loadFromExtension('swiftmailer', array(
-             ...,
+             // ...
+
             'spool' => array(
                 'type' => 'file',
                 'path' => '/path/to/spool',

cookbook/form/form_customization.rst

@@ -436,7 +436,8 @@ form is rendered.
             'form' => array('resources' => array(
                 'AcmeDemoBundle:Form:fields.html.twig',
              )),
-             ...,
+
+             // ...
         ));
 
 By default, Twig uses a *div* layout when rendering forms. Some people, however,
@@ -470,7 +471,8 @@ resource to use such a layout:
             'form' => array('resources' => array(
                 'form_table_layout.html.twig',
              )),
-             ...,
+
+             // ...
         ));
 
 If you only want to make the change in one template, add the following line to
@@ -525,7 +527,8 @@ form is rendered.
                 array('resources' => array(
                     'AcmeDemoBundle:Form',
              ))),
-             ...,
+
+             // ...
         ));
 
 By default, the PHP engine uses a *div* layout when rendering forms. Some people,
@@ -563,7 +566,8 @@ resource to use such a layout:
                 array('resources' => array(
                     'FrameworkBundle:FormTable',
              ))),
-             ...,
+
+             // ...
         ));
 
 If you only want to make the change in one template, add the following line to

cookbook/security/form_login.rst

@@ -67,7 +67,8 @@ the following config:
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array('form_login' => array(
-                    ...,
+                    // ...
+
                     'default_target_path' => '/admin',
                 )),
             ),
@@ -111,7 +112,8 @@ of what URL they had requested previously by setting the
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array('form_login' => array(
-                    ...,
+                    // ...
+
                     'always_use_default_target_path' => true,
                 )),
             ),
@@ -153,7 +155,8 @@ this by setting ``use_referer`` to true (it defaults to false):
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array('form_login' => array(
-                    ...,
+                    // ...
+
                     'use_referer' => true,
                 )),
             ),
@@ -282,7 +285,8 @@ following config:
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array('form_login' => array(
-                    ...,
+                    // ...
+
                     'failure_path' => login_failure,
                 )),
             ),

cookbook/security/securing_services.rst

@@ -260,7 +260,8 @@ documentation.
 
             // app/config/config.php
             $container->loadFromExtension('jms_security_extra', array(
-                ...,
+                // ...
+
                 'secure_all_services' => true,
             ));
 

cookbook/symfony1.rst

@@ -147,7 +147,8 @@ namespace in the ``vendor/bundle`` directory:
 
     // ...
     $loader->registerNamespaces(array(
-        ...,
+        // ...
+
         'Sensio'           => __DIR__.'/../vendor/bundles',
     ));
 

cookbook/templating/PHP.rst

@@ -38,7 +38,8 @@ your application configuration file:
     .. code-block:: php
 
         $container->loadFromExtension('framework', array(
-            ...,
+            // ...
+
             'templating'      => array(
                 'engines' => array('twig', 'php'),
             ),