* 2.4:
[Validator] Add missing ru translations
don't disable constructor calls to mockups of classes that extend internal PHP classes
special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer
Conflicts:
src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
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
* 2.4:
fixed previous merge
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/Bundle/TwigBundle/composer.json
* 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
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
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
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
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
This PR was merged into the 2.5 branch.
Discussion
----------
[YAML] fix merge node (<<)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | yes but according to spec
| Deprecations? | no
| Tests pass? | yes
| Needs merge to | 2.5
| Fixed tickets | #11142 and #11154
| License | MIT
| Doc PR | —
First commit small refactoring.
Second fixes#11154 (causing a BC break for a less common feature)
Third fixes#11142
Commits
-------
dee1562 [Yaml] fix overwriting of keys after merged map
8c621ab [Yaml] fix priority of sequence merges according to spec
02614e0 [Yaml] refactoring of merges for performance
This PR was merged into the 2.5 branch.
Discussion
----------
[Console] Fixed notice in QuestionHelper
| 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
-------
9fe4b88 [Console] Fixed notice in QuestionHelper
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
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
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5][FrameworkBundle] Redirect server output to /dev/null in case no verbosity is needed
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n/a
| License | MIT
This should reduce I/Os
Commits
-------
6d9fd62 [FrameworkBundle] Redirect server output to /dev/null in case no verbosity is needed
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
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
* 2.4:
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
* 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
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5][Process] Do not redirect output to file handles when output is disabled, simply discard it
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n/a
| License | MIT
Commits
-------
b35250f [Process] Do not redirect output to file handles when output is disabled
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...
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
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
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
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes#11117).
Discussion
----------
[Validator] Fix array notation in the PropertyPath::append()
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | related #11072#11046 (not fixed yet)
| License | MIT
| Doc PR | -
Commits
-------
aa6b08d [Validator] Fix array notation in the PropertyPath::append()
This PR was squashed before being merged into the 2.5 branch (closes#11111).
Discussion
----------
Fixed undefined ImageValidator::$suffices property when uploading an image during functional tests
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #11110
| License | MIT
| Doc PR |
This will make the FileValidator::$suffices attribute protected so ImageValidator or any inherited class can access it. It fixes#11110 in the most simple way possible.
Commits
-------
859f34e Fixed undefined ImageValidator:: property when uploading an image during functional tests
