Skip to content

S
Silex
Commit 97ea0e5b authored by Fabien Potencier's avatar Fabien Potencier
Browse files
Options

Merge branch '1.3' 

* 1.3:
  Fix return of renderView to string
  updated docs for 1.3
  Add mention of patch method to usage docs

Conflicts:
	doc/cookbook/multiple_loggers.rst
	doc/intro.rst
	doc/providers.rst
	doc/services.rst
	doc/usage.rst
parents 3d4cf2fe 909c3464
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 264 deletions
doc/contributing.rst
View file @ 97ea0e5b
Contributing Contributing
============ ============
We are open to contributions to the Silex code. If you find We are open to contributions to the Silex code. If you find a bug or want to
a bug or want to contribute a provider, just follow these contribute a provider, just follow these steps:
steps.
* Fork `the Silex repository <https://github.com/silexphp/Silex>`_ * Fork `the Silex repository <https://github.com/silexphp/Silex>`_;
on github.
* Make your feature addition or bug fix. * Make your feature addition or bug fix;
* Add tests for it. This is important so we don't break it in a future version unintentionally. * Add tests for it;
* Optionally, add some technical documentation. * Optionally, add some documentation;
* `Send a pull request <https://help.github.com/articles/creating-a-pull-request>`_, to the correct `target branch`_. * `Send a pull request
Bonus points for topic branches. <https://help.github.com/articles/creating-a-pull-request>`_, to the correct
`target branch`_.
If you have a big change or would like to discuss something, If you have a big change or would like to discuss something,
please join us on the `mailing list please join us on the `mailing list
......
doc/cookbook/error_handler.rst
View file @ 97ea0e5b
Converting Errors to Exceptions Converting Errors to Exceptions
=============================== ===============================
Silex will catch exceptions that are thrown from within a request/response Silex catches exceptions that are thrown from within a request/response cycle.
cycle. It will however *not* catch PHP errors and notices. You can catch them However, it does *not* catch PHP errors and notices. This recipe tells you how
by converting them to exceptions, this recipe will tell you how. to catch them by converting them to exceptions.
Why does Silex not do this?
---------------------------
Silex could do this automatically in theory, but there is a reason why it does
not. Silex acts as a library, this means that it does not mess with any global
state. Since error handlers are global in PHP, it is your responsibility as a
user to register them.
Registering the ErrorHandler Registering the ErrorHandler
---------------------------- ----------------------------
Fortunately, the ``Symfony/Debug`` package has an ``ErrorHandler`` class that The ``Symfony/Debug`` package has an ``ErrorHandler`` class that solves this
solves this issue. It converts all errors to exceptions, and exceptions can be problem. It converts all errors to exceptions, and exceptions are then caught
caught by Silex. by Silex.
You register it by calling the static ``register`` method:: Register it by calling the static ``register`` method::
use Symfony\Component\Debug\ErrorHandler; use Symfony\Component\Debug\ErrorHandler;
ErrorHandler::register(); ErrorHandler::register();
It is recommended that you do this in your front controller, i.e. It is recommended that you do this as early as possible.
``web/index.php``.
Handling fatal errors Handling fatal errors
--------------------- ---------------------
......
doc/cookbook/form_no_csrf.rst
View file @ 97ea0e5b
...@@ -2,13 +2,13 @@ Disabling CSRF Protection on a Form using the FormExtension ...@@ -2,13 +2,13 @@ Disabling CSRF Protection on a Form using the FormExtension
=========================================================== ===========================================================
The *FormExtension* provides a service for building form in your application The *FormExtension* provides a service for building form in your application
with the Symfony2 Form component. By default, the *FormExtension* uses the with the Symfony Form component. By default, the *FormExtension* uses the
CSRF Protection avoiding Cross-site request forgery, a method by which a CSRF Protection avoiding Cross-site request forgery, a method by which a
malicious user attempts to make your legitimate users unknowingly submit data malicious user attempts to make your legitimate users unknowingly submit data
that they don't intend to submit. that they don't intend to submit.
You can find more details about CSRF Protection and CSRF token in the You can find more details about CSRF Protection and CSRF token in the
`Symfony2 Book `Symfony Book
<http://symfony.com/doc/current/book/forms.html#csrf-protection>`_. <http://symfony.com/doc/current/book/forms.html#csrf-protection>`_.
In some cases (for example, when embedding a form in an html email) you might In some cases (for example, when embedding a form in an html email) you might
...@@ -30,6 +30,6 @@ Going further ...@@ -30,6 +30,6 @@ Going further
This specific example showed how to change the ``csrf_protection`` in the This specific example showed how to change the ``csrf_protection`` in the
``$options`` parameter of the ``createBuilder()`` function. More of them could ``$options`` parameter of the ``createBuilder()`` function. More of them could
be passed through this parameter, it is as simple as using the Symfony2 be passed through this parameter, it is as simple as using the Symfony
``getDefaultOptions()`` method in your form classes. `See more here ``getDefaultOptions()`` method in your form classes. `See more here
<http://symfony.com/doc/current/book/forms.html#book-form-creating-form-classes>`_. <http://symfony.com/doc/current/book/forms.html#book-form-creating-form-classes>`_.
doc/cookbook/multiple_loggers.rst
View file @ 97ea0e5b
Using multiple Monolog Loggers Using multiple Monolog Loggers
============================== ==============================
Having separate instances of `Monolog` for different parts of your system is Having separate instances of Monolog for different parts of your system is
often desirable and allows you to configure them independently, allowing for fine often desirable and allows you to configure them independently, allowing for fine
grained control of where your logging goes and in what detail. grained control of where your logging goes and in what detail.
......
doc/cookbook/session_storage.rst
View file @ 97ea0e5b
...@@ -2,12 +2,11 @@ Using PdoSessionStorage to store Sessions in the Database ...@@ -2,12 +2,11 @@ Using PdoSessionStorage to store Sessions in the Database
========================================================= =========================================================
By default, the :doc:`SessionServiceProvider </providers/session>` writes By default, the :doc:`SessionServiceProvider </providers/session>` writes
session information in files using Symfony2 NativeFileSessionStorage. Most session information in files using Symfony NativeFileSessionStorage. Most
medium to large websites use a database to store sessions instead of files, medium to large websites use a database to store sessions instead of files,
because databases are easier to use and scale in a multi-webserver because databases are easier to use and scale in a multi-webserver environment.
environment.
Symfony2's `NativeSessionStorage Symfony's `NativeSessionStorage
<http://api.symfony.com/master/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.html>`_ <http://api.symfony.com/master/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.html>`_
has multiple storage handlers and one of them uses PDO to store sessions, has multiple storage handlers and one of them uses PDO to store sessions,
`PdoSessionHandler `PdoSessionHandler
...@@ -88,5 +87,5 @@ PdoSessionStorage needs a database table with 3 columns: ...@@ -88,5 +87,5 @@ PdoSessionStorage needs a database table with 3 columns:
* ``session_time``: Time column (INTEGER) * ``session_time``: Time column (INTEGER)
You can find examples of SQL statements to create the session table in the You can find examples of SQL statements to create the session table in the
`Symfony2 cookbook `Symfony cookbook
<http://symfony.com/doc/current/cookbook/configuration/pdo_session_storage.html#example-sql-statements>`_ <http://symfony.com/doc/current/cookbook/configuration/pdo_session_storage.html#example-sql-statements>`_
doc/cookbook/sub_requests.rst
View file @ 97ea0e5b
...@@ -33,7 +33,7 @@ By calling ``handle``, you can make a sub-request manually. Here's an example:: ...@@ -33,7 +33,7 @@ By calling ``handle``, you can make a sub-request manually. Here's an example::
There's some more things that you need to keep in mind though. In most cases There's some more things that you need to keep in mind though. In most cases
you will want to forward some parts of the current master request to the you will want to forward some parts of the current master request to the
sub-request. That includes: Cookies, server information, session. sub-request like cookies, server information, or the session.
Here is a more advanced example that forwards said information (``$request`` Here is a more advanced example that forwards said information (``$request``
holds the master request):: holds the master request)::
...@@ -122,12 +122,8 @@ constructing a request:: ...@@ -122,12 +122,8 @@ constructing a request::
This is something to be aware of when making sub-requests by hand. This is something to be aware of when making sub-requests by hand.
Lack of container scopes Services depending on the Request
------------------------ ---------------------------------
While the sub-requests available in Silex are quite powerful, they have their
limits. The major limitation/danger that you will run into is the lack of
scopes on the Pimple container.
The container is a concept that is global to a Silex application, since the The container is a concept that is global to a Silex application, since the
application object **is** the container. Any request that is run against an application object **is** the container. Any request that is run against an
...@@ -137,41 +133,5 @@ Any services depending on the ``request`` service will store the first request ...@@ -137,41 +133,5 @@ Any services depending on the ``request`` service will store the first request
that they get (could be master or sub-request), and keep using it, even if that they get (could be master or sub-request), and keep using it, even if
that request is already over. that request is already over.
For example:: Instead of injecting the ``request`` service, you should always inject the
``request_stack`` one instead.
use Symfony\Component\HttpFoundation\Request;
class ContentFormatNegotiator
{
private $request;
public function __construct(Request $request)
{
$this->request = $request;
}
public function negotiateFormat(array $serverTypes)
{
$clientAcceptType = $this->request->headers->get('Accept');
...
return $format;
}
}
This example looks harmless, but it might blow up. You have no way of knowing
what ``$request->headers->get()`` will return, because ``$request`` could be
either the master request or a sub-request. The answer in this case is to pass
the request as an argument to ``negotiateFormat``. Then you can pass it in
from a location where you have safe access to the current request: a listener
or a controller.
Here are a few general approaches to working around this issue:
* Use ESI with Varnish.
* Do not inject the request, ever. Use listeners instead, as they can access
the request without storing it.
* Inject the Silex Application and fetch the request from it.
doc/cookbook/translating_validation_messages.rst
View file @ 97ea0e5b
Translating Validation Messages Translating Validation Messages
=============================== ===============================
When working with Symfony2 validator, a common task would be to show localized When working with Symfony validator, a common task would be to show localized
validation messages. validation messages.
In order to do that, you will need to register translator and point to In order to do that, you will need to register translator and point to
...@@ -17,4 +17,4 @@ translated resources:: ...@@ -17,4 +17,4 @@ translated resources::
$app['translator']->addResource('xlf', __DIR__.'/vendor/symfony/validator/Symfony/Component/Validator/Resources/translations/validators/validators.sr_Latn.xlf', 'sr_Latn', 'validators'); $app['translator']->addResource('xlf', __DIR__.'/vendor/symfony/validator/Symfony/Component/Validator/Resources/translations/validators/validators.sr_Latn.xlf', 'sr_Latn', 'validators');
}); });
And that's all you need to load translations from Symfony2 ``xlf`` files. And that's all you need to load translations from Symfony ``xlf`` files.
doc/internals.rst
View file @ 97ea0e5b
Internals Internals
========= =========
This chapter will tell you a bit about how Silex works This chapter will tell you how Silex works internally.
internally.
Silex Silex
----- -----
...@@ -10,7 +9,7 @@ Silex ...@@ -10,7 +9,7 @@ Silex
Application Application
~~~~~~~~~~~ ~~~~~~~~~~~
The application is the main interface to Silex. It implements Symfony2's The application is the main interface to Silex. It implements Symfony's
`HttpKernelInterface `HttpKernelInterface
<http://api.symfony.com/master/Symfony/Component/HttpKernel/HttpKernelInterface.html>`_, <http://api.symfony.com/master/Symfony/Component/HttpKernel/HttpKernelInterface.html>`_,
so you can pass a `Request so you can pass a `Request
...@@ -23,8 +22,8 @@ outside as well as the inside. You could replace any service, and you are also ...@@ -23,8 +22,8 @@ outside as well as the inside. You could replace any service, and you are also
able to read them. able to read them.
The application makes strong use of the `EventDispatcher The application makes strong use of the `EventDispatcher
<http://api.symfony.com/master/Symfony/Component/EventDispatcher/EventDispatcher.html>`_ <http://api.symfony.com/master/Symfony/Component/EventDispatcher/EventDispatcher
to hook into the Symfony2 `HttpKernel .html>`_ to hook into the Symfony `HttpKernel
<http://api.symfony.com/master/Symfony/Component/HttpKernel/HttpKernel.html>`_ <http://api.symfony.com/master/Symfony/Component/HttpKernel/HttpKernel.html>`_
events. This allows fetching the ``Request``, converting string responses into events. This allows fetching the ``Request``, converting string responses into
``Response`` objects and handling Exceptions. We also use it to dispatch some ``Response`` objects and handling Exceptions. We also use it to dispatch some
...@@ -33,7 +32,7 @@ custom events like before/after middlewares and errors. ...@@ -33,7 +32,7 @@ custom events like before/after middlewares and errors.
Controller Controller
~~~~~~~~~~ ~~~~~~~~~~
The Symfony2 `Route The Symfony `Route
<http://api.symfony.com/master/Symfony/Component/Routing/Route.html>`_ is <http://api.symfony.com/master/Symfony/Component/Routing/Route.html>`_ is
actually quite powerful. Routes can be named, which allows for URL generation. actually quite powerful. Routes can be named, which allows for URL generation.
They can also have requirements for the variable parts. In order to allow They can also have requirements for the variable parts. In order to allow
...@@ -69,10 +68,10 @@ The ``Application`` provides a shortcut ``flush`` method for flushing the ...@@ -69,10 +68,10 @@ The ``Application`` provides a shortcut ``flush`` method for flushing the
Instead of creating an instance of ``RouteCollection`` yourself, use the Instead of creating an instance of ``RouteCollection`` yourself, use the
``$app['controllers_factory']`` factory instead. ``$app['controllers_factory']`` factory instead.
Symfony2 Symfony
-------- -------
Following Symfony2 components are used by Silex: Following Symfony components are used by Silex:
* **HttpFoundation**: For ``Request`` and ``Response``. * **HttpFoundation**: For ``Request`` and ``Response``.
......
doc/intro.rst
View file @ 97ea0e5b
...@@ -4,15 +4,14 @@ Introduction ...@@ -4,15 +4,14 @@ Introduction
Silex is a PHP microframework. It is built on the shoulders of `Symfony2`_ and Silex is a PHP microframework. It is built on the shoulders of `Symfony2`_ and
`Pimple`_ and also inspired by `Sinatra`_. `Pimple`_ and also inspired by `Sinatra`_.
A microframework provides the guts for building simple single-file apps. Silex Silex aims to be:
aims to be:
* *Concise*: Silex exposes an intuitive and concise API that is fun to use. * *Concise*: Silex exposes an intuitive and concise API.
* *Extensible*: Silex has an extension system based around the Pimple micro * *Extensible*: Silex has an extension system based around the Pimple
service-container that makes it even easier to tie in third party libraries. service-container that makes it easy to tie in third party libraries.
* *Testable*: Silex uses Symfony2's HttpKernel which abstracts request and * *Testable*: Silex uses Symfony's HttpKernel which abstracts request and
response. This makes it very easy to test apps and the framework itself. It response. This makes it very easy to test apps and the framework itself. It
also respects the HTTP specification and encourages its proper use. also respects the HTTP specification and encourages its proper use.
...@@ -39,23 +38,13 @@ Usage ...@@ -39,23 +38,13 @@ Usage
All that is needed to get access to the Framework is to include the All that is needed to get access to the Framework is to include the
autoloader. autoloader.
Next a route for ``/hello/{name}`` that matches for ``GET`` requests is defined. Next, a route for ``/hello/{name}`` that matches for ``GET`` requests is
When the route matches, the function is executed and the return value is sent defined. When the route matches, the function is executed and the return value
back to the client. is sent back to the client.
Finally, the app is run. Visit ``/hello/world`` to see the result. It's really Finally, the app is run. Visit ``/hello/world`` to see the result. It's really
that easy! that easy!
Installation .. _Symfony: http://symfony.com/
------------
Installing Silex is as easy as it can get. The recommend method is using
Composer_ and requiring `silex/silex`_. Another way is to `download`_ the
archive file and extract it.
.. _Symfony2: http://symfony.com/
.. _Pimple: http://pimple.sensiolabs.org/ .. _Pimple: http://pimple.sensiolabs.org/
.. _Sinatra: http://www.sinatrarb.com/ .. _Sinatra: http://www.sinatrarb.com/
.. _Composer: http://getcomposer.org/
.. _`download`: http://silex.sensiolabs.org/download
.. _`silex/silex`: https://packagist.org/packages/silex/silex
doc/middlewares.rst
View file @ 97ea0e5b
...@@ -34,9 +34,8 @@ early event:: ...@@ -34,9 +34,8 @@ early event::
// ... // ...
}, Application::EARLY_EVENT); }, Application::EARLY_EVENT);
Of course, in this case, the routing and the security won't have been In this case, the routing and the security won't have been executed, and so you
executed, and so you won't have access to the locale, the current route, or won't have access to the locale, the current route, or the security user.
the security user.
.. note:: .. note::
...@@ -159,5 +158,5 @@ callback), and the Response is passed to the after middlewares right away:: ...@@ -159,5 +158,5 @@ callback), and the Response is passed to the after middlewares right away::
.. note:: .. note::
If a before middleware does not return a Response or ``null``, a A ``RuntimeException`` is thrown if a before middleware does not return a
``RuntimeException`` is thrown. Response or ``null``.
doc/providers.rst
View file @ 97ea0e5b
...@@ -32,7 +32,7 @@ Conventions ...@@ -32,7 +32,7 @@ Conventions
~~~~~~~~~~~ ~~~~~~~~~~~
You need to watch out in what order you do certain things when interacting You need to watch out in what order you do certain things when interacting
with providers. Just keep to these rules: with providers. Just keep these rules in mind:
* Overriding existing services must occur **after** the provider is * Overriding existing services must occur **after** the provider is
registered. registered.
...@@ -45,8 +45,6 @@ with providers. Just keep to these rules: ...@@ -45,8 +45,6 @@ with providers. Just keep to these rules:
*Reason: Providers can set default values for parameters. Just like with *Reason: Providers can set default values for parameters. Just like with
services, the provider will overwrite existing values.* services, the provider will overwrite existing values.*
Make sure to stick to this behavior when creating your own providers.
Included providers Included providers
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
...@@ -234,7 +232,7 @@ defined (like ``get``, ``post``, ``match``, ...). ...@@ -234,7 +232,7 @@ defined (like ``get``, ``post``, ``match``, ...).
The ``Application`` class acts in fact as a proxy for these methods. The ``Application`` class acts in fact as a proxy for these methods.
You can now use this provider as follows:: You can use this provider as follows::
$app = new Silex\Application(); $app = new Silex\Application();
......
doc/providers/doctrine.rst
View file @ 97ea0e5b
...@@ -2,11 +2,8 @@ DoctrineServiceProvider ...@@ -2,11 +2,8 @@ DoctrineServiceProvider
======================= =======================
The *DoctrineServiceProvider* provides integration with the `Doctrine DBAL The *DoctrineServiceProvider* provides integration with the `Doctrine DBAL
<http://www.doctrine-project.org/projects/dbal>`_ for easy database access. <http://www.doctrine-project.org/projects/dbal>`_ for easy database access
(Doctrine ORM integration is **not** supplied).
.. note::
There is only a Doctrine DBAL. An ORM service is **not** supplied.
Parameters Parameters
---------- ----------
......
doc/providers/form.rst
View file @ 97ea0e5b
...@@ -2,7 +2,7 @@ FormServiceProvider ...@@ -2,7 +2,7 @@ FormServiceProvider
=================== ===================
The *FormServiceProvider* provides a service for building forms in The *FormServiceProvider* provides a service for building forms in
your application with the Symfony2 Form component. your application with the Symfony Form component.
Parameters Parameters
---------- ----------
...@@ -194,5 +194,5 @@ Traits ...@@ -194,5 +194,5 @@ Traits
$app->form($data); $app->form($data);
For more information, consult the `Symfony2 Forms documentation For more information, consult the `Symfony Forms documentation
<http://symfony.com/doc/2.3/book/forms.html>`_. <http://symfony.com/doc/2.3/book/forms.html>`_.
doc/providers/http_cache.rst
View file @ 97ea0e5b
HttpCacheServiceProvider HttpCacheServiceProvider
======================== ========================
The *HttpCacheServiceProvider* provides support for the Symfony2 Reverse The *HttpCacheServiceProvider* provides support for the Symfony Reverse
Proxy. Proxy.
Parameters Parameters
...@@ -67,8 +67,8 @@ setting Response HTTP cache headers:: ...@@ -67,8 +67,8 @@ setting Response HTTP cache headers::
Request::setTrustedProxies(array('127.0.0.1', '::1')); Request::setTrustedProxies(array('127.0.0.1', '::1'));
$app->run(); $app->run();
This provider allows you to use the Symfony2 reverse proxy natively with This provider allows you to use the Symfony reverse proxy natively with
Silex applications by using the ``http_cache`` service. The Symfony2 reverse proxy Silex applications by using the ``http_cache`` service. The Symfony reverse proxy
acts much like any other proxy would, so you will want to whitelist it: acts much like any other proxy would, so you will want to whitelist it:
.. code-block:: php .. code-block:: php
...@@ -128,5 +128,5 @@ overall performance:: ...@@ -128,5 +128,5 @@ overall performance::
Finally, check that your Web server does not override your caching strategy. Finally, check that your Web server does not override your caching strategy.
For more information, consult the `Symfony2 HTTP Cache documentation For more information, consult the `Symfony HTTP Cache documentation
<http://symfony.com/doc/current/book/http_cache.html>`_. <http://symfony.com/doc/current/book/http_cache.html>`_.
doc/providers/http_fragment.rst
View file @ 97ea0e5b
HttpFragmentServiceProvider HttpFragmentServiceProvider
=========================== ===========================
The *HttpFragmentServiceProvider* provides support for the Symfony2 fragment The *HttpFragmentServiceProvider* provides support for the Symfony fragment
sub-framework, which allows you to embed fragments of HTML in a template. sub-framework, which allows you to embed fragments of HTML in a template.
Parameters Parameters
......
doc/providers/security.rst
View file @ 97ea0e5b
...@@ -83,7 +83,7 @@ Usage ...@@ -83,7 +83,7 @@ Usage
----- -----
The Symfony Security component is powerful. To learn more about it, read the The Symfony Security component is powerful. To learn more about it, read the
`Symfony2 Security documentation `Symfony Security documentation
<http://symfony.com/doc/2.3/book/security.html>`_. <http://symfony.com/doc/2.3/book/security.html>`_.
.. tip:: .. tip::
......
doc/providers/session.rst
View file @ 97ea0e5b
...@@ -38,7 +38,7 @@ Parameters ...@@ -38,7 +38,7 @@ Parameters
Services Services
-------- --------
* **session**: An instance of Symfony2's `Session * **session**: An instance of Symfony's `Session
<http://api.symfony.com/master/Symfony/Component/HttpFoundation/Session/Session.html>`_. <http://api.symfony.com/master/Symfony/Component/HttpFoundation/Session/Session.html>`_.
* **session.storage**: A service that is used for persistence of the session * **session.storage**: A service that is used for persistence of the session
......
doc/providers/translation.rst
View file @ 97ea0e5b
...@@ -119,7 +119,7 @@ YAML-based language files ...@@ -119,7 +119,7 @@ YAML-based language files
Having your translations in PHP files can be inconvenient. This recipe will Having your translations in PHP files can be inconvenient. This recipe will
show you how to load translations from external YAML files. show you how to load translations from external YAML files.
First, add the Symfony2 ``Config`` and ``Yaml`` components as dependencies: First, add the Symfony ``Config`` and ``Yaml`` components as dependencies:
.. code-block:: bash .. code-block:: bash
...@@ -152,7 +152,7 @@ XLIFF-based language files ...@@ -152,7 +152,7 @@ XLIFF-based language files
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
Just as you would do with YAML translation files, you first need to add the Just as you would do with YAML translation files, you first need to add the
Symfony2 ``Config`` component as a dependency (see above for details). Symfony ``Config`` component as a dependency (see above for details).
Then, similarly, create XLIFF files in your locales directory and add them to Then, similarly, create XLIFF files in your locales directory and add them to
the translator:: the translator::
......
doc/providers/twig.rst
View file @ 97ea0e5b
...@@ -48,11 +48,11 @@ Registering ...@@ -48,11 +48,11 @@ Registering
composer require twig/twig composer require twig/twig
Symfony2 Components Integration Symfony Components Integration
------------------------------- ------------------------------
Symfony provides a Twig bridge that provides additional integration between Symfony provides a Twig bridge that provides additional integration between
some Symfony2 components and Twig. Add it as a dependency: some Symfony components and Twig. Add it as a dependency:
.. code-block:: bash .. code-block:: bash
...@@ -63,24 +63,24 @@ additional capabilities: ...@@ -63,24 +63,24 @@ additional capabilities:
* **UrlGeneratorServiceProvider**: If you are using the * **UrlGeneratorServiceProvider**: If you are using the
``UrlGeneratorServiceProvider``, you will have access to the ``path()`` and ``UrlGeneratorServiceProvider``, you will have access to the ``path()`` and
``url()`` functions. You can find more information in the `Symfony2 Routing ``url()`` functions. You can find more information in the `Symfony Routing
documentation documentation
<http://symfony.com/doc/current/book/routing.html#generating-urls-from-a-template>`_. <http://symfony.com/doc/current/book/routing.html#generating-urls-from-a-template>`_.
* **TranslationServiceProvider**: If you are using the * **TranslationServiceProvider**: If you are using the
``TranslationServiceProvider``, you will get the ``trans()`` and ``TranslationServiceProvider``, you will get the ``trans()`` and
``transchoice()`` functions for translation in Twig templates. You can find ``transchoice()`` functions for translation in Twig templates. You can find
more information in the `Symfony2 Translation documentation more information in the `Symfony Translation documentation
<http://symfony.com/doc/current/book/translation.html#twig-templates>`_. <http://symfony.com/doc/current/book/translation.html#twig-templates>`_.
* **FormServiceProvider**: If you are using the ``FormServiceProvider``, you * **FormServiceProvider**: If you are using the ``FormServiceProvider``, you
will get a set of helpers for working with forms in templates. You can find will get a set of helpers for working with forms in templates. You can find
more information in the `Symfony2 Forms reference more information in the `Symfony Forms reference
<http://symfony.com/doc/current/reference/forms/twig_reference.html>`_. <http://symfony.com/doc/current/reference/forms/twig_reference.html>`_.
* **SecurityServiceProvider**: If you are using the * **SecurityServiceProvider**: If you are using the
``SecurityServiceProvider``, you will have access to the ``is_granted()`` ``SecurityServiceProvider``, you will have access to the ``is_granted()``
function in templates. You can find more information in the `Symfony2 function in templates. You can find more information in the `Symfony
Security documentation Security documentation
<http://symfony.com/doc/current/book/security.html#access-control-in-templates>`_. <http://symfony.com/doc/current/book/security.html#access-control-in-templates>`_.
......
doc/providers/validator.rst
View file @ 97ea0e5b
...@@ -217,5 +217,5 @@ provider and register the messages under the ``validators`` domain:: ...@@ -217,5 +217,5 @@ provider and register the messages under the ``validators`` domain::
), ),
); );
For more information, consult the `Symfony2 Validation documentation For more information, consult the `Symfony Validation documentation
<http://symfony.com/doc/master/book/validation.html>`_. <http://symfony.com/doc/master/book/validation.html>`_.
doc/services.rst
View file @ 97ea0e5b
Services Services
======== ========
Silex is not only a microframework. It is also a micro service container. It Silex is not only a framework, it is also a service container. It does this by
does this by extending `Pimple <http://pimple.sensiolabs.org>`_ which provides extending `Pimple <http://pimple.sensiolabs.org>`_ which provides service
service goodness in just 44 NCLOC. goodness in just 44 NCLOC.
Dependency Injection Dependency Injection
-------------------- --------------------
...@@ -43,24 +43,14 @@ passed to the constructor. This means you can create several independent ...@@ -43,24 +43,14 @@ passed to the constructor. This means you can create several independent
instances with different base paths. Of course dependencies do not have to be instances with different base paths. Of course dependencies do not have to be
simple strings. More often they are in fact other services. simple strings. More often they are in fact other services.
Container A service container is responsible for creating and storing services. It can
~~~~~~~~~ recursively create dependencies of the requested services and inject them. It
does so lazily, which means a service is only created when you actually need it.
A DIC or service container is responsible for creating and storing services.
It can recursively create dependencies of the requested services and inject
them. It does so lazily, which means a service is only created when you
actually need it.
Most containers are quite complex and are configured through XML or YAML
files.
Pimple is different.
Pimple Pimple
------ ------
Pimple is probably the simplest service container out there. It makes strong Pimple makes strong use of closures and implements the ArrayAccess interface.
use of closures and implements the ArrayAccess interface.
We will start off by creating a new instance of Pimple -- and because We will start off by creating a new instance of Pimple -- and because
``Silex\Application`` extends ``Pimple\Container`` all of this applies to Silex ``Silex\Application`` extends ``Pimple\Container`` all of this applies to Silex
...@@ -162,8 +152,7 @@ Note that protected closures do not get access to the container. ...@@ -162,8 +152,7 @@ Note that protected closures do not get access to the container.
Core services Core services
------------- -------------
Silex defines a range of services which can be used or replaced. You probably Silex defines a range of services.
don't want to mess with most of them.
* **request**: Contains the current request object, which is an instance of * **request**: Contains the current request object, which is an instance of
`Request `Request
...@@ -174,7 +163,7 @@ don't want to mess with most of them. ...@@ -174,7 +163,7 @@ don't want to mess with most of them.
$id = $app['request']->get('id'); $id = $app['request']->get('id');
This is only available when a request is being served, you can only access This is only available when a request is being served; you can only access
it from within a controller, an application before/after middlewares, or an it from within a controller, an application before/after middlewares, or an
error handler. error handler.
...@@ -187,7 +176,7 @@ don't want to mess with most of them. ...@@ -187,7 +176,7 @@ don't want to mess with most of them.
* **dispatcher**: The `EventDispatcher * **dispatcher**: The `EventDispatcher
<http://api.symfony.com/master/Symfony/Component/EventDispatcher/EventDispatcher.html>`_ <http://api.symfony.com/master/Symfony/Component/EventDispatcher/EventDispatcher.html>`_
that is used internally. It is the core of the Symfony2 system and is used that is used internally. It is the core of the Symfony system and is used
quite a bit by Silex. quite a bit by Silex.
* **resolver**: The `ControllerResolver * **resolver**: The `ControllerResolver
...@@ -197,7 +186,7 @@ don't want to mess with most of them. ...@@ -197,7 +186,7 @@ don't want to mess with most of them.
* **kernel**: The `HttpKernel * **kernel**: The `HttpKernel
<http://api.symfony.com/master/Symfony/Component/HttpKernel/HttpKernel.html>`_ <http://api.symfony.com/master/Symfony/Component/HttpKernel/HttpKernel.html>`_
that is used internally. The HttpKernel is the heart of Symfony2, it takes a that is used internally. The HttpKernel is the heart of Symfony, it takes a
Request as input and returns a Response as output. Request as input and returns a Response as output.
* **request_context**: The request context is a simplified representation of * **request_context**: The request context is a simplified representation of
......
doc/testing.rst
View file @ 97ea0e5b
Testing Testing
======= =======
Because Silex is built on top of Symfony2, it is very easy to write functional Because Silex is built on top of Symfony, it is very easy to write functional
tests for your application. Functional tests are automated software tests that tests for your application. Functional tests are automated software tests that
ensure that your code is working correctly. They go through the user ensure that your code is working correctly. They go through the user interface,
interface, using a fake browser, and mimic the actions a user would do. using a fake browser, and mimic the actions a user would do.
Why Why
--- ---
If you are not familiar with software tests, you may be wondering why you If you are not familiar with software tests, you may be wondering why you would
would need this. Every time you make a change to your application, you have to need this. Every time you make a change to your application, you have to test
test it. This means going through all the pages and making sure they are still it. This means going through all the pages and making sure they are still
working. Functional tests save you a lot of time, because they enable you to working. Functional tests save you a lot of time, because they enable you to
test your application in usually under a second by running a single command. test your application in usually under a second by running a single command.
For more information on functional testing, unit testing, and automated For more information on functional testing, unit testing, and automated
software tests in general, check out `PHPUnit software tests in general, check out `PHPUnit
<https://github.com/sebastianbergmann/phpunit>`_ and `Bulat Shakirzyanov's <https://github.com/sebastianbergmann/phpunit>`_ and `Bulat Shakirzyanov's talk
talk on Clean Code on Clean Code <http://www.slideshare.net/avalanche123/clean-code-5609451>`_.
<http://www.slideshare.net/avalanche123/clean-code-5609451>`_.
PHPUnit PHPUnit
------- -------
`PHPUnit <https://github.com/sebastianbergmann/phpunit>`_ is the de-facto `PHPUnit <https://github.com/sebastianbergmann/phpunit>`_ is the de-facto
standard testing framework for PHP. It was built for writing unit tests, but standard testing framework for PHP. It was built for writing unit tests, but it
it can be used for functional tests too. You write tests by creating a new can be used for functional tests too. You write tests by creating a new class,
class, that extends the ``PHPUnit_Framework_TestCase``. Your test cases are that extends the ``PHPUnit_Framework_TestCase``. Your test cases are methods
methods prefixed with ``test``:: prefixed with ``test``::
class ContactFormTest extends \PHPUnit_Framework_TestCase class ContactFormTest extends \PHPUnit_Framework_TestCase
{ {
...@@ -60,7 +59,7 @@ section of the PHPUnit documentation. ...@@ -60,7 +59,7 @@ section of the PHPUnit documentation.
WebTestCase WebTestCase
----------- -----------
Symfony2 provides a WebTestCase class that can be used to write functional Symfony provides a WebTestCase class that can be used to write functional
tests. The Silex version of this class is ``Silex\WebTestCase``, and you can tests. The Silex version of this class is ``Silex\WebTestCase``, and you can
use it by making your test extend it:: use it by making your test extend it::
...@@ -73,7 +72,7 @@ use it by making your test extend it:: ...@@ -73,7 +72,7 @@ use it by making your test extend it::
.. note:: .. note::
If you want to use the Symfony2 ``WebTestCase`` class you will need to If you want to use the Symfony ``WebTestCase`` class you will need to
explicitly install its dependencies for your project: explicitly install its dependencies for your project:
.. code-block:: bash .. code-block:: bash
...@@ -93,8 +92,8 @@ executed before every test. ...@@ -93,8 +92,8 @@ executed before every test.
.. tip:: .. tip::
By default, the application behaves in the same way as when using it from By default, the application behaves in the same way as when using it from a
a browser. But when an error occurs, it is sometimes easier to get raw browser. But when an error occurs, it is sometimes easier to get raw
exceptions instead of HTML pages. It is rather simple if you tweak the exceptions instead of HTML pages. It is rather simple if you tweak the
application configuration in the ``createApplication()`` method like application configuration in the ``createApplication()`` method like
follows:: follows::
...@@ -122,9 +121,8 @@ executed before every test. ...@@ -122,9 +121,8 @@ executed before every test.
// ... // ...
} }
The WebTestCase provides a ``createClient`` method. A client acts as a The WebTestCase provides a ``createClient`` method. A client acts as a browser,
browser, and allows you to interact with your application. Here's how it and allows you to interact with your application. Here's how it works::
works::
public function testInitialPage() public function testInitialPage()
{ {
...@@ -143,7 +141,7 @@ There are several things going on here. You have both a ``Client`` and a ...@@ -143,7 +141,7 @@ There are several things going on here. You have both a ``Client`` and a
You can also access the application through ``$this->app``. You can also access the application through ``$this->app``.
Client Client
------ ~~~~~~
The client represents a browser. It holds your browsing history, cookies and The client represents a browser. It holds your browsing history, cookies and
more. The ``request`` method allows you to make a request to a page on your more. The ``request`` method allows you to make a request to a page on your
...@@ -152,11 +150,11 @@ application. ...@@ -152,11 +150,11 @@ application.
.. note:: .. note::
You can find some documentation for it in `the client section of the You can find some documentation for it in `the client section of the
testing chapter of the Symfony2 documentation testing chapter of the Symfony documentation
<http://symfony.com/doc/current/book/testing.html#the-test-client>`_. <http://symfony.com/doc/current/book/testing.html#the-test-client>`_.
Crawler Crawler
------- ~~~~~~~
The crawler allows you to inspect the content of a page. You can filter it The crawler allows you to inspect the content of a page. You can filter it
using CSS expressions and lots more. using CSS expressions and lots more.
...@@ -164,7 +162,7 @@ using CSS expressions and lots more. ...@@ -164,7 +162,7 @@ using CSS expressions and lots more.
.. note:: .. note::
You can find some documentation for it in `the crawler section of the testing You can find some documentation for it in `the crawler section of the testing
chapter of the Symfony2 documentation chapter of the Symfony documentation
<http://symfony.com/doc/current/book/testing.html#the-test-client>`_. <http://symfony.com/doc/current/book/testing.html#the-test-client>`_.
Configuration Configuration
...@@ -195,9 +193,6 @@ look like this: ...@@ -195,9 +193,6 @@ look like this:
</testsuites> </testsuites>
</phpunit> </phpunit>
You can also configure a bootstrap file for autoloading and whitelisting for
code coverage reports.
Your ``tests/YourApp/Tests/YourTest.php`` should look like this:: Your ``tests/YourApp/Tests/YourTest.php`` should look like this::
namespace YourApp\Tests; namespace YourApp\Tests;
...@@ -217,4 +212,4 @@ Your ``tests/YourApp/Tests/YourTest.php`` should look like this:: ...@@ -217,4 +212,4 @@ Your ``tests/YourApp/Tests/YourTest.php`` should look like this::
} }
} }
Now, when running ``phpunit`` on the command line, your tests should run. Now, when running ``phpunit`` on the command line, tests should run.
doc/usage.rst
View file @ 97ea0e5b
Usage Usage
===== =====
This chapter describes how to use Silex.
Installation Installation
------------ ------------
...@@ -65,17 +63,14 @@ Routing ...@@ -65,17 +63,14 @@ Routing
------- -------
In Silex you define a route and the controller that is called when that In Silex you define a route and the controller that is called when that
route is matched. route is matched. A route pattern consists of:
A route pattern consists of:
* *Pattern*: The route pattern defines a path that points to a resource. The * *Pattern*: The route pattern defines a path that points to a resource. The
pattern can include variable parts and you are able to set RegExp pattern can include variable parts and you are able to set RegExp
requirements for them. requirements for them.
* *Method*: One of the following HTTP methods: ``GET``, ``POST``, ``PUT`` or * *Method*: One of the following HTTP methods: ``GET``, ``POST``, ``PUT`` or
``DELETE``. This describes the interaction with the resource. Commonly only ``DELETE`` or ``PATCH``. This describes the interaction with the resource.
``GET`` and ``POST`` are used, but it is possible to use the others as well.
The controller is defined using a closure like this:: The controller is defined using a closure like this::
...@@ -83,17 +78,6 @@ The controller is defined using a closure like this:: ...@@ -83,17 +78,6 @@ The controller is defined using a closure like this::
// ... do something // ... do something
} }
Closures are anonymous functions that may import state from outside of their
definition. This is different from globals, because the outer state does not
have to be global. For instance, you could define a closure in a function and
import local variables of that function.
.. note::
Closures that do not import scope are referred to as lambdas. Because all
anonymous functions are instances of the ``Closure`` class in PHP, the
documentation will not make a distinction here.
The return value of the closure becomes the content of the page. The return value of the closure becomes the content of the page.
Example GET Route Example GET Route
...@@ -122,8 +106,8 @@ Here is an example definition of a ``GET`` route:: ...@@ -122,8 +106,8 @@ Here is an example definition of a ``GET`` route::
Visiting ``/blog`` will return a list of blog post titles. The ``use`` Visiting ``/blog`` will return a list of blog post titles. The ``use``
statement means something different in this context. It tells the closure to statement means something different in this context. It tells the closure to
import the ``$blogPosts`` variable from the outer scope. This allows you to import the ``$blogPosts`` variable from the outer scope. This allows you to use
use it from within the closure. it from within the closure.
Dynamic Routing Dynamic Routing
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~
...@@ -185,7 +169,7 @@ This allows setting an HTTP status code, in this case it is set to ...@@ -185,7 +169,7 @@ This allows setting an HTTP status code, in this case it is set to
.. note:: .. note::
Silex always uses a ``Response`` internally, it converts strings to Silex always uses a ``Response`` internally, it converts strings to
responses with status code ``200 Ok``. responses with status code ``200``.
Other methods Other methods
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
...@@ -201,6 +185,10 @@ methods on your application: ``get``, ``post``, ``put``, ``delete``:: ...@@ -201,6 +185,10 @@ methods on your application: ``get``, ``post``, ``put``, ``delete``::
// ... // ...
}); });
$app->patch('/blog/{id}', function ($id) {
// ...
});
.. tip:: .. tip::
Forms in most web browsers do not directly support the use of other HTTP Forms in most web browsers do not directly support the use of other HTTP
...@@ -354,10 +342,6 @@ convert method will be used as converter:: ...@@ -354,10 +342,6 @@ convert method will be used as converter::
// ... // ...
})->convert('user', 'converter.user:convert'); })->convert('user', 'converter.user:convert');
.. warning::
Please note that the ability to use a service method (with the `a:b` notation) will be in version 1.2
Requirements Requirements
~~~~~~~~~~~~ ~~~~~~~~~~~~
...@@ -398,10 +382,9 @@ have the value ``index``. ...@@ -398,10 +382,9 @@ have the value ``index``.
Named Routes Named Routes
~~~~~~~~~~~~ ~~~~~~~~~~~~
Some providers (such as ``UrlGeneratorProvider``) can make use of named Some providers (such as ``UrlGeneratorProvider``) can make use of named routes.
routes. By default Silex will generate a route name for you, that cannot By default Silex will generate an internal route name for you but you can give
really be used. You can give a route a name by calling ``bind`` on the an explicit route name by calling ``bind``::
``Controller`` object that is returned by the routing methods::
$app->get('/', function () { $app->get('/', function () {
// ... // ...
...@@ -413,17 +396,12 @@ really be used. You can give a route a name by calling ``bind`` on the ...@@ -413,17 +396,12 @@ really be used. You can give a route a name by calling ``bind`` on the
}) })
->bind('blog_post'); ->bind('blog_post');
.. note:: Controllers as Classes
It only makes sense to name routes if you use providers that make use of
the ``RouteCollection``.
Controllers in Classes
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~
If you don't want to use anonymous functions, you can also define your Instead of anonymous functions, you can also define your controllers as
controllers as methods. By using the ``ControllerClass::methodName`` syntax, methods. By using the ``ControllerClass::methodName`` syntax, you can tell
you can tell Silex to lazily create the controller object for you:: Silex to lazily create the controller object for you::
$app->get('/', 'Acme\\Foo::bar'); $app->get('/', 'Acme\\Foo::bar');
...@@ -445,14 +423,14 @@ This will load the ``Acme\Foo`` class on demand, create an instance and call ...@@ -445,14 +423,14 @@ This will load the ``Acme\Foo`` class on demand, create an instance and call
the ``bar`` method to get the response. You can use ``Request`` and the ``bar`` method to get the response. You can use ``Request`` and
``Silex\Application`` type hints to get ``$request`` and ``$app`` injected. ``Silex\Application`` type hints to get ``$request`` and ``$app`` injected.
For an even stronger separation between Silex and your controllers, you can It is also possible to :doc:`define your controllers as services
:doc:`define your controllers as services <providers/service_controller>`. <providers/service_controller>`.
Global Configuration Global Configuration
-------------------- --------------------
If a controller setting must be applied to all controllers (a converter, a If a controller setting must be applied to **all** controllers (a converter, a
middleware, a requirement, or a default value), you can configure it on middleware, a requirement, or a default value), configure it on
``$app['controllers']``, which holds all application controllers:: ``$app['controllers']``, which holds all application controllers::
$app['controllers'] $app['controllers']
...@@ -473,16 +451,12 @@ the defaults for new controllers. ...@@ -473,16 +451,12 @@ the defaults for new controllers.
mount as they have their own global configuration (read the mount as they have their own global configuration (read the
:doc:`dedicated chapter<organizing_controllers>` for more information). :doc:`dedicated chapter<organizing_controllers>` for more information).
.. warning::
The converters are run for **all** registered controllers.
Error Handlers Error Handlers
-------------- --------------
If some part of your code throws an exception you will want to display some When an exception is thrown, error handlers allows you to display a custom
kind of error page to the user. This is what error handlers do. You can also error page to the user. They can also be used to do additional things, such as
use them to do additional things, such as logging. logging.
To register an error handler, pass a closure to the ``error`` method which To register an error handler, pass a closure to the ``error`` method which
takes an ``Exception`` argument and returns a response:: takes an ``Exception`` argument and returns a response::
...@@ -512,15 +486,6 @@ handle them differently:: ...@@ -512,15 +486,6 @@ handle them differently::
return new Response($message); return new Response($message);
}); });
.. note::
As Silex ensures that the Response status code is set to the most
appropriate one depending on the exception, setting the status on the
response won't work. If you want to overwrite the status code (which you
should not without a good reason), set the ``X-Status-Code`` header::
return new Response('Error', 404 /* ignored */, array('X-Status-Code' => 200));
You can restrict an error handler to only handle some Exception classes by You can restrict an error handler to only handle some Exception classes by
setting a more specific type hint for the Closure argument:: setting a more specific type hint for the Closure argument::
...@@ -531,9 +496,18 @@ setting a more specific type hint for the Closure argument:: ...@@ -531,9 +496,18 @@ setting a more specific type hint for the Closure argument::
// and exceptions that extends \LogicException // and exceptions that extends \LogicException
}); });
If you want to set up logging you can use a separate error handler for that. .. note::
Just make sure you register it before the response error handlers, because
once a response is returned, the following handlers are ignored. As Silex ensures that the Response status code is set to the most
appropriate one depending on the exception, setting the status on the
response won't work. If you want to overwrite the status code, set the
``X-Status-Code`` header::
return new Response('Error', 404 /* ignored */, array('X-Status-Code' => 200));
If you want to use a separate error handler for logging, make sure you register
it before the response error handlers, because once a response is returned, the
following handlers are ignored.
.. note:: .. note::
...@@ -631,8 +605,8 @@ response for you:: ...@@ -631,8 +605,8 @@ response for you::
Streaming Streaming
--------- ---------
It's possible to create a streaming response, which is important in cases when It's possible to stream a response, which is important in cases when you don't
you cannot buffer the data being sent:: want to buffer the data being sent::
$app->get('/images/{file}', function ($file) use ($app) { $app->get('/images/{file}', function ($file) use ($app) {
if (!file_exists(__DIR__.'/images/'.$file)) { if (!file_exists(__DIR__.'/images/'.$file)) {
...@@ -665,7 +639,7 @@ Sending a file ...@@ -665,7 +639,7 @@ Sending a file
If you want to return a file, you can use the ``sendFile`` helper method. If you want to return a file, you can use the ``sendFile`` helper method.
It eases returning files that would otherwise not be publicly available. Simply It eases returning files that would otherwise not be publicly available. Simply
pass it your file path, status code, headers and the content disposition and it pass it your file path, status code, headers and the content disposition and it
will create a ``BinaryFileResponse`` based response for you:: will create a ``BinaryFileResponse`` response for you::
$app->get('/files/{path}', function ($path) use ($app) { $app->get('/files/{path}', function ($path) use ($app) {
if (!file_exists('/base/path/' . $path)) { if (!file_exists('/base/path/' . $path)) {
...@@ -729,9 +703,8 @@ Make sure to protect your application against attacks. ...@@ -729,9 +703,8 @@ Make sure to protect your application against attacks.
Escaping Escaping
~~~~~~~~ ~~~~~~~~
When outputting any user input (either route variables GET/POST variables When outputting any user input, make sure to escape it correctly to prevent
obtained from the request), you will have to make sure to escape it correctly, Cross-Site-Scripting attacks.
to prevent Cross-Site-Scripting attacks.
* **Escaping HTML**: PHP provides the ``htmlspecialchars`` function for this. * **Escaping HTML**: PHP provides the ``htmlspecialchars`` function for this.
Silex provides a shortcut ``escape`` method:: Silex provides a shortcut ``escape`` method::
...@@ -741,7 +714,7 @@ to prevent Cross-Site-Scripting attacks. ...@@ -741,7 +714,7 @@ to prevent Cross-Site-Scripting attacks.
return "You provided the name {$app->escape($name)}."; return "You provided the name {$app->escape($name)}.";
}); });
If you use the Twig template engine you should use its escaping or even If you use the Twig template engine, you should use its escaping or even
auto-escaping mechanisms. auto-escaping mechanisms.
* **Escaping JSON**: If you want to provide data in JSON format you should * **Escaping JSON**: If you want to provide data in JSON format you should
......
src/Silex/Application/TwigTrait.php
View file @ 97ea0e5b
...@@ -56,7 +56,7 @@ trait TwigTrait ...@@ -56,7 +56,7 @@ trait TwigTrait
* @param string $view The view name * @param string $view The view name
* @param array $parameters An array of parameters to pass to the view * @param array $parameters An array of parameters to pass to the view
* *
* @return Response A Response instance * @return string The rendered view
*/ */
public function renderView($view, array $parameters = array()) public function renderView($view, array $parameters = array())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment