cookbook 2.5 updates

Author: petk

book/routing.rst

@@ -64,7 +64,7 @@ Sedaj je lahko uporabljen iz predloge:
 
     .. code-block:: html+php
 
-        <?php foreach ($view['assetic']->images(
+        <?php foreach ($view['assetic']->image(
             array('@AcmeFooBundle/Resources/public/images/example.jpg'),
             array('jpegoptim')
         ) as $url): ?>

cookbook/assetic/jpeg_optimize.rst

@@ -68,7 +68,7 @@ stilov:
 
 .. note::
 
-    Windows uporabniki si morajo posodobiti nastavitve na ustrezno java lokacijo.
+    Windows uporabniki si morajo posodobiti nastavitve na ustrezno Java lokacijo.
     V Windows7 x64 bit je privzeto ``C:\Program Files (x86)\Java\jre6\bin\java.exe``.
 
 Sedaj imate dostop do dveh novih Assetic filtrov v vaši aplikaciji:
@@ -156,12 +156,12 @@ uporabi ta filter samo, ko je razhroščevalni način onemogočen.
 .. tip::
 
     Namesto dodajanja filtra k značkam sredstev, ga lahko tudi globalno
-    omogočite z dodatkom t.i. apply-to-attribute v nastavitvah filtra, na primer
-    v filtru yui_js ``apply_to: "\.js$"``. Da imate samo filter
-    uporabljen v produkciji, dodajte to v config_prod datoteko namesto v skupno
+    omogočite z dodatkom t.i. ``apply-to-attribute`` v nastavitvah filtra, na primer
+    v filtru ``yui_js`` ``apply_to: "\.js$"``. Da imate samo filter
+    uporabljen v produkciji, dodajte to v ``config_prod`` datoteko namesto v skupno
     config datoteko. Za podrobnosti o uporabi filtrov glede na končnico datoteke,
     glejte :ref:`cookbook-assetic-apply-to`.
 
 .. _`YUI Compressor`: http://developer.yahoo.com/yui/compressor/
-.. _`Prenesite JAR`: http://yuilibrary.com/projects/yuicompressor/
+.. _`Prenesite JAR`: https://github.com/yui/yuicompressor/releases
 .. _`deprecation process`: http://www.yuiblog.com/blog/2012/10/16/state-of-yui-compressor/

cookbook/assetic/yuicompressor.rst

@@ -56,7 +56,7 @@ class name.
 .. note::
 
     Symfony2 core Bundles do not prefix the Bundle class with ``Symfony``
-    and always add a ``Bundle`` subnamespace; for example:
+    and always add a ``Bundle`` sub-namespace; for example:
     :class:`Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle`.
 
 Each bundle has an alias, which is the lower-cased short version of the bundle
@@ -154,7 +154,7 @@ All classes and files must follow the Symfony2 coding
 Some classes should be seen as facades and should be as short as possible, like
 Commands, Helpers, Listeners, and Controllers.
 
-Classes that connect to the Event Dispatcher should be suffixed with
+Classes that connect to the event dispatcher should be suffixed with
 ``Listener``.
 
 Exceptions classes should be stored in an ``Exception`` sub-namespace.
@@ -290,4 +290,4 @@ Learn more from the Cookbook
 
 * :doc:`/cookbook/bundles/extension`
 
-.. _standards: http://symfony.com/PSR0
+.. _standards: http://www.php-fig.org/psr/psr-0/

cookbook/bundles/best_practices.rst

@@ -11,7 +11,7 @@ you'll see a number of different configuration "namespaces", such as ``framework
 you to configure things at a high level and then let the bundle make all the
 low-level, complex changes that result.
 
-For example, the following tells the ``FrameworkBundle`` to enable the form
+For example, the following tells the FrameworkBundle to enable the form
 integration, which involves the defining of quite a few services as well
 as integration of other related components:
 
@@ -62,15 +62,15 @@ When you create a bundle, you have two choices on how to handle configuration:
 The second option - which you'll learn about in this article - is much more
 flexible, but also requires more time to setup. If you're wondering which
 method you should use, it's probably a good idea to start with method #1,
-and then change to #2 later if you need to. If you plan to distribute your 
+and then change to #2 later if you need to. If you plan to distribute your
 bundle, the second option is recommended.
 
 The second method has several specific advantages:
 
 * Much more powerful than simply defining parameters: a specific option value
   might trigger the creation of many service definitions;
 
-* Ability to have configuration hierarchy
+* Ability to have configuration hierarchy;
 
 * Smart merging when several configuration files (e.g. ``config_dev.yml``
   and ``config.yml``) override each other's configuration;
@@ -89,9 +89,14 @@ The second method has several specific advantages:
     supported configuration settings for which backward compatibility will
     be maintained.
 
+.. seealso::
+
+    For parameter handling within a Dependency Injection class see
+    :doc:`/cookbook/configuration/using_parameters_in_dic`.
+
 .. index::
    single: Bundle; Extension
-   single: Dependency Injection; Extension
+   single: DependencyInjection; Extension
 
 Creating an Extension Class
 ---------------------------
@@ -177,6 +182,52 @@ You can begin specifying configuration under this namespace immediately:
     array. You can still provide some sensible defaults for your bundle if
     you want.
 
+Registering the Extension Class
+-------------------------------
+
+An Extension class will automatically be registered by Symfony2 when
+following these simple conventions:
+
+* The extension must be stored in the ``DependencyInjection`` sub-namespace;
+
+* The extension must be named after the bundle name and suffixed with
+  ``Extension`` (``AcmeHelloExtension`` for ``AcmeHelloBundle``);
+
+* The extension *should* provide an XSD schema (but will be registered automatically
+  regardless).
+
+Manually Registering an Extension Class
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When not following the conventions, you will have to manually register your
+extension. To manually register an extension class override the
+:method:`Bundle::build() <Symfony\\Component\\HttpKernel\\Bundle\\Bundle::build>`
+method in your bundle::
+
+    // ...
+    use Acme\HelloBundle\DependencyInjection\UnconventionalExtensionClass;
+
+    class AcmeHelloBundle extends Bundle
+    {
+        public function build(ContainerBuilder $container)
+        {
+            parent::build($container);
+
+            // register extensions that do not follow the conventions manually
+            $container->registerExtension(new UnconventionalExtensionClass());
+        }
+    }
+
+In this case, the extension class must also implement a ``getAlias()`` method
+and return a unique alias named after the bundle (e.g. ``acme_hello``). This
+is required because the class name doesn't follow the conventions by ending
+in ``Extension``.
+
+Additionally, the ``load()`` method of your extension will *only* be called
+if the user specifies the ``acme_hello`` alias in at least one configuration
+file. Once again, this is because the Extension class doesn't follow the
+conventions set out above, so nothing happens automatically.
+
 Parsing the ``$configs`` Array
 ------------------------------
 
@@ -494,7 +545,7 @@ configuration arrays together.
 The ``Configuration`` class can be much more complicated than shown here,
 supporting array nodes, "prototype" nodes, advanced validation, XML-specific
 normalization and advanced merging. You can read more about this in
-:doc:`the Config Component documentation </components/config/definition>`.
+:doc:`the Config component documentation </components/config/definition>`.
 You can also see it in action by checking out some of the core Configuration classes,
 such as the one from the `FrameworkBundle Configuration`_ or the `TwigBundle Configuration`_.
 
@@ -504,19 +555,19 @@ Modifying the configuration of another Bundle
 If you have multiple bundles that depend on each other, it may be useful
 to allow one ``Extension`` class to modify the configuration passed to another
 bundle's ``Extension`` class, as if the end-developer has actually placed that
-configuration in his/her ``app/config/config.yml`` file.
+configuration in their ``app/config/config.yml`` file.
 
 For more details, see :doc:`/cookbook/bundles/prepend_extension`.
 
 Default Configuration Dump
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ``config:dump-reference`` command allows a bundle's default configuration to
-be output to the console in yaml.
+be output to the console in YAML.
 
 As long as your bundle's configuration is located in the standard location
 (``YourBundle\DependencyInjection\Configuration``) and does not have a
-``__construct()`` it will work automatically.  If you have something
+``__construct()`` it will work automatically. If you have something
 different, your ``Extension`` class must override the
 :method:`Extension::getConfiguration() <Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension::getConfiguration>`
 method and return an instance of your
@@ -552,52 +603,11 @@ Comments and examples can be added to your configuration nodes using the
         }
     }
 
-This text appears as yaml comments in the output of the ``config:dump-reference``
+This text appears as YAML comments in the output of the ``config:dump-reference``
 command.
 
 .. index::
    pair: Convention; Configuration
 
-Extension Conventions
----------------------
-
-When creating an extension, follow these simple conventions:
-
-* The extension must be stored in the ``DependencyInjection`` sub-namespace;
-
-* The extension must be named after the bundle name and suffixed with
-  ``Extension`` (``AcmeHelloExtension`` for ``AcmeHelloBundle``);
-
-* The extension should provide an XSD schema.
-
-If you follow these simple conventions, your extensions will be registered
-automatically by Symfony2. If not, override the
-:method:`Bundle::build() <Symfony\\Component\\HttpKernel\\Bundle\\Bundle::build>`
-method in your bundle::
-
-    // ...
-    use Acme\HelloBundle\DependencyInjection\UnconventionalExtensionClass;
-
-    class AcmeHelloBundle extends Bundle
-    {
-        public function build(ContainerBuilder $container)
-        {
-            parent::build($container);
-
-            // register extensions that do not follow the conventions manually
-            $container->registerExtension(new UnconventionalExtensionClass());
-        }
-    }
-
-In this case, the extension class must also implement a ``getAlias()`` method
-and return a unique alias named after the bundle (e.g. ``acme_hello``). This
-is required because the class name doesn't follow the standards by ending
-in ``Extension``.
-
-Additionally, the ``load()`` method of your extension will *only* be called
-if the user specifies the ``acme_hello`` alias in at least one configuration
-file. Once again, this is because the Extension class doesn't follow the
-standards set out above, so nothing happens automatically.
-
 .. _`FrameworkBundle Configuration`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
 .. _`TwigBundle Configuration`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php

cookbook/bundles/extension.rst

@@ -12,8 +12,8 @@ things like controllers, templates, and other files in a bundle's
 
 For example, suppose that you're installing the `FOSUserBundle`_, but you
 want to override its base ``layout.html.twig`` template, as well as one of
-its controllers. Suppose also that you have your own ``AcmeUserBundle``
-where you want the overridden files to live. Start by registering the ``FOSUserBundle``
+its controllers. Suppose also that you have your own AcmeUserBundle
+where you want the overridden files to live. Start by registering the FOSUserBundle
 as the "parent" of your bundle::
 
     // src/Acme/UserBundle/AcmeUserBundle.php
@@ -29,7 +29,7 @@ as the "parent" of your bundle::
         }
     }
 
-By making this simple change, you can now override several parts of the ``FOSUserBundle``
+By making this simple change, you can now override several parts of the FOSUserBundle
 simply by creating a file with the same name.
 
 .. note::
@@ -41,7 +41,7 @@ Overriding Controllers
 ~~~~~~~~~~~~~~~~~~~~~~
 
 Suppose you want to add some functionality to the ``registerAction`` of a
-``RegistrationController`` that lives inside ``FOSUserBundle``. To do so,
+``RegistrationController`` that lives inside FOSUserBundle. To do so,
 just create your own ``RegistrationController.php`` file, override the bundle's
 original method, and change its functionality::
 
@@ -79,11 +79,11 @@ Overriding Resources: Templates, Routing, etc
 Most resources can also be overridden, simply by creating a file in the same
 location as your parent bundle.
 
-For example, it's very common to need to override the ``FOSUserBundle``'s
+For example, it's very common to need to override the FOSUserBundle's
 ``layout.html.twig`` template so that it uses your application's base layout.
-Since the file lives at ``Resources/views/layout.html.twig`` in the ``FOSUserBundle``,
-you can create your own file in the same location of ``AcmeUserBundle``.
-Symfony will ignore the file that lives inside the ``FOSUserBundle`` entirely,
+Since the file lives at ``Resources/views/layout.html.twig`` in the FOSUserBundle,
+you can create your own file in the same location of AcmeUserBundle.
+Symfony will ignore the file that lives inside the FOSUserBundle entirely,
 and use your file instead.
 
 The same goes for routing files and some other resources.

cookbook/bundles/inheritance.rst

@@ -13,7 +13,7 @@ Add Composer Dependencies
 In Symfony, dependencies are managed with Composer. It's a good idea to learn
 some basics of Composer in `their documentation`_.
 
-Before you can use composer to install a bundle, you should look for a
+Before you can use Composer to install a bundle, you should look for a
 `Packagist`_ package of that bundle. For example, if you search for the popular
 `FOSUserBundle`_ you will find a package called `friendsofsymfony/user-bundle`_.
 
@@ -36,7 +36,7 @@ this happens, you can try a different version.
 Now you can add the bundle to your ``composer.json`` file and update the
 dependencies. You can do this manually:
 
-1. **Add it to the composer.json file:**
+1. **Add it to the ``composer.json`` file:**
 
    .. code-block:: json
 
@@ -132,7 +132,7 @@ Other Setup
 -----------
 
 At this point, check the ``README`` file of your brand new bundle to see
-what do to next.
+what to do next.
 
 .. _their documentation: http://getcomposer.org/doc/00-intro.md
 .. _Packagist:           https://packagist.org

cookbook/bundles/installation.rst

@@ -53,7 +53,7 @@ v jedru FrameworkBundle paketa:
 
         # app/config/config.yml
         parameters:
-            translator.class:      Acme\HelloBundle\Translation\Translator
+            translator.class: Acme\HelloBundle\Translation\Translator
 
     .. code-block:: xml