Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
2ed0ede2
Commit
2ed0ede2
authored
May 23, 2016
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.3'
* 1.3: Documentation code-block fixes
parents
554fa106
1d119228
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
13 deletions
+4
-13
README.rst
README.rst
+1
-3
doc/providers/http_cache.rst
doc/providers/http_cache.rst
+2
-6
doc/providers/serializer.rst
doc/providers/serializer.rst
+1
-4
No files found.
README.rst
View file @
2ed0ede2
...
@@ -2,9 +2,7 @@ Silex, a simple Web Framework
...
@@ -2,9 +2,7 @@ Silex, a simple Web Framework
=============================
=============================
Silex is a PHP micro-framework to develop websites based on `Symfony
Silex is a PHP micro-framework to develop websites based on `Symfony
components`_:
components`_::
.. code-block:: php
<?php
<?php
...
...
doc/providers/http_cache.rst
View file @
2ed0ede2
...
@@ -58,9 +58,7 @@ setting Response HTTP cache headers::
...
@@ -58,9 +58,7 @@ setting Response HTTP cache headers::
in `Trusting Proxies
in `Trusting Proxies
<http:
//
symfony
.
com
/
doc
/
current
/
components
/
http_foundation
/
trusting_proxies
.
html
>
`_.
<http:
//
symfony
.
com
/
doc
/
current
/
components
/
http_foundation
/
trusting_proxies
.
html
>
`_.
If you would be running Varnish in front of your application on the same machine:
If you would be running Varnish in front of your application on the same machine::
.. code-block:: php
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Request;
...
@@ -69,9 +67,7 @@ setting Response HTTP cache headers::
...
@@ -69,9 +67,7 @@ setting Response HTTP cache headers::
This provider allows you to use the Symfony 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 Symfony 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
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Request;
...
...
doc/providers/serializer.rst
View file @
2ed0ede2
...
@@ -44,9 +44,7 @@ Registering
...
@@ -44,9 +44,7 @@ Registering
Usage
Usage
-----
-----
The ``SerializerServiceProvider`` provider provides a ``serializer`` service:
The ``SerializerServiceProvider`` provider provides a ``serializer`` service::
.. code-block:: php
use Silex\Application;
use Silex\Application;
use Silex\Provider\SerializerServiceProvider;
use Silex\Provider\SerializerServiceProvider;
...
@@ -73,4 +71,3 @@ The ``SerializerServiceProvider`` provider provides a ``serializer`` service:
...
@@ -73,4 +71,3 @@ The ``SerializerServiceProvider`` provider provides a ``serializer`` service:
));
));
})->assert("_format", "xml|json")
})->assert("_format", "xml|json")
->assert("id", "\d+");
->assert("id", "\d+");
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment