Skip to content

Commit c095ebd

Browse files
committed
Merge branch '2.0'
Conflicts: book/routing.rst
2 parents 0e043a7 + 240cf46 commit c095ebd

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

book/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pattern that points to a specific PHP class and method:
8888
{
8989
public function showAction($slug)
9090
{
91-
$blog = // use the $slug varible to query the database
91+
$blog = // use the $slug variable to query the database
9292
9393
return $this->render('AcmeBlogBundle:Blog:show.html.twig', array(
9494
'blog' => $blog,

book/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ document::
262262
$this->assertGreaterThan(0, $crawler->filter('h2.subtitle')->count());
263263

264264
// Assert that there are exactly 4 h2 tags on the page
265-
$this->assertCount(4, $crawler->filter('h2')->count());
265+
$this->assertCount(4, $crawler->filter('h2'));
266266

267267
// Assert that the "Content-Type" header is "application/json"
268268
$this->assertTrue($client->getResponse()->headers->contains('Content-Type', 'application/json'));

components/dependency_injection/compilation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ each into some other service.
4848
Registering a Compiler Pass
4949
---------------------------
5050

51-
You need to register your custom pass with the container. Tts process method
51+
You need to register your custom pass with the container. Its process method
5252
will then be called when the container is compiled::
5353

5454
use Symfony\Component\DependencyInjection\ContainerBuilder;

components/dependency_injection/factories.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
How to Use a Factory to Create Services
2-
=======================================
1+
Using a Factory to Create Services
2+
==================================
33

44
Symfony2's Service Container provides a powerful way of controlling the
55
creation of objects, allowing you to specify arguments passed to the constructor

components/dependency_injection/parentservices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
How to Manage Common Dependencies with Parent Services
2-
======================================================
1+
Managing Common Dependencies with Parent Services
2+
=================================================
33

44
As you add more functionality to your application, you may well start to have
55
related classes that share some of the same dependencies. For example you

components/dependency_injection/tags.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. index::
22
single: Service Container; Tags
33

4-
How to make your Services use Tags
5-
==================================
4+
Working with Tagged Services
5+
============================
66

77
Tags are a generic string (along with some options) that can be applied to
88
any service. By themselves, tags don't actually the functionality of your

0 commit comments

Comments
 (0)