merged branch franmomu/patch-1 (PR #7317)

This PR was merged into the 2.1 branch.

Commits
-------

547350c [FrameworkBundle] Fix code status in dockblock

Discussion
----------

[FrameworkBundle] Fixed code status in docblock

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

---------------------------------------------------------------------------

by Tobion at 2013-03-09T15:23:46Z

:+1:
[HttpKernel] made the classmap lazy-loaded
fix xargs pipe to work with spaces in dir names
Merge branch '2.1' into 2.2

* 2.1:
  [FrameworkBundle] Fix code status in dockblock
  Fixed test to use Reflection
  [Finder] fixed a potential issue on Solaris where INF value is wrong (refs #7269)
  Update RouteCompiler.php
  [FrameworkBundle] avoids cache:clear to break if new/old folders already exist
  [HttpKernel] Fixed possible profiler token collision (closes #7272, closes #7171)
  [ClassLoader] tweaked test
  [ClassLoader] made DebugClassLoader idempotent
  [DomCrawler] Fix relative path handling in links

Conflicts:
	src/Symfony/Component/DomCrawler/Link.php
	src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
	src/Symfony/Component/Routing/RouteCompiler.php
merged branch havvg/hotfix/finder-spaces-in-dir (PR #7327)

This PR was merged into the 2.2 branch.

Commits
-------

a735cbd fix xargs pipe to work with spaces in dir names

Discussion
----------

[Finder] fix xargs pipe to work with spaces in dir names

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

.. otherwise grep fails:

````
grep: : No such file or directory
grep: /Users/havvg/Web: No such file or directory
grep: Development/symfony2/src/Symfony/Component/Finder/Tests/Fixtures/dolor.txt: No such file or directory
```
[2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions
merged branch Aitboudad/ticket_7309 (PR #7321)

This PR was squashed before being merged into the 2.2 branch (closes #7321).

Commits
-------

4f3771d [2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions

Discussion
----------

[2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/7309

---------------------------------------------------------------------------

by Aitboudad at 2013-03-10T11:38:59Z

Hi @fabpot,
can you see why  all commits has failed on Travis ?

---------------------------------------------------------------------------

by henrikbjorn at 2013-03-10T11:42:25Z

The test expects the option to be called `renderer` and not `strategy` so you need to change the tests.

---------------------------------------------------------------------------

by Aitboudad at 2013-03-10T12:19:19Z

@henrikbjorn thanks it's ok, but there is still 1 test :( in Symfony\Component\Form\Tests\Extension\Core\Type\TimeTypeTest::testSetDataDifferentTimezones
@bschussek Can you see why :).
Property accessor custom array object fix
merged branch cystbear/PropertyAccessor-CustomArrayObject-Fix (PR #7320)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7320).

Commits
-------

7ff2d52 Property accessor custom array object fix

Discussion
----------

Property accessor custom array object fix

Copied `Symfony\Component\Form\Tests\Fixtures\CustomArrayObject` to Fixtures dir, and used it in tests to be able run tests separately from Form component,
Update SecurityDataCollector.php

fixed annotations
[FrameworkBundle] fixed regression for the translator fallback configuration (refs #7100, closes #7315)
merged branch fabpot/fix-setFallbackLocales (PR #7334)

This PR was merged into the master branch.

Commits
-------

44c8654 [FrameworkBundle] fixed regression for the translator fallback configuration (refs #7100, closes #7315)

Discussion
----------

[FrameworkBundle] fixed regression for the translator fallback configuration (refs #7100, closes #7315)

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

---------------------------------------------------------------------------

by craue at 2013-03-11T22:09:35Z

:+1:
fixed id case when setting a service (also slightly enhanced an error message)
merged branch fabpot/deic-fix (PR #7333)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7333).

Commits
-------

6992a9e [DependencyInjection] fixed id case when setting a service (also slightly enhanced an error message)

Discussion
----------

[DependencyInjection] fixed id case when setting a service (also slightly enhanced an error message)

| 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
[TwigBridge] fixes
merged branch jfsimon/issue-6747 (PR #7281)

This PR was squashed before being merged into the 2.1 branch (closes #7281).

Commits
-------

e3547c6 [TwigBridge] fixes

Discussion
----------

[TwigBridge] fixes `TranslationDefaultDomainNodeVisitor`

... by adding scope management.

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

---------------------------------------------------------------------------

by vicb at 2013-03-06T15:14:57Z

Are `open` and `close` good names ? I would prefer `addChild` and `getParent` as there is nothing that is really opened or closed ?

Edit: by looking at the code a second time, I think open & close make sense .

---------------------------------------------------------------------------

by jfsimon at 2013-03-07T13:46:13Z

@vicb I know this is not consistent with the rest of the framework.
I dont think @fabpot will like them.

---------------------------------------------------------------------------

by stof at 2013-03-07T13:53:14Z

what about enter and leave ? It would be consistent with the naming used for scopes in the DI component

---------------------------------------------------------------------------

by vicb at 2013-03-07T13:59:35Z

@stof I like your proposal. My main concern being "leave" (former "close"), @jfsimon could you throw when a scope is used after it has been left ?

---------------------------------------------------------------------------

by jfsimon at 2013-03-07T14:01:56Z

go for enter/leave, but why throwing an exception on using a leaved scope?

---------------------------------------------------------------------------

by vicb at 2013-03-07T14:05:22Z

because if you have a ref to a left scope, you can still use it which is bad
[Translation] added xliff loader/dumper with resname support
merged branch jfsimon/issue-5940 (PR #7304)

This PR was squashed before being merged into the 2.1 branch (closes #7304).

Commits
-------

5bc30bb [Translation] added xliff loader/dumper with resname support

Discussion
----------

[Translation] added xliff loader/dumper with resname support

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

---------------------------------------------------------------------------

by jfsimon at 2013-03-08T15:49:18Z

@Tobion what do you think of `XliffFileWithResnameDumper` and `XliffFileWithResnameLoader`?

---------------------------------------------------------------------------

by robinduval at 2013-03-08T15:49:58Z

:100: great idea !

---------------------------------------------------------------------------

by lizjulien at 2013-03-08T15:51:45Z

:star2: better.

---------------------------------------------------------------------------

by saro0h at 2013-03-08T15:52:50Z

:+1:  Can't be worse than the previous one

---------------------------------------------------------------------------

by dxb at 2013-03-08T16:00:32Z

+1

---------------------------------------------------------------------------

by Tobion at 2013-03-08T16:07:59Z

@jfsimon yes the name make sense. It is not possible to add this feature without BC break?
And if not, why not simply add an option/enable method to the existing classes. Having new classes for this seems awkward to me.

---------------------------------------------------------------------------

by jfsimon at 2013-03-08T16:17:44Z

@Tobion I totaly agree with you, but this has been discussed in #5940.
Does the presence of the `resname` attribute in the `trans-unit` tags represent a BC break?
Would opening another PR with this solution be a good idea?

---------------------------------------------------------------------------

by stof at 2013-03-08T17:01:00Z

Your XliffFileWithResnameLoader is able to load all files supported by XliffFileLoader so IMO you don't need to add a new class.

---------------------------------------------------------------------------

by jfsimon at 2013-03-08T18:21:32Z

@stof would the `resname` attribute addition in the dumped XLIFF be considered as a BC break?

---------------------------------------------------------------------------

by jfsimon at 2013-03-09T13:16:32Z

@stof done.
@mvrhov done.
replace INF to PHP_INT_MAX inside Finder component.

bug issue introduced by 7c66dffa6b
[Translation] removed wriong 'use'