Skip to content

Commit a0d678c

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Conflicts: composer.json src/Symfony/Bridge/Twig/TwigEngine.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php src/Symfony/Component/Stopwatch/StopwatchEvent.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Templating/TemplateReference.php src/Symfony/Component/Templating/TemplateReferenceInterface.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/MetadataFactoryInterface.php
2 parents a03d202 + 9a62ff4 commit a0d678c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+169
-169
lines changed

‎CacheWarmer/CacheWarmerAggregate.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function warmUp($cacheDir)
5252
/**
5353
* Checks whether this warmer is optional or not.
5454
*
55-
* @return bool always false
55+
* @return bool always false
5656
*/
5757
public function isOptional()
5858
{

‎CacheWarmer/CacheWarmerInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface CacheWarmerInterface extends WarmableInterface
2626
* A warmer should return true if the cache can be
2727
* generated incrementally and on-demand.
2828
*
29-
* @return bool true if the warmer is optional, false otherwise
29+
* @return bool true if the warmer is optional, false otherwise
3030
*/
3131
public function isOptional();
3232
}

‎DataCollector/ConfigDataCollector.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function getEnv()
143143
/**
144144
* Returns true if the debug is enabled.
145145
*
146-
* @return bool true if debug is enabled, false otherwise
146+
* @return bool true if debug is enabled, false otherwise
147147
*/
148148
public function isDebug()
149149
{
@@ -153,7 +153,7 @@ public function isDebug()
153153
/**
154154
* Returns true if the XDebug is enabled.
155155
*
156-
* @return bool true if XDebug is enabled, false otherwise
156+
* @return bool true if XDebug is enabled, false otherwise
157157
*/
158158
public function hasXDebug()
159159
{
@@ -163,7 +163,7 @@ public function hasXDebug()
163163
/**
164164
* Returns true if EAccelerator is enabled.
165165
*
166-
* @return bool true if EAccelerator is enabled, false otherwise
166+
* @return bool true if EAccelerator is enabled, false otherwise
167167
*/
168168
public function hasEAccelerator()
169169
{
@@ -173,7 +173,7 @@ public function hasEAccelerator()
173173
/**
174174
* Returns true if APC is enabled.
175175
*
176-
* @return bool true if APC is enabled, false otherwise
176+
* @return bool true if APC is enabled, false otherwise
177177
*/
178178
public function hasApc()
179179
{
@@ -183,7 +183,7 @@ public function hasApc()
183183
/**
184184
* Returns true if Zend OPcache is enabled
185185
*
186-
* @return bool true if Zend OPcache is enabled, false otherwise
186+
* @return bool true if Zend OPcache is enabled, false otherwise
187187
*/
188188
public function hasZendOpcache()
189189
{
@@ -193,7 +193,7 @@ public function hasZendOpcache()
193193
/**
194194
* Returns true if XCache is enabled.
195195
*
196-
* @return bool true if XCache is enabled, false otherwise
196+
* @return bool true if XCache is enabled, false otherwise
197197
*/
198198
public function hasXCache()
199199
{
@@ -203,7 +203,7 @@ public function hasXCache()
203203
/**
204204
* Returns true if WinCache is enabled.
205205
*
206-
* @return bool true if WinCache is enabled, false otherwise
206+
* @return bool true if WinCache is enabled, false otherwise
207207
*/
208208
public function hasWinCache()
209209
{
@@ -213,7 +213,7 @@ public function hasWinCache()
213213
/**
214214
* Returns true if any accelerator is enabled.
215215
*
216-
* @return bool true if any accelerator is enabled, false otherwise
216+
* @return bool true if any accelerator is enabled, false otherwise
217217
*/
218218
public function hasAccelerator()
219219
{

‎DataCollector/ExceptionDataCollector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function collect(Request $request, Response $response, \Exception $except
3737
/**
3838
* Checks if the exception is not null.
3939
*
40-
* @return bool true if the exception is not null, false otherwise
40+
* @return bool true if the exception is not null, false otherwise
4141
*/
4242
public function hasException()
4343
{
@@ -67,7 +67,7 @@ public function getMessage()
6767
/**
6868
* Gets the exception code.
6969
*
70-
* @return int The exception code
70+
* @return int The exception code
7171
*/
7272
public function getCode()
7373
{
@@ -77,7 +77,7 @@ public function getCode()
7777
/**
7878
* Gets the status code.
7979
*
80-
* @return int The status code
80+
* @return int The status code
8181
*/
8282
public function getStatusCode()
8383
{

‎DataCollector/MemoryDataCollector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function lateCollect()
4848
/**
4949
* Gets the memory.
5050
*
51-
* @return int The memory
51+
* @return int The memory
5252
*/
5353
public function getMemory()
5454
{
@@ -58,7 +58,7 @@ public function getMemory()
5858
/**
5959
* Gets the PHP memory limit.
6060
*
61-
* @return int The memory limit
61+
* @return int The memory limit
6262
*/
6363
public function getMemoryLimit()
6464
{

‎DataCollector/RouterDataCollector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function onKernelController(FilterControllerEvent $event)
6969
}
7070

7171
/**
72-
* @return bool Whether this request will result in a redirect
72+
* @return bool Whether this request will result in a redirect
7373
*/
7474
public function getRedirect()
7575
{

‎DataCollector/TimeDataCollector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function getInitTime()
119119
/**
120120
* Gets the request time.
121121
*
122-
* @return int The time
122+
* @return int The time
123123
*/
124124
public function getStartTime()
125125
{

‎Event/GetResponseEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function setResponse(Response $response)
6161
/**
6262
* Returns whether a response was set
6363
*
64-
* @return bool Whether a response was set
64+
* @return bool Whether a response was set
6565
*
6666
* @api
6767
*/

‎Event/GetResponseForExceptionEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
4747
/**
4848
* Returns the thrown exception
4949
*
50-
* @return \Exception The thrown exception
50+
* @return \Exception The thrown exception
5151
*
5252
* @api
5353
*/

‎Event/KernelEvent.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public function getRequest()
7777
/**
7878
* Returns the request type the kernel is currently processing
7979
*
80-
* @return int One of HttpKernelInterface::MASTER_REQUEST and
81-
* HttpKernelInterface::SUB_REQUEST
80+
* @return int One of HttpKernelInterface::MASTER_REQUEST and
81+
* HttpKernelInterface::SUB_REQUEST
8282
*
8383
* @api
8484
*/

0 commit comments

Comments
 (0)