Merge branch 'master' of http://github.com/symfony/symfony-docs

Author: Nathan Vonnahme

book/doctrine/orm.rst

@@ -291,7 +291,7 @@ can control. The following configuration options exist for a mapping:
 - ``dir`` Path to the mapping or entity files (depending on the driver). If
  this path is relative it is assumed to be relative to the bundle root. This
  only works if the name of your mapping is a bundle name. If you want to use
- this option to specifiy absolute paths you should prefix the path with the
+ this option to specify absolute paths you should prefix the path with the
  kernel parameters that exist in the DIC (for example %kernel.root_dir%).
 - ``prefix`` A common namespace prefix that all entities of this mapping
  share. This prefix should never conflict with prefixes of other defined
@@ -341,44 +341,6 @@ The following configuration shows a bunch of mapping examples:
  prefix: DoctrineExtensions\Entity\
  alias: DExt
 
-Registering Event Listeners and Subscribers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Doctrine uses the lightweight ``Doctrine\Common\EventManager`` class to trigger
-a number of different events which you can hook into. You can register Event
-Listeners or Subscribers by tagging the respective services with
-``doctrine.dbal.<connection>_event_listener`` or
-``doctrine.dbal.<connection>_event_subscriber`` using the Dependency Injection
-container.
-
-You have to use the name of the DBAL connection to clearly identify which
-connection the listeners should be registered with. If you are using multiple
-connections you can hook different events into each connection.
-
-.. code-block:: xml
-
- <container xmlns="http://symfony.com/schema/dic/services"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- <services>
-
- <service id="doctrine.extensions.versionable_listener" class="DoctrineExtensions\Versionable\VersionableListener">
- <tag name="doctrine.dbal.default_event_subscriber" />
- </service>
-
- <service id="mybundle.doctrine.mylistener" class="MyBundle\Doctrine\MyListener">
- <tag name="doctrine.dbal.default_event_listener" event="prePersist" />
- </service>
-
- </services>
-
- </container>
-
-Although the Event Listener and Subscriber tags are prefixed with ``doctrine.dbal``
-these tags also work for the ORM events. Internally Doctrine re-uses the EventManager
-that is registered with the connection for the ORM.
-
 Multiple Entity Managers
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -425,18 +387,50 @@ retrieve it from the Symfony Dependency Injection Container::
 The service ``doctrine.orm.entity_manager`` is an alias for the default entity
 manager defined in the ``default_entity_manager`` configuration option.
 
+Registering Event Listeners and Subscribers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+.. code-block:: xml
+
+ <container xmlns="http://symfony.com/schema/dic/services"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+ <services>
+
+ <service id="doctrine.extensions.versionable_listener" class="DoctrineExtensions\Versionable\VersionableListener">
+ <tag name="doctrine.dbal.default_event_subscriber" />
+ </service>
+
+ <service id="mybundle.doctrine.mylistener" class="MyBundle\Doctrine\MyListener">
+ <tag name="doctrine.dbal.default_event_listener" event="prePersist" />
+ </service>
+
+ </services>
+
+ </container>
+
+Although the Event Listener and Subscriber tags are prefixed with ``doctrine.dbal``
+these tags also work for the ORM events. Internally Doctrine re-uses the EventManager
+that is registered with the connection for the ORM.
+
 .. _doctrine-event-config:
 
 Registering Event Listeners and Subscribers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Doctrine ships with an event system that allows to hook into many different
-events happening during the lifecycle of entities or at other occasions.
+Doctrine uses the lightweight ``Doctrine\Common\EventManager`` class to
+trigger a number of different events which you can hook into. You can register
+Event Listeners or Subscribers by tagging the respective services with
+``doctrine.event_listener`` or ``doctrine.event_subscriber`` using the service
+container.
 
-To register services to act as event listeners or subscribers (listeners from here)
-you have to tag them with the appropriate names. Depending on your use-case you can hook
-a listener into every DBAL Connection and ORM Entity Manager or just into one
-specific DBAL connection and all the EntityManagers that use this connection.
+To register services to act as event listeners or subscribers (listeners from
+here) you have to tag them with the appropriate names. Depending on your
+use-case you can hook a listener into every DBAL Connection and ORM Entity
+Manager or just into one specific DBAL connection and all the EntityManagers
+that use this connection.
 
 .. configuration-block::
 
@@ -454,15 +448,15 @@ specific DBAL connection and all the EntityManagers that use this connection.
  my.listener:
  class: MyEventListener
  tags:
- - { name: doctrine.common.event_listener }
+ - { name: doctrine.event_listener }
  my.listener2:
  class: MyEventListener2
  tags:
- - { name: doctrine.dbal.default_event_listener }
+ - { name: doctrine.event_listener, connection: default }
  my.subscriber:
  class: MyEventSubscriber
  tags:
- - { name: doctrine.dbal.default_event_subscriber }
+ - { name: doctrine.event_subscriber, connection: default }
 
  .. code-block:: xml
 
@@ -478,13 +472,13 @@ specific DBAL connection and all the EntityManagers that use this connection.
 
  <services>
  <service id="my.listener" class="MyEventListener">
- <tag name="doctrine.common.event_listener" />
+ <tag name="doctrine.event_listener" />
  </service>
  <service id="my.listener2" class="MyEventListener2">
- <tag name="doctrine.dbal.default_event_listener" />
+ <tag name="doctrine.event_listener" connection="default" />
  </service>
  <service id="my.subscriber" class="MyEventSubscriber">
- <tag name="doctrine.dbal.default_event_subscriber" />
+ <tag name="doctrine.event_subscriber" connection="default" />
  </service>
  </services>
  </container>
@@ -552,34 +546,24 @@ types such as strings, integers and fields. However you can also integrate
 them nicely with associations.
 
 This is done by the help of a dedicated field:
-:class:`Symfony\\Component\\Form\\EntityChoiceField`. It provides a list of
+:class:`Symfony\\Bridge\\Doctrine\\Form\\Type\\EntityType`. It provides a list of
 choices from which an entity can be selected.
 
 .. code-block:: php
 
- use Symfony\Component\Form\EntityChoiceField;
+ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 
- $field = new EntityChoiceField('users', array(
- 'em' => $em,
- 'class' => 'Acme\\HelloBundle\\Entity\\User',
- 'property' => 'username',
- 'query_builder' => $qb,
+ $builder->add('users','entity',
+ array('class' => 'Acme\\HelloBundle\\Entity\\User',
  ));
 
- $form->addField($field);
-
-The 'em' option expects the EntityManager, the 'class' option expects the Entity
-class name as an argument. The optional 'property' option allows you to choose
-the property used to display the entity (``__toString`` will be used if not
-set). The optional 'query_builder' option expects a ``QueryBuilder`` instance or
+The required 'class' option expects the Entity class name as an argument.
+The optional 'property' option allows you to choose the property used to 
+display the entity (``__toString`` will be used if not set). 
+The optional 'query_builder' option expects a ``QueryBuilder`` instance or
 a closure receiving the repository as an argument and returning the QueryBuilder
 used to get the choices. If not set all entities will be used.
 
-.. tip::
-
- ``EntityChoiceField`` extends :class:`Symfony\\Component\\Form\\ChoiceField`
- so you can also give the array of choices with the 'choices' option instead
- of using a QueryBuilder.
 
 .. _documentation: http://www.doctrine-project.org/docs/orm/2.0/en
 .. _Doctrine: http://www.doctrine-project.org

book/forms.rst

@@ -142,7 +142,7 @@ helper functions:
 
  {# src/Acme/StoreBundle/Resources/views/Default/index.html.twig #}
 
- <form action="{{ path('store_product') }}" method="post">
+ <form action="{{ path('store_product') }}" method="post" {{ form_enctype(form) }}>
  {{ form_widget(form) }}
 
  <input type="submit" />
@@ -152,7 +152,7 @@ helper functions:
 
  <?php // src/Acme/StoreBundle/Resources/views/Default/index.html.php ?>
 
- <form action="<?php echo $view['router']->generate('store_product') ?>" method="post">
+ <form action="<?php echo $view['router']->generate('store_product') ?>" method="post" <?php echo $view['form']->enctype($form) ?> >
  <?php echo $view['form']->widget($form) ?>
 
  <input type="submit" />

book/from_flat_php_to_symfony2.rst

@@ -438,7 +438,7 @@ files in the application and to configure the autoloader:
 
  $loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
  $loader->registerNamespaces(array(
- 'Symfony'  => __DIR__.'/vendor/symfony/src',
+ 'Symfony' => __DIR__.'/vendor/symfony/src',
  ));
 
  $loader->register();

book/http_fundamentals.rst

@@ -320,7 +320,7 @@ Now, every request is handled exactly the same. Instead of individual URLs
 executing different PHP files, the front controller is *always* executed,
 and the routing of different URLs to different parts of your application
 is done internally. This solves both problems with the original approach.
-Almost all modern web apps do this - including apps like Wordpress.
+Almost all modern web apps do this - including apps like WordPress.
 
 Stay Organized
 ~~~~~~~~~~~~~~

book/internals/event_dispatcher.rst

@@ -228,7 +228,7 @@ define and document your event:
  * The onStoreOrder event is thrown each time an order is created
  * in the system.
  * 
- * The event listener recieves an Acme\StoreBundle\Event\FilterOrderEvent
+ * The event listener receives an Acme\StoreBundle\Event\FilterOrderEvent
  * instance.
  *
  * @var string

book/page_creation.rst

@@ -66,7 +66,7 @@ to the ``app/autoload.php`` file (see the :ref:`Autoloading sidebar<autoloading-
 .. code-block:: php
 
  $loader->registerNamespaces(array(
- 'Acme'  => __DIR__.'/../src',
+ 'Acme' => __DIR__.'/../src',
  // ...
  ));
 
@@ -268,7 +268,7 @@ of writing the HTML inside the controller, use a template instead::
 .. note::
 
  In order to use the ``render()`` method, you must extend the
- :class:`Symfony\Bundle\FrameworkBundle\Controller\Controller` class, which
+ :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` class, which
  adds shortcuts for tasks that are common inside controllers.
 
 The ``render()`` method creates a ``Response`` object filled with the content
@@ -466,7 +466,7 @@ about each of these directories in later chapters.
  behalf the instance you need a class::
  
  $loader->registerNamespaces(array(
- 'Acme'  => __DIR__.'/../src',
+ 'Acme' => __DIR__.'/../src',
  // ...
  ));
  
@@ -619,8 +619,8 @@ tools later.
 
 .. tip::
 
- Whenever creating a new bundle or using a third-party bundle, be sure
- to always make sure that the bundle has been enabled in ``registerBundles()``.
+ Whenever creating a new bundle or using a third-party bundle, always make
+ sure the bundle has been enabled in ``registerBundles()``.
 
 Bundle Directory Structure
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

book/service_container.rst

@@ -404,19 +404,19 @@ invokes the service container extension inside the ``FrameworkBundle``:
 
  # app/config/config.yml
  framework:
+ secret: xxxxxxxxxx
  charset: UTF-8
  error_handler: null
  csrf_protection:
  enabled: true
- secret: xxxxxxxxxx
  router: { resource: "%kernel.root_dir%/config/routing.yml" }
  # ...
 
  .. code-block:: xml
 
  <!-- app/config/config.xml -->
- <framework:config charset="UTF-8" error-handler="null">
- <framework:csrf-protection enabled="true" secret="xxxxxxxxxx" />
+ <framework:config charset="UTF-8" error-handler="null" secret="xxxxxxxxxx">
+ <framework:csrf-protection enabled="true" />
  <framework:router resource="%kernel.root_dir%/config/routing.xml" cache-warmer="true" />
  <!-- ... -->
  </framework>
@@ -425,9 +425,10 @@ invokes the service container extension inside the ``FrameworkBundle``:
 
  // app/config/config.php
  $container->loadFromExtension('framework', array(
+ 'secret' => 'xxxxxxxxxx',
  'charset' => 'UTF-8',
  'error_handler' => null,
- 'csrf-protection' => array('enabled' => true, 'secret' => 'xxxxxxxxxx'),
+ 'csrf-protection' => array('enabled' => true),
  'router' => array('resource' => '%kernel.root_dir%/config/routing.php'),
  // ...
  ));

book/templating.rst

@@ -1121,7 +1121,7 @@ and in Symfony2, that's absolutely fine.
 Learn more from the Cookbook
 ----------------------------
 
-* :doc:`/cookbook/controller/PHP`
+* :doc:`/cookbook/templating/PHP`
 * :doc:`/cookbook/controller/error_pages`
 
 .. _`Twig`: http://www.twig-project.org

book/testing.rst

@@ -664,9 +664,12 @@ The Client used by functional tests creates a Kernel that runs in a special
  toolbar: false
  intercept_redirects: false
 
- zend:
- logger:
- priority: debug
+ monolog:
+ handlers:
+ main:
+ type: stream
+ path: %kernel.logs_dir%/%kernel.environment%.log
+ level: debug
 
  .. code-block:: xml
 
@@ -685,9 +688,13 @@ The Client used by functional tests creates a Kernel that runs in a special
  <framework:test />
  </framework:config>
 
- <zend:config>
- <zend:logger priority="debug" />
- </zend:config>
+ <monolog:config>
+ <monolog:main
+ type="stream"
+ path="%kernel.logs_dir%/%kernel.environment%.log"
+ level="debug"
+ /> 
+ </monolog:config>
  </container>
 
  .. code-block:: php
@@ -705,9 +712,13 @@ The Client used by functional tests creates a Kernel that runs in a special
  'intercept-redirects' => false,
  ));
 
- $container->loadFromExtension('zend', array(
- 'logger' => array('priority' => 'debug'),
- ));
+ $container->loadFromExtension('monolog', array(
+ 'handlers' => array(
+ 'main' => array('type' => 'stream',
+ 'path' => '%kernel.logs_dir%/%kernel.environment%.log'
+ 'level' => 'debug')
+ 
+ )));
 
 You can also change the default environment (``test``) and override the
 default debug mode (``true``) by passing them as options to the