Commit Graph

17211 Commits

Author SHA1 Message Date
Fabien Potencier
bdf874f593 [MonologBridge] fixed Console handler priorities 2014-07-23 14:15:23 +02:00
Fabien Potencier
7b0ed91eae minor #11225 [Validator] added Lithuanian translation for empty file (Tadcka)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #11225).

Discussion
----------

[Validator] added Lithuanian translation for empty file

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

Commits
-------

a954083 [Validator] added Lithuanian translation for empty file
2014-06-26 09:09:23 +02:00
Tadcka
a9540835bb [Validator] added Lithuanian translation for empty file 2014-06-26 09:09:23 +02:00
Fabien Potencier
05c51f5441 minor #11203 Added missing dutch translations (WouterJ)
This PR was squashed before being merged into the 2.4 branch (closes #11203).

Discussion
----------

Added missing dutch translations

Commits
-------

bd9283e Added missing dutch translations
2014-06-25 12:28:44 +02:00
Wouter J
bd9283e616 Added missing dutch translations 2014-06-25 12:28:43 +02:00
Fabien Potencier
f6eb9b61c3 minor #11201 [Validator] Added missing pt and pt_BR translations (dcsg)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #11201).

Discussion
----------

[Validator] Added missing pt and pt_BR translations

| 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
-------

71a2b59 Added missing pt and pt_BR translations
2014-06-24 18:10:01 +02:00
Daniel Gomes
71a2b59572 Added missing pt and pt_BR translations 2014-06-24 18:10:01 +02:00
Fabien Potencier
00679520b2 minor #11195 [Validator] Add missing ru translations (megazoll)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Add missing ru translations

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

Commits
-------

71eb8a8 [Validator] Add missing ru translations
2014-06-23 09:29:44 +02:00
Vyacheslav Salakhutdinov
71eb8a8c0f [Validator] Add missing ru translations 2014-06-22 09:51:52 +00:00
Fabien Potencier
f45f2dfd00 minor #11191 [Tests] fix tests due to recent changes in PHP's behavior (xabbuh)
This PR was merged into the 2.4 branch.

Discussion
----------

[Tests] fix tests due to recent changes in PHP's behavior

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

The drawback of this solution is that the pretty printed string produced by ``json_encode()`` isn't validated anymore. Instead, the tests only ensures that the represented object structure is as expected. I guess that's fair enough since the goal of the test is not to test PHP's pretty printing feature.

Commits
-------

bc8042d don't disable constructor calls to mockups of classes that extend internal PHP classes
f4a3c7a special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer
2014-06-21 19:50:06 +02:00
Christian Flothmann
bc8042dc34 don't disable constructor calls to mockups of classes that extend internal PHP classes 2014-06-21 00:02:36 +02:00
Christian Flothmann
f4a3c7a370 special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer 2014-06-20 23:33:58 +02:00
Fabien Potencier
f2bdc22b0d fixed previous merge 2014-06-20 19:37:57 +02:00
Fabien Potencier
b387477d51 Merge branch '2.3' into 2.4
* 2.3:
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Console] Fixed notice in DialogHelper
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  Add framework-bundle

Conflicts:
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2014-06-20 19:36:47 +02:00
Fabien Potencier
eeeae94196 minor #11187 [Tests] don't disable constructor calls to mockups of classes that extend intern... (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Tests] don't disable constructor calls to mockups of classes that extend intern...

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

Fixes the tests for the 2.3 branch as reported by @stof in #11176.

Commits
-------

2c726b8 don't disable constructor calls to mockups of classes that extend internal PHP classes
2014-06-20 19:32:59 +02:00
Fabien Potencier
ff00dcce7d bug #11186 Added missing break statement (apfelbox)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11186).

Discussion
----------

Added missing `break` statement

Added a missing `break` statement in `AbstractFindAdapter` - a fall-through doesn't seem to be intended here.

Commits
-------

5af2802 Added missing `break` statement
2014-06-20 18:06:34 +02:00
Jannik Zschiesche
5af2802661 Added missing break statement
Added missing `break` statement in `AbstractFindAdapter` - a fall through doesn't seem to be intended here.
2014-06-20 18:06:33 +02:00
Christian Flothmann
2c726b8988 don't disable constructor calls to mockups of classes that extend internal PHP classes 2014-06-20 17:17:50 +02:00
Fabien Potencier
96bc061109 minor #11182 Small comment update according to PSR-2 (apfelbox)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11182).

Discussion
----------

Small comment update according to PSR-2

See [PSR-2](http://www.php-fig.org/psr/psr-2/) paragraph 5.2

> There MUST be a comment such as `// no break` when fall-through is intentional in a non-empty case body.

Related to #11181

Commits
-------

31b1dff Small comment update according to PSR-2
2014-06-20 16:22:59 +02:00
Jannik Zschiesche
31b1dff875 Small comment update according to PSR-2
See [PSR-2](http://www.php-fig.org/psr/psr-2/) paragraph 5.2

> There MUST be a comment such as `// no break` when fall-through is intentional in a non-empty case body.

Related to #11181
2014-06-20 16:22:59 +02:00
Fabien Potencier
7d4f4f276a bug #11169 [Console] Fixed notice in DialogHelper (florianv)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fixed notice in DialogHelper

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

When pressing escape in a question, a notice is shown because the sequence is only 2 characters long.

Commits
-------

ff6c65e [Console] Fixed notice in DialogHelper
2014-06-19 11:31:20 +02:00
florianv
ff6c65ecf7 [Console] Fixed notice in DialogHelper 2014-06-19 01:02:32 +02:00
Fabien Potencier
fbf92e58cb bug #11144 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6 (kicken)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6

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

Commits
-------

2a0e8e3 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
2014-06-18 07:53:47 +02:00
Fabien Potencier
bd11e9216e minor #11136 [Filesystem] Fix test suite on OSX (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Filesystem] Fix test suite on OSX

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

Reviewing PR's, I realized the filesystem test suite fails on my setup (OSX, PHP 5.5.13 with posix ext). `posix_getgrgid` returns false, so some tests are failing.
This solves this issue.

Be aware that the patched method has been moved in FilesystemTestCase in recent branches

Commits
-------

e26f08e [Filesystem] Fix test suite on OSX
2014-06-17 21:57:48 +02:00
Keith Maika
2a0e8e39b8 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
Fixed issue with Request::getPort method returning an incorrect value when the HTTP_HOST header is a IPv6 address.
2014-06-17 10:14:17 -04:00
Romain Neutron
e26f08e9b5 [Filesystem] Fix test suite on OSX 2014-06-17 03:04:39 +02:00
Fabien Potencier
185aafadd0 minor #11077 [TwigBundle] [Tests] Add framework-bundle (clemens-tolboom)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11077).

Discussion
----------

[TwigBundle] [Tests] Add framework-bundle

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

I'm unable to run the test from within TwigBundle

```bash
src/Symfony/Bundle/TwigBundle
composer install
phpunit
```
gives
```
PHP Fatal error:  Class 'Symfony\Bundle\FrameworkBundle\Templating\TemplateReference' not found
```

Adding the FrameworkBundle fixes this but is that what is needed?

I believe `require` and `require-dev` should use `dev-master`
- [x] require(-dev) is not up to par with symfony master.

Commits
-------

a12471d Add framework-bundle
2014-06-16 12:23:06 +02:00
Clemens Tolboom
a12471d171 Add framework-bundle 2014-06-16 12:23:01 +02:00
Fabien Potencier
75179c78a0 Merge branch '2.3' into 2.4
* 2.3:
  PHP Fatal error when getContainer method of ContainerAwareCommand has be...
  [HttpFoundation] Fixed isSecure() check to be compliant with the docs
  Update MimeTypeExtensionGuesser.php
  fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
  Fixed the Travis build on PHP 5.3.3
2014-06-16 11:30:02 +02:00
Fabien Potencier
92d93cea80 bug #10966 PHP Fatal error when getContainer method of ContainerAwareCommand has be... (kevinvergauwen)
This PR was squashed before being merged into the 2.3 branch (closes #10966).

Discussion
----------

PHP Fatal error when getContainer method of ContainerAwareCommand has be...

PHP Fatal error when getContainer method of ContainerAwareCommand has been called within the configure method of a Command (application property is not been set yet at that time)

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

Commits
-------

8ea5c4c PHP Fatal error when getContainer method of ContainerAwareCommand has be...
2014-06-16 10:10:36 +02:00
Kevin Vergauwen
8ea5c4c0f6 PHP Fatal error when getContainer method of ContainerAwareCommand has be... 2014-06-16 10:10:33 +02:00
Fabien Potencier
efaa6ea8e6 bug #10981 [HttpFoundation] Fixed isSecure() check to be compliant with the docs (Jannik Zschiesche)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10981).

Discussion
----------

[HttpFoundation] Fixed isSecure() check to be compliant with the docs

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

According to the [php docs](http://www.php.net/manual/en/reserved.variables.server.php) the `HTTPS` field will be non-empty when the query was issued via HTTPS.

It isn't restricted to only "on" and 1.
Exception: "off" is sent by IIS

BC breaks: no, because old behavior was not conform with the docs.

Commits
-------

7bc37bd [HttpFoundation] Fixed isSecure() check to be compliant with the docs
2014-06-16 09:30:49 +02:00
Jannik Zschiesche
7bc37bd899 [HttpFoundation] Fixed isSecure() check to be compliant with the docs 2014-06-16 09:30:49 +02:00
Fabien Potencier
eca7915a1e minor #11128 Update MimeTypeExtensionGuesser.php (kevinklika)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11128).

Discussion
----------

Update MimeTypeExtensionGuesser.php

Add ```'text/rtf' => 'rtf'``` type, as it is a valid type specification for rtf documents.

Commits
-------

c986b91 Update MimeTypeExtensionGuesser.php
2014-06-16 08:02:36 +02:00
kevinklika
c986b912a9 Update MimeTypeExtensionGuesser.php
Add ```'text/rtf' => 'rtf'``` type, as it is a valid type specification for rtf documents.
2014-06-16 08:02:36 +02:00
Fabien Potencier
dd6c6a304d minor #11118 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php (1emming)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11118).

Discussion
----------

fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php

src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php

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

When running the tests in the HTTPFoundation package these failed. I felt like fixen these so I can start working with all tests green in the package.

Commits
-------

9247ef5 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
2014-06-15 10:49:34 +02:00
Seb Koelen
9247ef5e27 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php 2014-06-15 10:49:34 +02:00
Fabien Potencier
faa5c499ff minor #11107 Fixed the Travis build on PHP 5.3.3 (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the Travis build on PHP 5.3.3

Updating PHPUnit requires OpenSSL which is not available on 5.3.3 on Travis.

Commits
-------

84561d2 Fixed the Travis build on PHP 5.3.3
2014-06-12 22:08:08 +02:00
Christophe Coevoet
84561d2a6f Fixed the Travis build on PHP 5.3.3
Updating PHPUnit requires OpenSSL which is not available on 5.3.3 on
Travis.
2014-06-12 12:13:44 +02:00
Fabien Potencier
ec1065ac97 Merge branch '2.3' into 2.4
* 2.3:
  Minor doc fix.
  Simplified the way to update PHPUnit to the latest version
  [Process] Minor README update
  [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
  Fixed a html error "Element ul is not closed" in logger.html.twig
  [HttpFoundation] Officialize the 308 redirect RFC
  issue #10808 crawler test
  Empty select with attribute name="foo[]" bug fix
  Fixed contextually wrong translation
2014-06-12 12:00:57 +02:00
Fabien Potencier
d629bf6e52 minor #11105 Simplified the way to update PHPUnit to the latest version (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Simplified the way to update PHPUnit to the latest version

Commits
-------

ba37394 Simplified the way to update PHPUnit to the latest version
2014-06-12 11:58:42 +02:00
Fabien Potencier
c150409d04 minor #11106 Minor doc fix in FormTypeInterface (hansnilsson)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11106).

Discussion
----------

Minor doc fix in FormTypeInterface

Commits
-------

bf21d1a Minor doc fix.
2014-06-12 11:58:07 +02:00
Hans N. Hjort
bf21d1a0f1 Minor doc fix. 2014-06-12 11:58:07 +02:00
Christophe Coevoet
ba37394562 Simplified the way to update PHPUnit to the latest version 2014-06-12 11:36:14 +02:00
Fabien Potencier
cf28fd40b5 bug #11092 [HttpFoundation] Fix basic authentication in url with PHP-FPM (Kdecherf)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix basic authentication in url with PHP-FPM

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

`getUser()` and `getPassword()` from `Request` are broken when using PHP-FPM because of the lack of `$_SERVER['PHP_AUTH_USER']` and `$_SERVER['PHP_AUTH_PW']`. This PR fixes the issue.

However, now an empty password will return an empty string (which is the expected behavior of `ServerBag`) instead of `NULL`. The test is updated accordingly, but should we consider this as a breakage?

This issue was spotted by using basic auth via the Illuminate component of Laravel and is present from v2.1.0 to master.

Commits
-------

7a75adf [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
2014-06-12 10:56:53 +02:00
Fabien Potencier
90eeadb303 minor #11095 [2.3][Process] Minor README update (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Minor README update

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

Commits
-------

c7d6bbb [Process] Minor README update
2014-06-12 10:26:30 +02:00
Romain Neutron
c7d6bbbacc [Process] Minor README update 2014-06-11 09:56:44 +02:00
Kevin Decherf
7a75adf6f1 [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
Request#getUser() and Request#getPassword() introduced in
aecfd0a891 do not handle the lack of
PHP_AUTH_USER and PHP_AUTH_PW in $this->server when using PHP-FPM. Use
$this->headers instead.
Furthermore, the test of empty password now expects an empty string
instead of NULL according to a450d002f2.
2014-06-10 23:31:45 +02:00
Fabien Potencier
6bd80277f1 minor #11085 Fixed a html error "Element ul is not closed" in logger.html.twig (hason)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed a html error "Element ul is not closed" in logger.html.twig

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

Commits
-------

e3bf86f Fixed a html error "Element ul is not closed" in logger.html.twig
2014-06-10 15:39:20 +02:00
Martin Hasoň
e3bf86f31c Fixed a html error "Element ul is not closed" in logger.html.twig 2014-06-09 21:13:04 +02:00