Commit Graph

17167 Commits

Author SHA1 Message Date
Romain Neutron
7fab25e48d Fix doc-blocks 2014-04-18 22:45:55 +02:00
Fabien Potencier
7505c19dec minor #10738 [2.4] Fix doc blocks (romainneutron)
This PR was merged into the 2.4 branch.

Discussion
----------

[2.4] Fix doc blocks

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT

this follows #10737

Commits
-------

c01915d Fix doc blocks
2014-04-18 22:41:38 +02:00
Fabien Potencier
8ef8a1d289 unified return null usages 2014-04-18 22:40:52 +02:00
Fabien Potencier
0bab829372 Merge branch '2.4'
* 2.4:
  unified return null usages
  [Validator] added Japanese translation
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  updated doc
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
2014-04-18 22:40:13 +02:00
Fabien Potencier
e50d263f7a unified return null usages 2014-04-18 22:38:54 +02:00
Romain Neutron
c01915da95 Fix doc blocks 2014-04-18 22:37:14 +02:00
Fabien Potencier
2827747108 Merge branch '2.3' into 2.4
* 2.3:
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/Console/Helper/DescriptorHelper.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
	src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
2014-04-18 22:37:09 +02:00
Fabien Potencier
5b72e5ab04 minor #10717 unified return null usages (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

unified return null usages

| Q             | A
| ------------- | ---
| License       | MIT

This PR unifies the way we return `null` from a function or method:

 * always use `return;` instead of `return null;` (the current code base uses both);
 * never use `return;` at the end of a function/method.

Commits
-------

d1d569b unified return null usages
2014-04-18 22:35:25 +02:00
Fabien Potencier
b2e906ea41 minor #10726 [HttpFoundation] factorize out the way output buffers should be closed (nicolas-grekas)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[HttpFoundation] factorize out the way output buffers should be closed

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Closing output buffers was done in three different files, but not exactly the same way, with subtle differences.
This PR factorizes out the best way to do this in a new public static function of the Response class.

Commits
-------

469943c [HttpFoundation] factorize out the way output buffers should be closed
2014-04-18 22:33:23 +02:00
Fabien Potencier
78e72fe3bf bug #10721 [HttpFoundation] status 201 is allowed to have a body (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] status 201 is allowed to have a body

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | only if someone relied on wrong behavior
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10673
| License       | MIT

Status 201 is allowed to have a response body.

Commits
-------

1761f64 [HttpFoundation] status 201 is allowed to have a body
2014-04-18 22:26:13 +02:00
Fabien Potencier
45184aac06 bug #10728 [2.3][Process] Fix #10681, process are failing on Windows Server 2003 (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Fix #10681, process are failing on Windows Server 2003

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10681
| License       | MIT

Commits
-------

46fdfbb [Process] Fix #10681, process are failing on Windows Server 2003
2014-04-18 22:23:17 +02:00
Fabien Potencier
b551f9f4ad minor #10732 [Validator] added Japanese translation (issei-m)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #10732).

Discussion
----------

[Validator] added Japanese translation

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

7b91e03 [Validator] added Japanese translation
2014-04-18 22:22:10 +02:00
Issei.M
7b91e03251 [Validator] added Japanese translation 2014-04-18 22:22:10 +02:00
Fabien Potencier
4f9e05cb55 minor #10737 [2.3] Fix doc blocks (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix doc blocks

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT

Commits
-------

de5d627 Fix doc blocks
2014-04-18 22:20:50 +02:00
Fabien Potencier
6f62416b20 bug #10733 [DomCrawler] Textarea value should default to empty string instead of null. (Berdir)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10733).

Discussion
----------

[DomCrawler] Textarea value should default to empty string instead of null.

Noticed this when working on Updating Behat/Mink/Goutte to Guzzle 4, see https://github.com/fabpot/Goutte/pull/140 and https://github.com/Behat/MinkGoutteDriver/pull/34.

Testing this with Drupal 8, trying to submit a Form which has empty form elements, the $value in a TextArea form elements defaults to null, then we end up with those in getValues() and then http_build_query() creates an empty string for those. That results in array keys like ['' => false]. This is then passed through to Guzzle, which ends up in MessageFactory::addPostData(), goes into the else creates and tries to create file with those values, which will throw an exception in GuzzleHttp\Stream::create(): with "Invalid resource type false".

I think the correct fix is to default to an empty string instead of null.

Will also need tests,

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

f672564 Textarea value should default to empty string instead of null.
2014-04-18 22:19:23 +02:00
Sascha Grossenbacher
f6725648cc Textarea value should default to empty string instead of null. 2014-04-18 22:19:23 +02:00
Romain Neutron
de5d62775a Fix doc blocks 2014-04-18 22:17:16 +02:00
Fabien Potencier
3c42345293 fixed typo 2014-04-18 21:44:02 +02:00
Fabien Potencier
61d1e5f3c7 minor #10736 Update PackageInterface.php (ibasaw)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Update PackageInterface.php

found a typo

Commits
-------

e043329 Update PackageInterface.php
2014-04-18 21:43:00 +02:00
ibasaw
e0433297b2 Update PackageInterface.php 2014-04-18 13:56:04 +02:00
Nicolas Grekas
469943cd1c [HttpFoundation] factorize out the way output buffers should be closed 2014-04-17 16:18:17 +00:00
Romain Neutron
46fdfbbdef [Process] Fix #10681, process are failing on Windows Server 2003 2014-04-17 14:29:47 +02:00
Fabien Potencier
76170fcf96 bug #10723 [Security] fix DBAL connection typehint (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fix DBAL connection typehint

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT

Commits
-------

c05edcc [Security] fix DBAL connection typehint
2014-04-17 09:12:34 +02:00
Fabien Potencier
371763a18e minor #10724 An omission of updating the doc (issei-m)
This PR was merged into the 2.4 branch.

Discussion
----------

An omission of updating the doc

Commits
-------

b1202b0 updated doc
2014-04-17 09:08:54 +02:00
Issei.M
b1202b030b updated doc 2014-04-17 15:05:16 +09:00
Tobias Schultze
c05edcc68d [Security] fix DBAL connection typehint 2014-04-17 00:04:03 +02:00
Tobias Schultze
1761f64023 [HttpFoundation] status 201 is allowed to have a body 2014-04-16 23:31:51 +02:00
Tobias Schultze
524bf846db [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface 2014-04-16 17:40:08 +02:00
Tobias Schultze
ccdfbe6628 [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite) 2014-04-16 17:38:17 +02:00
Fabien Potencier
f72eb34fc4 fixed types in phpdocs 2014-04-16 12:36:34 +02:00
Fabien Potencier
2314328b16 Merge branch '2.4'
* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
2014-04-16 12:36:21 +02:00
Fabien Potencier
0ecdda1770 fixed types in phpdocs 2014-04-16 12:34:42 +02:00
Fabien Potencier
d5bd9bdd68 Merge branch '2.3' into 2.4
* 2.3:
  fixed types in phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Templating/PhpEngine.php
2014-04-16 12:34:31 +02:00
Fabien Potencier
e96b018805 fixed types in phpdocs 2014-04-16 12:30:19 +02:00
François-Xavier de Guillebon
f35fc818d1 [Finder] Marked test skipped when ftp stream wrapper is not available 2014-04-16 11:24:56 +02:00
Fabien Potencier
339c0c8099 made {@inheritdoc} annotations consistent across the board 2014-04-16 10:09:16 +02:00
Fabien Potencier
24dde55feb made types consistent with those defined in Hack 2014-04-16 10:09:01 +02:00
Fabien Potencier
df3d543349 Merge branch '2.4'
* 2.4:
  made types consistent with those defined in Hack
  made {@inheritdoc} annotations consistent across the board
  made {@inheritdoc} annotations consistent across the board
  fixed types in phpdocs
  [Debug] Fixed ClassNotFoundFatalErrorHandler on windows.
  made phpdoc types consistent with those defined in Hack
  Add support Thai translations
  [Validator] Add missing czech translations
  made types consistent with those defined in Hack
  removed extra/unsupported arguments
  [HttpKernel] fixed an error message
  [TwigBundle] removed undefined argument
  [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.

Conflicts:
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/Form/FormError.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Translation/Dumper/FileDumper.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/Mapping/BlackholeMetadataFactory.php
2014-04-16 10:08:40 +02:00
Fabien Potencier
041cb7b103 made types consistent with those defined in Hack 2014-04-16 10:04:32 +02:00
Fabien Potencier
03f0c2de8a made {@inheritdoc} annotations consistent across the board 2014-04-16 10:03:46 +02:00
Fabien Potencier
29b6f6b3a0 Merge branch '2.3' into 2.4
* 2.3:
  made {@inheritdoc} annotations consistent across the board
  fixed types in phpdocs
  made phpdoc types consistent with those defined in Hack
  Add support Thai translations
  made types consistent with those defined in Hack
  removed extra/unsupported arguments
  [HttpKernel] fixed an error message
  [TwigBundle] removed undefined argument
  [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.

Conflicts:
	src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Console/Helper/DescriptorHelper.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.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/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
	src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
	src/Symfony/Component/Translation/TranslatorInterface.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2014-04-16 10:02:57 +02:00
Fabien Potencier
d1d569bf7b unified return null usages 2014-04-16 09:43:51 +02:00
Fabien Potencier
d56ea768cc minor #10713 made {@inheritdoc} annotations consistent across the board (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

made {@inheritdoc} annotations consistent across the board

| Q             | A
| ------------- | ---
| License       | MIT

Commits
-------

810b9ed made {@inheritdoc} annotations consistent across the board
2014-04-16 09:04:52 +02:00
Fabien Potencier
810b9ed107 made {@inheritdoc} annotations consistent across the board 2014-04-16 09:04:20 +02:00
Fabien Potencier
a693545324 fixed types in phpdocs 2014-04-16 08:51:57 +02:00
Fabien Potencier
3ad7127a79 bug #10715 [Debug] Fixed ClassNotFoundFatalErrorHandler on windows. (lyrixx)
This PR was merged into the 2.4 branch.

Discussion
----------

[Debug] Fixed ClassNotFoundFatalErrorHandler on windows.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | no
| License       | MIT

Because `$path` is `realpath`'ed. So we have to use `DIRECTORY_SEPARATOR`
instead of `/` because the default directory separator on windows is
`\`. And so the `str_replace` can not work and can lead to a fatal error
because class could already be loaded. For example, the `Response` class
in symfony full stack is in the `bootstrap.php.cache`.

ping @nicolas-grekas

Commits
-------

2ce8cd9 [Debug] Fixed ClassNotFoundFatalErrorHandler on windows.
2014-04-15 21:39:09 +02:00
Grégoire Pineau
2ce8cd993e [Debug] Fixed ClassNotFoundFatalErrorHandler on windows.
Because $path is realpath'ed. So we have to use DIRECTORY_SEPARATOR
instead of / because the default directory separator on windows is
\. And so the str_replace can not work and can lead to a fatal error
because class could already be loaded. For example, the Response class
in symfony full stack is in the bootstrap.php.cache.
2014-04-15 18:41:05 +02:00
Fabien Potencier
c2e134fbb9 minor #10701 Made types used by Symfony compatible with the ones of Hack (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Made types used by Symfony compatible with the ones of Hack

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

PHP supports several ways to express types: like Boolean/bool or integer/int. Hack only supports one of them, so this PR proposes to use the Hack type to make Symfony a bit more "compatible" with Hack (gradual upgrade ;)).

Commits
-------

3c9c10f made phpdoc types consistent with those defined in Hack
0555b7f made types consistent with those defined in Hack
2014-04-15 07:44:12 +02:00
Fabien Potencier
3c9c10f3a0 made phpdoc types consistent with those defined in Hack 2014-04-15 07:41:45 +02:00
Fabien Potencier
836bc10952 minor #10712 [Validator] Added missing czech translations (jskvara)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Added missing czech translations

| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT

Added czech translations for strings from image validator #10672

Commits
-------

995ec72 [Validator] Add missing czech translations
2014-04-15 07:29:28 +02:00