Merge branch '2.0' into 2.1

Author: weaverryan

CONTRIBUTING.md

@@ -0,0 +1,5 @@
+Contributing
+------------
+
+We love contributors! For more information on how you can contribute to the
+Symfony documentation, please read [Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html) 

book/doctrine.rst

@@ -722,7 +722,7 @@ To do this, add the name of the repository class to your mapping definition.
         use Doctrine\ORM\Mapping as ORM;
 
         /**
-         * @ORM\Entity(repositoryClass="Acme\StoreBundle\Repository\ProductRepository")
+         * @ORM\Entity(repositoryClass="Acme\StoreBundle\Entity\ProductRepository")
          */
         class Product
         {
@@ -734,7 +734,7 @@ To do this, add the name of the repository class to your mapping definition.
         # src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.yml
         Acme\StoreBundle\Entity\Product:
             type: entity
-            repositoryClass: Acme\StoreBundle\Repository\ProductRepository
+            repositoryClass: Acme\StoreBundle\Entity\ProductRepository
             # ...
 
     .. code-block:: xml
@@ -745,7 +745,7 @@ To do this, add the name of the repository class to your mapping definition.
         <doctrine-mapping>
 
             <entity name="Acme\StoreBundle\Entity\Product"
-                    repository-class="Acme\StoreBundle\Repository\ProductRepository">
+                    repository-class="Acme\StoreBundle\Entity\ProductRepository">
                     <!-- ... -->
             </entity>
         </doctrine-mapping>
@@ -763,8 +763,8 @@ ordered alphabetically.
 
 .. code-block:: php
 
-    // src/Acme/StoreBundle/Repository/ProductRepository.php
-    namespace Acme\StoreBundle\Repository;
+    // src/Acme/StoreBundle/Entity/ProductRepository.php
+    namespace Acme\StoreBundle\Entity;
 
     use Doctrine\ORM\EntityRepository;
 
@@ -1090,7 +1090,7 @@ Of course, if you know up front that you'll need to access both objects, you
 can avoid the second query by issuing a join in the original query. Add the
 following method to the ``ProductRepository`` class::
 
-    // src/Acme/StoreBundle/Repository/ProductRepository.php
+    // src/Acme/StoreBundle/Entity/ProductRepository.php
     public function findOneByIdJoinedToCategory($id)
     {
         $query = $this->getEntityManager()

book/routing.rst

@@ -1020,6 +1020,12 @@ instead of simply ``/hello/{name}``:
 The string ``/admin`` will now be prepended to the pattern of each route
 loaded from the new routing resource.
 
+.. tip::
+
+    You can also define routes using annotations. See the
+    :doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
+    to see how.
+
 .. index::
    single: Routing; Debugging
 

components/dependency_injection/compilation.rst

@@ -61,7 +61,10 @@ A very simple extension may just load configuration files into the container::
     {
         public function load(array $configs, ContainerBuilder $container)
         {
-            $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+            $loader = new XmlFileLoader(
+                $container,
+                new FileLocator(__DIR__.'/../Resources/config')
+            );
             $loader->load('services.xml');
         }
 
@@ -225,7 +228,10 @@ but also load a secondary one only if a certain parameter is set::
         $processor = new Processor();
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader(
+            $container,
+            new FileLocator(__DIR__.'/../Resources/config')
+        );
         $loader->load('services.xml');
 
         if ($config['advanced']) {
@@ -309,7 +315,10 @@ For example, to run your custom pass after the default removal passes have been
     use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 
     $container = new ContainerBuilder();
-    $container->addCompilerPass(new CustomCompilerPass, PassConfig::TYPE_AFTER_REMOVING);
+    $container->addCompilerPass(
+        new CustomCompilerPass,
+        PassConfig::TYPE_AFTER_REMOVING
+    );
 
 .. _components-dependency-injection-dumping:
 
@@ -357,7 +366,10 @@ it::
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
+        file_put_contents(
+            $file,
+            $dumper->dump(array('class' => 'MyCachedContainer'))
+        );
     }
 
 You will now get the speed of the PHP configured container with the ease of using
@@ -386,7 +398,10 @@ but getting an up to date configuration whilst developing your application::
 
         if (!$isDebug) {
             $dumper = new PhpDumper($container);
-            file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
+            file_put_contents(
+                $file,
+                $dumper->dump(array('class' => 'MyCachedContainer'))
+            );
         }
     }
 

components/dependency_injection/index.rst

@@ -12,4 +12,5 @@
     factories
     parentservices
     advanced
+    workflow
 

components/dependency_injection/tags.rst

@@ -128,14 +128,22 @@ custom tag::
     {
         public function process(ContainerBuilder $container)
         {
-            if (false === $container->hasDefinition('acme_mailer.transport_chain')) {
+            if (!$container->hasDefinition('acme_mailer.transport_chain')) {
                 return;
             }
 
-            $definition = $container->getDefinition('acme_mailer.transport_chain');
-
-            foreach ($container->findTaggedServiceIds('acme_mailer.transport') as $id => $attributes) {
-                $definition->addMethodCall('addTransport', array(new Reference($id)));
+            $definition = $container->getDefinition(
+                'acme_mailer.transport_chain'
+            );
+
+            $taggedServices = $container->findTaggedServiceIds(
+                'acme_mailer.transport'
+            );
+            foreach ($taggedServices as $id => $attributes) {
+                $definition->addMethodCall(
+                    'addTransport',
+                    array(new Reference($id))
+                );
             }
         }
     }
@@ -242,15 +250,23 @@ use this, update the compiler::
     {
         public function process(ContainerBuilder $container)
         {
-            if (false === $container->hasDefinition('acme_mailer.transport_chain')) {
+            if (!$container->hasDefinition('acme_mailer.transport_chain')) {
                 return;
             }
 
-            $definition = $container->getDefinition('acme_mailer.transport_chain');
+            $definition = $container->getDefinition(
+                'acme_mailer.transport_chain'
+            );
 
-            foreach ($container->findTaggedServiceIds('acme_mailer.transport') as $id => $tagAttributes) {
+            $taggedServices = $container->findTaggedServiceIds(
+                'acme_mailer.transport'
+            );
+            foreach ($taggedServices as $id => $tagAttributes) {
                 foreach ($tagAttributes as $attributes) {
-                    $definition->addMethodCall('addTransport', array(new Reference($id), $attributes["alias"]));
+                    $definition->addMethodCall(
+                        'addTransport',
+                        array(new Reference($id), $attributes["alias"])
+                    );
                 }
             }
         }

components/dependency_injection/workflow.rst

@@ -24,7 +24,7 @@ Working with cached Container
 Before building it, the kernel checks to see if a cached version of the container
 exists. The ``HttpKernel`` has a debug setting and if this is false, the
 cached version is used if it exists. If debug is true then the kernel
-:doc:`checks to see if configuration is fresh<components/config/caching>`
+:doc:`checks to see if configuration is fresh</components/config/caching>`
 and if it is, the cached version of the container is. If not then the container
 is built from the application-level configuration and the bundles's extension
 configuration.
@@ -51,11 +51,11 @@ Bundle-level Configuration with Extensions
 
 By convention, each bundle contains an Extension class which is in the bundle's
 ``DependencyInjection`` directory. These are registered with the ``ContainerBuilder``
-when the kernel is booted. When the ``ContainerBuilder`` is :doc:`compiled<components/dependency-injection/compilation>`,
+when the kernel is booted. When the ``ContainerBuilder`` is :doc:`/compiled<components/dependency-injection/compilation>`,
 the application-level configuration relevant to the bundle's extension is
 passed to the Extension which also usually loads its own config file(s), typically from the bundle's
 ``Resources/config`` directory. The application-level config is usually processed
-with a :doc:`Configuration object<components/config/definition>` also stored
+with a :doc:`Configuration object</components/config/definition>` also stored
 in the bundle's ``DependencyInjection`` directory.
 
 Compiler passes to allow Interaction between Bundles

components/map.rst.inc

@@ -28,6 +28,7 @@
   * :doc:`/components/dependency_injection/factories`
   * :doc:`/components/dependency_injection/parentservices`
   * :doc:`/components/dependency_injection/advanced`
+  * :doc:`/components/dependency_injection/workflow`
 
 * **DOM Crawler**
 

cookbook/bundles/best_practices.rst

@@ -172,7 +172,7 @@ the ``Tests/`` directory. Tests should follow the following principles:
   a sample application;
 * The functional tests should only be used to test the response output and
   some profiling information if you have some;
-* The code coverage should at least covers 95% of the code base.
+* The tests should cover at least 95% of the code base.
 
 .. note::
    A test suite must not contain ``AllTests.php`` scripts, but must rely on the

cookbook/controller/service.rst

@@ -44,3 +44,22 @@ on how to perform many common tasks.
     bundle that will be used in many different projects. So, even if you don't
     specify your controllers as services, you'll likely see this done in some
     open-source Symfony2 bundles.
+
+Using Annotation Routing
+------------------------
+
+When using annotations to setup routing when using a controller defined as a
+service, you need to specify your service as follows::
+
+    /**
+     * @Route("/blog", service="my_bundle.annot_controller")
+     * @Cache(expires="tomorrow")
+     */
+    class AnnotController extends Controller
+    {
+    }
+
+In this example, ``my_bundle.annot_controller`` should be the id of the
+``AnnotController`` instance defined in the service container. This is
+documented in the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/routing`
+chapter.

cookbook/templating/twig_extension.rst

@@ -26,15 +26,12 @@ As an example we will create a price filter to format a given number into price:
     // src/Acme/DemoBundle/Twig/AcmeExtension.php
     namespace Acme\DemoBundle\Twig;
 
-    use Twig_Extension;
-    use Twig_Filter_Method;
-
-    class AcmeExtension extends Twig_Extension
+    class AcmeExtension extends \Twig_Extension
     {
         public function getFilters()
         {
             return array(
-                'price' => new Twig_Filter_Method($this, 'priceFilter'),
+                'price' => new \Twig_Filter_Method($this, 'priceFilter'),
             );
         }