From 8c60a4829699dda05cabc5d7c4388945858881b1 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 12 Jan 2017 09:19:18 +0100 Subject: [PATCH 1/2] this note was only relevant for php 5.3 --- tutorial/getting-started.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tutorial/getting-started.rst b/tutorial/getting-started.rst index 6f13c4e1..6f9b9fc5 100644 --- a/tutorial/getting-started.rst +++ b/tutorial/getting-started.rst @@ -148,13 +148,6 @@ to reduce code duplication:: } } -.. note:: - - Traits are only available as of PHP 5.4. If you are running a lesser - version of PHP you may copy the above code into each class to have the - same effect. You may not, however, ``extend`` one class from the other, as - this will cause unintended behavior in the admin integration later on. - The ``Page`` class is therefore nice and simple:: // src/AppBundle/Document/Page.php From df0e7fe00b6590a6d30f335a5cccbdb5561de224 Mon Sep 17 00:00:00 2001 From: Damien Flament Date: Wed, 25 Jan 2017 22:18:47 +0100 Subject: [PATCH 2/2] render() is a Twig function, not a block Correct a typo which cause a Twig exception because the _render_ block is called but it doesn't exist. --- bundles/create/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/create/introduction.rst b/bundles/create/introduction.rst index 26848967..10c1c398 100644 --- a/bundles/create/introduction.rst +++ b/bundles/create/introduction.rst @@ -368,7 +368,7 @@ higher, the method reads: .. code-block:: jinja - {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %} + {{ render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) }} .. code-block:: php