Merge branch '2.0'

weaverryan · weaverryan · commit 8fd3422d242a · 2012-05-20T13:19:54.000-05:00
diff --git a/book/testing.rst b/book/testing.rst
@@ -145,7 +145,7 @@ for its ``DemoController`` (`DemoControllerTest`_) that reads as follows::
 
             $crawler = $client->request('GET', '/demo/hello/Fabien');
 
-            $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
+            $this->assertGreaterThan(0, $crawler->filter('html:contains("Hello Fabien")')->count());
         }
     }
 
@@ -211,7 +211,7 @@ that it actually does what you expect it to. Use the Crawler to make assertions
 on the DOM::
 
     // Assert that the response matches a given CSS selector.
-    $this->assertTrue($crawler->filter('h1')->count() > 0);
+    $this->assertGreaterThan(0, $crawler->filter('h1')->count());
 
 Or, test against the Response content directly if you just want to assert that
 the content contains some text, or if the Response is not an XML/HTML
@@ -259,10 +259,10 @@ document::
     useful test assertions::
 
         // Assert that there is more than one h2 tag with the class "subtitle"
-        $this->assertTrue($crawler->filter('h2.subtitle')->count() > 0);
+        $this->assertGreaterThan(0, $crawler->filter('h2.subtitle')->count());
 
         // Assert that there are exactly 4 h2 tags on the page
-        $this->assertEquals(4, $crawler->filter('h2')->count());
+        $this->assertCount(4, $crawler->filter('h2')->count());
 
         // Assert the the "Content-Type" header is "application/json"
         $this->assertTrue($client->getResponse()->headers->contains('Content-Type', 'application/json'));
diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst
@@ -246,6 +246,22 @@ So far, this works great, but this doesn't allow you to dynamically add new
 tags or delete existing tags. So, while editing existing tags will work
 great, your user can't actually add any new tags yet.
 
+.. caution::
+
+    In this entry, we embed only one collection, but you are not limited
+    to this. You can also embed nested collection as many level down as you
+    like. But if you use Xdebug in your development setup, you may receive
+    a ``Maximum function nesting level of '100' reached, aborting!`` error.
+    This is due to the ``xdebug.max_nesting_level`` PHP setting, which defaults
+    to ``100``.
+
+    This directive limits recursion to 100 calls which may not be enough for
+    rendering the form in the template if you render the whole form at
+    once (e.g ``form_widget(form)``). To fix this you can set this directive
+    to a higher value (either via a PHP ini file or via :phpfunction:`ini_set`,
+    for example in ``app/autoload.php``) or render each form field by hand
+    using ``form_row``.
+
 .. _cookbook-form-collections-new-prototype:
 
 Allowing "new" tags with the "prototype"
@@ -622,4 +638,4 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     each Tag object itself.
 
 
-.. _`Owning Side and Inverse Side`: http://docs.doctrine-project.org/en/latest/reference/unitofwork-associations.html
+.. _`Owning Side and Inverse Side`: http://docs.doctrine-project.org/en/latest/reference/unitofwork-associations.html
diff --git a/cookbook/testing/profiling.rst b/cookbook/testing/profiling.rst
@@ -28,10 +28,10 @@ environment)::
             // Check that the profiler is enabled
             if ($profile = $client->getProfile()) {
                 // check the number of requests
-                $this->assertTrue($profile->getCollector('db')->getQueryCount() < 10);
+                $this->assertLessThan(10, $profile->getCollector('db')->getQueryCount());
 
                 // check the time spent in the framework
-                $this->assertTrue( $profile->getCollector('timer')->getTime() < 0.5);
+                $this->assertLessThan(0.5, $profile->getCollector('timer')->getTime());
             }
         }
     }
@@ -40,8 +40,9 @@ If a test fails because of profiling data (too many DB queries for instance),
 you might want to use the Web Profiler to analyze the request after the tests
 finish. It's easy to achieve if you embed the token in the error message::
 
-    $this->assertTrue(
-        $profile->get('db')->getQueryCount() < 30,
+    $this->assertLessThan(
+        30,
+        $profile->get('db')->getQueryCount(),
         sprintf('Checks that query count is less than 30 (token %s)', $profile->getToken())
     );
 
