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
10070e4c
Commit
10070e4c
authored
Apr 29, 2014
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed types
parent
4f6a4143
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
18 deletions
+18
-18
src/Silex/Application.php
src/Silex/Application.php
+12
-12
src/Silex/Application/MonologTrait.php
src/Silex/Application/MonologTrait.php
+2
-2
src/Silex/Application/TranslationTrait.php
src/Silex/Application/TranslationTrait.php
+1
-1
src/Silex/CallbackResolver.php
src/Silex/CallbackResolver.php
+1
-1
src/Silex/Provider/SecurityServiceProvider.php
src/Silex/Provider/SecurityServiceProvider.php
+2
-2
No files found.
src/Silex/Application.php
View file @
10070e4c
...
@@ -277,7 +277,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -277,7 +277,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
*
*
* @param string $eventName The event to listen on
* @param string $eventName The event to listen on
* @param callable $callback The listener
* @param callable $callback The listener
* @param int
eger
$priority The higher this value, the earlier an event
* @param int
$priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
* listener will be triggered in the chain (defaults to 0)
*/
*/
public
function
on
(
$eventName
,
$callback
,
$priority
=
0
)
public
function
on
(
$eventName
,
$callback
,
$priority
=
0
)
...
@@ -301,7 +301,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -301,7 +301,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Before filters are run before any route has been matched.
* Before filters are run before any route has been matched.
*
*
* @param mixed $callback Before filter callback
* @param mixed $callback Before filter callback
* @param int
eger
$priority The higher this value, the earlier an event
* @param int
$priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
* listener will be triggered in the chain (defaults to 0)
*/
*/
public
function
before
(
$callback
,
$priority
=
0
)
public
function
before
(
$callback
,
$priority
=
0
)
...
@@ -327,7 +327,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -327,7 +327,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* After filters are run after the controller has been executed.
* After filters are run after the controller has been executed.
*
*
* @param mixed $callback After filter callback
* @param mixed $callback After filter callback
* @param int
eger
$priority The higher this value, the earlier an event
* @param int
$priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
* listener will be triggered in the chain (defaults to 0)
*/
*/
public
function
after
(
$callback
,
$priority
=
0
)
public
function
after
(
$callback
,
$priority
=
0
)
...
@@ -349,7 +349,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -349,7 +349,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Finish filters are run after the response has been sent.
* Finish filters are run after the response has been sent.
*
*
* @param mixed $callback Finish filter callback
* @param mixed $callback Finish filter callback
* @param int
eger
$priority The higher this value, the earlier an event
* @param int
$priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
* listener will be triggered in the chain (defaults to 0)
*/
*/
public
function
finish
(
$callback
,
$priority
=
0
)
public
function
finish
(
$callback
,
$priority
=
0
)
...
@@ -364,7 +364,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -364,7 +364,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
/**
/**
* Aborts the current request by sending a proper HTTP error.
* Aborts the current request by sending a proper HTTP error.
*
*
* @param int
eger
$statusCode The HTTP status code
* @param int
$statusCode The HTTP status code
* @param string $message The status message
* @param string $message The status message
* @param array $headers An array of HTTP headers
* @param array $headers An array of HTTP headers
*/
*/
...
@@ -387,7 +387,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -387,7 +387,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* For this reason you should add logging handlers before output handlers.
* For this reason you should add logging handlers before output handlers.
*
*
* @param mixed $callback Error handler callback, takes an Exception argument
* @param mixed $callback Error handler callback, takes an Exception argument
* @param int
eger
$priority The higher this value, the earlier an event
* @param int
$priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to -8)
* listener will be triggered in the chain (defaults to -8)
*/
*/
public
function
error
(
$callback
,
$priority
=
-
8
)
public
function
error
(
$callback
,
$priority
=
-
8
)
...
@@ -409,7 +409,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -409,7 +409,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Redirects the user to another URL.
* Redirects the user to another URL.
*
*
* @param string $url The URL to redirect to
* @param string $url The URL to redirect to
* @param int
eger
$status The status code (302 by default)
* @param int
$status The status code (302 by default)
*
*
* @return RedirectResponse
* @return RedirectResponse
*/
*/
...
@@ -422,7 +422,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -422,7 +422,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Creates a streaming response.
* Creates a streaming response.
*
*
* @param mixed $callback A valid PHP callback
* @param mixed $callback A valid PHP callback
* @param int
eger
$status The response status code
* @param int
$status The response status code
* @param array $headers An array of response headers
* @param array $headers An array of response headers
*
*
* @return StreamedResponse
* @return StreamedResponse
...
@@ -436,9 +436,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -436,9 +436,9 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Escapes a text for HTML.
* Escapes a text for HTML.
*
*
* @param string $text The input text to be escaped
* @param string $text The input text to be escaped
* @param int
eger
$flags The flags (@see htmlspecialchars)
* @param int
$flags The flags (@see htmlspecialchars)
* @param string $charset The charset
* @param string $charset The charset
* @param
Boolean
$doubleEncode Whether to try to avoid double escaping or not
* @param
bool
$doubleEncode Whether to try to avoid double escaping or not
*
*
* @return string Escaped text
* @return string Escaped text
*/
*/
...
@@ -451,7 +451,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -451,7 +451,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Convert some data into a JSON response.
* Convert some data into a JSON response.
*
*
* @param mixed $data The response data
* @param mixed $data The response data
* @param int
eger
$status The response status code
* @param int
$status The response status code
* @param array $headers An array of response headers
* @param array $headers An array of response headers
*
*
* @return JsonResponse
* @return JsonResponse
...
@@ -465,7 +465,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
...
@@ -465,7 +465,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
* Sends a file.
* Sends a file.
*
*
* @param \SplFileInfo|string $file The file to stream
* @param \SplFileInfo|string $file The file to stream
* @param int
eger
$status The response status code
* @param int
$status The response status code
* @param array $headers An array of response headers
* @param array $headers An array of response headers
* @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename
* @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename
*
*
...
...
src/Silex/Application/MonologTrait.php
View file @
10070e4c
...
@@ -25,9 +25,9 @@ trait MonologTrait
...
@@ -25,9 +25,9 @@ trait MonologTrait
*
*
* @param string $message The log message
* @param string $message The log message
* @param array $context The log context
* @param array $context The log context
* @param int
eger
$level The logging level
* @param int
$level The logging level
*
*
* @return
Boolean
Whether the record has been processed
* @return
bool
Whether the record has been processed
*/
*/
public
function
log
(
$message
,
array
$context
=
array
(),
$level
=
Logger
::
INFO
)
public
function
log
(
$message
,
array
$context
=
array
(),
$level
=
Logger
::
INFO
)
{
{
...
...
src/Silex/Application/TranslationTrait.php
View file @
10070e4c
...
@@ -37,7 +37,7 @@ trait TranslationTrait
...
@@ -37,7 +37,7 @@ trait TranslationTrait
* Translates the given choice message by choosing a translation according to a number.
* Translates the given choice message by choosing a translation according to a number.
*
*
* @param string $id The message id
* @param string $id The message id
* @param int
eger
$number The number to use to find the indice of the message
* @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 array $parameters An array of parameters for the message
* @param string $domain The domain for the message
* @param string $domain The domain for the message
* @param string $locale The locale
* @param string $locale The locale
...
...
src/Silex/CallbackResolver.php
View file @
10070e4c
...
@@ -27,7 +27,7 @@ class CallbackResolver
...
@@ -27,7 +27,7 @@ class CallbackResolver
*
*
* @param string $name
* @param string $name
*
*
* @return
Boolean
* @return
bool
*/
*/
public
function
isValid
(
$name
)
public
function
isValid
(
$name
)
{
{
...
...
src/Silex/Provider/SecurityServiceProvider.php
View file @
10070e4c
...
@@ -161,8 +161,8 @@ class SecurityServiceProvider implements ServiceProviderInterface
...
@@ -161,8 +161,8 @@ class SecurityServiceProvider implements ServiceProviderInterface
$entryPoint
=
null
;
$entryPoint
=
null
;
$pattern
=
isset
(
$firewall
[
'pattern'
])
?
$firewall
[
'pattern'
]
:
null
;
$pattern
=
isset
(
$firewall
[
'pattern'
])
?
$firewall
[
'pattern'
]
:
null
;
$users
=
isset
(
$firewall
[
'users'
])
?
$firewall
[
'users'
]
:
array
();
$users
=
isset
(
$firewall
[
'users'
])
?
$firewall
[
'users'
]
:
array
();
$security
=
isset
(
$firewall
[
'security'
])
?
(
Boolean
)
$firewall
[
'security'
]
:
true
;
$security
=
isset
(
$firewall
[
'security'
])
?
(
bool
)
$firewall
[
'security'
]
:
true
;
$stateless
=
isset
(
$firewall
[
'stateless'
])
?
(
Boolean
)
$firewall
[
'stateless'
]
:
false
;
$stateless
=
isset
(
$firewall
[
'stateless'
])
?
(
bool
)
$firewall
[
'stateless'
]
:
false
;
unset
(
$firewall
[
'pattern'
],
$firewall
[
'users'
],
$firewall
[
'security'
],
$firewall
[
'stateless'
]);
unset
(
$firewall
[
'pattern'
],
$firewall
[
'users'
],
$firewall
[
'security'
],
$firewall
[
'stateless'
]);
$protected
=
false
===
$security
?
false
:
count
(
$firewall
);
$protected
=
false
===
$security
?
false
:
count
(
$firewall
);
...
...
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