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
d0b2b9b2
Commit
d0b2b9b2
authored
Apr 29, 2014
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed CS
parent
10070e4c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
41 deletions
+40
-41
src/Silex/Application.php
src/Silex/Application.php
+27
-27
src/Silex/Application/MonologTrait.php
src/Silex/Application/MonologTrait.php
+4
-4
src/Silex/Application/TranslationTrait.php
src/Silex/Application/TranslationTrait.php
+5
-5
src/Silex/EventListener/ConverterListener.php
src/Silex/EventListener/ConverterListener.php
+2
-2
src/Silex/ExceptionListenerWrapper.php
src/Silex/ExceptionListenerWrapper.php
+0
-1
src/Silex/Provider/FormServiceProvider.php
src/Silex/Provider/FormServiceProvider.php
+1
-1
src/Silex/ServiceControllerResolver.php
src/Silex/ServiceControllerResolver.php
+1
-1
No files found.
src/Silex/Application.php
View file @
d0b2b9b2
...
...
@@ -300,9 +300,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
*
* Before filters are run before any route has been matched.
*
* @param mixed
$callback Before filter callback
* @param int
$priority The higher this value, the earlier an event
*
listener will be triggered in the chain (defaults to 0)
* @param mixed $callback Before filter callback
* @param int $priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
*/
public
function
before
(
$callback
,
$priority
=
0
)
{
...
...
@@ -326,9 +326,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
*
* After filters are run after the controller has been executed.
*
* @param mixed
$callback After filter callback
* @param int
$priority The higher this value, the earlier an event
*
listener will be triggered in the chain (defaults to 0)
* @param mixed $callback After filter callback
* @param int $priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
*/
public
function
after
(
$callback
,
$priority
=
0
)
{
...
...
@@ -348,9 +348,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
*
* Finish filters are run after the response has been sent.
*
* @param mixed
$callback Finish filter callback
* @param int
$priority The higher this value, the earlier an event
*
listener will be triggered in the chain (defaults to 0)
* @param mixed $callback Finish filter callback
* @param int $priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
*/
public
function
finish
(
$callback
,
$priority
=
0
)
{
...
...
@@ -364,9 +364,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
/**
* Aborts the current request by sending a proper HTTP error.
*
* @param int
$statusCode The HTTP status code
* @param string
$message The status message
* @param array
$headers An array of HTTP headers
* @param int $statusCode The HTTP status code
* @param string $message The status message
* @param array $headers An array of HTTP headers
*/
public
function
abort
(
$statusCode
,
$message
=
''
,
array
$headers
=
array
())
{
...
...
@@ -386,9 +386,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
*
* For this reason you should add logging handlers before output handlers.
*
* @param mixed
$callback Error handler callback, takes an Exception argument
* @param int
$priority The higher this value, the earlier an event
*
listener will be triggered in the chain (defaults to -8)
* @param mixed $callback Error handler callback, takes an Exception argument
* @param int $priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to -8)
*/
public
function
error
(
$callback
,
$priority
=
-
8
)
{
...
...
@@ -408,8 +408,8 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
/**
* Redirects the user to another URL.
*
* @param string
$url The URL to redirect to
* @param int
$status The status code (302 by default)
* @param string $url The URL to redirect to
* @param int $status The status code (302 by default)
*
* @return RedirectResponse
*/
...
...
@@ -421,9 +421,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
/**
* Creates a streaming response.
*
* @param mixed
$callback A valid PHP callback
* @param int
$status The response status code
* @param array
$headers An array of response headers
* @param mixed $callback A valid PHP callback
* @param int $status The response status code
* @param array $headers An array of response headers
*
* @return StreamedResponse
*/
...
...
@@ -435,10 +435,10 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
/**
* Escapes a text for HTML.
*
* @param string
$text The input text to be escaped
* @param int
$flags The flags (@see htmlspecialchars)
* @param string
$charset The charset
* @param bool
$doubleEncode Whether to try to avoid double escaping or not
* @param string $text The input text to be escaped
* @param int $flags The flags (@see htmlspecialchars)
* @param string $charset The charset
* @param bool $doubleEncode Whether to try to avoid double escaping or not
*
* @return string Escaped text
*/
...
...
@@ -450,9 +450,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
/**
* Convert some data into a JSON response.
*
* @param mixed
$data The response data
* @param int
$status The response status code
* @param array
$headers An array of response headers
* @param mixed $data The response data
* @param int $status The response status code
* @param array $headers An array of response headers
*
* @return JsonResponse
*/
...
...
src/Silex/Application/MonologTrait.php
View file @
d0b2b9b2
...
...
@@ -23,11 +23,11 @@ trait MonologTrait
/**
* Adds a log record.
*
* @param string
$message The log message
* @param array
$context The log context
* @param int
$level The logging level
* @param string $message The log message
* @param array $context The log context
* @param int $level The logging level
*
* @return bool
Whether the record has been processed
* @return bool Whether the record has been processed
*/
public
function
log
(
$message
,
array
$context
=
array
(),
$level
=
Logger
::
INFO
)
{
...
...
src/Silex/Application/TranslationTrait.php
View file @
d0b2b9b2
...
...
@@ -36,11 +36,11 @@ trait TranslationTrait
/**
* Translates the given choice message by choosing a translation according to a number.
*
* @param string
$id The message id
* @param int
$number The number to use to find the indice of the message
* @param array
$parameters An array of parameters for the message
* @param string
$domain The domain for the message
* @param string
$locale The locale
* @param string $id The message id
* @param int $number The number to use to find the indice of the message
* @param array $parameters An array of parameters for the message
* @param string $domain The domain for the message
* @param string $locale The locale
*
* @return string The translated string
*/
...
...
src/Silex/EventListener/ConverterListener.php
View file @
d0b2b9b2
...
...
@@ -30,8 +30,8 @@ class ConverterListener implements EventSubscriberInterface
/**
* Constructor.
*
* @param RouteCollection $routes
A RouteCollection instance
* @param CallbackResolver $callbackResolver
A CallbackResolver instance
* @param RouteCollection $routes A RouteCollection instance
* @param CallbackResolver $callbackResolver A CallbackResolver instance
*/
public
function
__construct
(
RouteCollection
$routes
,
CallbackResolver
$callbackResolver
)
{
...
...
src/Silex/ExceptionListenerWrapper.php
View file @
d0b2b9b2
...
...
@@ -16,7 +16,6 @@ use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
use
Symfony\Component\HttpKernel\KernelEvents
;
use
Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent
;
use
Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent
;
use
Silex\Application
;
/**
* Wraps exception listeners.
...
...
src/Silex/Provider/FormServiceProvider.php
View file @
d0b2b9b2
...
...
@@ -90,7 +90,7 @@ class FormServiceProvider implements ServiceProviderInterface
->
getFormFactory
()
;
});
$app
[
'form.resolved_type_factory'
]
=
$app
->
share
(
function
(
$app
)
{
return
new
ResolvedFormTypeFactory
();
});
...
...
src/Silex/ServiceControllerResolver.php
View file @
d0b2b9b2
...
...
@@ -28,7 +28,7 @@ class ServiceControllerResolver implements ControllerResolverInterface
* Constructor.
*
* @param ControllerResolverInterface $controllerResolver A ControllerResolverInterface instance to delegate to
* @param CallbackResolver
$callbackResolver
A service resolver instance
* @param CallbackResolver
$callbackResolver
A service resolver instance
*/
public
function
__construct
(
ControllerResolverInterface
$controllerResolver
,
CallbackResolver
$callbackResolver
)
{
...
...
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