This PR was merged into the 2.0 branch.
Commits
-------
ddf4678 [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes#6923, closes#6936)
Discussion
----------
[HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes#6923, closes#6936)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6923, #6936
| License | MIT
| Doc PR | n/a
This fixes the creation of a sub-request when the master request Request URI
is determined with specific server information.
This PR was merged into the 2.1 branch.
Commits
-------
8ca00c5 [Security] fixed session creation when none is needed (closes#6917)
Discussion
----------
[Security] fixed session creation when none is needed (closes#6917)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6917
| License | MIT
| Doc PR | n/a
---------------------------------------------------------------------------
by drak at 2013-02-04T16:24:49Z
That looks good. Maybe we need a test for this logic to prevent any regression in the future?
---------------------------------------------------------------------------
by bendavies at 2013-02-04T16:30:38Z
Yep, this was exactly what i tried locally, but really wasn't familiar enough with it to be confident enough to submit it as a fix.
Works for me!
---------------------------------------------------------------------------
by bendavies at 2013-02-04T17:19:32Z
A few test failures which were added by the breaking PR #2414 in the first place.
---------------------------------------------------------------------------
by fabpot at 2013-02-04T18:00:31Z
I've fixed the tests which now really test that the session is not started.
This PR was submitted for the 2.2 branch but it was merged into the 2.0 branch instead (closes#6959).
Commits
-------
ad889c9 [DependencyInjection] fixed a circular call (closes#6864)
Discussion
----------
[DependencyInjection] fixed a circular call (closes#6864)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6864
| License | MIT
| Doc PR | n/a
This PR was merged into the 2.1 branch.
Commits
-------
e7624b6 [Security] Add PHPDoc to AuthenticationEvents
Discussion
----------
[Security] Added PHPDoc to AuthenticationEvents
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
This PR was merged into the 2.1 branch.
Commits
-------
d6c0455 Correct comment in NativeSessionStorage regarding session.save_handler
Discussion
----------
Correct comment in NativeSessionStorage regarding session.save_handler
It's save_handler, not save_handlers.
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6884).
Commits
-------
c261760 Fixed missing class argument when throwing exception
Discussion
----------
Added missing parameter to Exception in DebugClassLoader
The DebugClassLoader was missing the $class argument to sprintf() when it tries to throw the exception, making the actual error you are getting more daunting :)
---------------------------------------------------------------------------
by stof at 2013-01-25T23:31:58Z
oops, sorry.
@fabpot this should be merged in 2.1 as you merged the change there
* 2.0:
[DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
[Security] PHPDoc in SecurityEvents
[FrameworkBundle] fixed Client::doRequest that must call its parent method (closes#6737)
[Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes#6786)
[Yaml] fixed#6773
[Yaml] fixed#6770
bumped Symfony version to 2.0.23-DEV
Conflicts:
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Yaml/Inline.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
This PR was merged into the 2.0 branch.
Commits
-------
4119caf [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
Discussion
----------
[DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n/a
| License | MIT
| Doc PR | n/a
---------------------------------------------------------------------------
by stof at 2013-01-22T00:14:29Z
👍
This PR was squashed before being merged into the 2.0 branch (closes#6818).
Commits
-------
598ae9d [Security] PHPDoc in SecurityEvents
Discussion
----------
[Security] PHPDoc in SecurityEvents
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
I'm not sure about the description given.
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#6803).
Commits
-------
be05741 Added an error message in the DebugClassLoader when using / instead of \.
Discussion
----------
Added an error message in the DebugClassLoader when using / instead of \.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR | n/a
Using ``/`` instead of ``\`` when writing class names in a configuration seems to happen regularly. See aba8f1e180 (commitcomment-2461266) for the latest case I saw. I guess it may come from the fact that SensioGeneratorBundle allows using both for convenience in the CLI to get rid of escaping issues.
This will give people a better error message when they use a ``/`` instead of having them figure that the class name in the message using ``/`` and not ``\`` and this is the reason of the issue.
This PR was merged into the 2.0 branch.
Commits
-------
53ccc2c [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes#6786)
Discussion
----------
[Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes#6786)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6786
| License | MIT
| Doc PR | n/a
This PR was merged into the 2.0 branch.
Commits
-------
ce38069 [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes#6737)
Discussion
----------
[FrameworkBundle] fixed Client::doRequest that must call its parent method (closes#6737)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6737
| License | MIT
| Doc PR | n/A
This PR was merged into the 2.0 branch.
Commits
-------
fea20b7 [Yaml] fixed#6770
Discussion
----------
[Yaml] fixed parsing of negative integers (2.0 branch)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6770
| License | MIT
| Doc PR | n/a
Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
This PR was merged into the 2.0 branch.
Commits
-------
ab0385c [Yaml] fixed#6773
Discussion
----------
[Yaml] fixed parsing of blocks with 'keep' chomping indicators (2.0 branch)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6773
| License | MIT
| Doc PR | n/a
Also added a full set of tests for all combinations of literal/folded blocks and strip/clip/keep chomping indicators in both mid-file and end-of file positions.
* 2.0:
[Yaml] fixed unneeded BC break
[DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
[Yaml] fixed typo
updated VERSION for 2.0.22
update CONTRIBUTORS for 2.0.22
updated CHANGELOG for 2.0.22
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
* 2.0:
[Yaml] fixed default value
Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
added a way to enable/disable object support when parsing/dumping
added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
[Console] fixed input bug when the value of an option is empty (closes#6649, closes#6689)
Conflicts:
src/Symfony/Component/Yaml/Dumper.php
src/Symfony/Component/Yaml/Parser.php
src/Symfony/Component/Yaml/Tests/DumperTest.php
src/Symfony/Component/Yaml/Tests/ParserTest.php
src/Symfony/Component/Yaml/Yaml.php
YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/
Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.
The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).
Conflicts:
src/Symfony/Component/Yaml/Dumper.php
src/Symfony/Component/Yaml/Yaml.php
By default, object support is disabled, and instead of throwing an
exception when an object is handled, null is returned.
If you do need object support, enable it via:
Yaml::dump($data, false, true);
If you want an exception to be thrown in case an invalid type is handled
(a PHP resource or a PHP object), pass true as the second argument:
Yaml::dump($data, true, true);
The same can be done when parsing:
Yaml::parse($data, 2, false, true);
