Commit Graph

11964 Commits

Author SHA1 Message Date
Fabien Potencier
46341e171a merged branch bamarni/issue-6830 (PR #7408)
This PR was merged into the 2.1 branch.

Commits
-------

54609b9 [HttpCache] added a test (cached content should be kept after purging)

Discussion
----------

[HttpCache] added a test (cached content should be kept after purging)

closes #6830
2013-03-18 19:53:03 +01:00
Fabien Potencier
7b7639280c merged branch elnur/interface-public-modifier (PR #7397)
This PR was submitted for the 2.0 branch but it was merged into the 2.1 branch instead (closes #7397).

Commits
-------

8ee05e5 Add a public modifier to an interface method

Discussion
----------

[2.0][Security] Add a public modifier to an interface method

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
2013-03-18 15:34:12 +01:00
Elnur Abdurrakhimov
366bba6919 Add a public modifier to an interface method 2013-03-18 15:34:11 +01:00
Fabien Potencier
70ec4f6c61 merged branch jfsimon/issue-6928 (PR #7378)
This PR was squashed before being merged into the 2.1 branch (closes #7378).

Commits
-------

17dc2ff [HttpRequest] fixes Request::getLanguages() bug

Discussion
----------

[HttpRequest] fixes Request::getLanguages() bug

This PR adds to suported languages the first segment of all compouds languages codes.
When receiving `Accept-Language: en-us` header, accepted languages will now be `en, en_US`.

This should not be a BC break as most browsers already send the long **and** short versions of language codes... but some dont.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6928
2013-03-18 14:41:52 +01:00
Michel Weimerskirch
17dc2ff895 [HttpRequest] fixes Request::getLanguages() bug 2013-03-18 14:41:52 +01:00
Bilal Amarni
54609b9dae [HttpCache] added a test (cached content should be kept after purging) 2013-03-17 14:48:26 +01:00
Fabien Potencier
3a03f3e346 merged branch jfsimon/issue-7325 (PR #7393)
This PR was merged into the 2.1 branch.

Commits
-------

bd38483 [Security] fixed HttpUtils class tests

Discussion
----------

[Security] fixed HttpUtils class tests

This fixes tests broken in #7325.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7325
2013-03-16 16:52:12 +01:00
Fabien Potencier
358689cd3e merged branch saro0h/issue-7297 (PR #7392)
This PR was squashed before being merged into the 2.1 branch (closes #7392).

Commits
-------

67fbbac [DoctrineBridge] Fixed non-utf-8 recognition

Discussion
----------

[DoctrineBridge] Fixed non-utf-8 recognition

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

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

by jfsimon at 2013-03-15T15:10:28Z

👍

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

by francisbesset at 2013-03-15T15:17:17Z

👎

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

by pborreli at 2013-03-15T15:21:10Z

travis test is failing https://travis-ci.org/symfony/symfony/jobs/5529163#L225

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

by pborreli at 2013-03-15T15:35:31Z

if there is any regression it could help to write a new failing test first.

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

by jfsimon at 2013-03-15T15:55:52Z

@pborreli the test was already failing

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

by pborreli at 2013-03-15T15:58:52Z

@jfsimon ah ok, well it still fails 😃

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

by francisbesset at 2013-03-15T16:00:39Z

@jfsimon if this is true I gives: 👍

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

by jfsimon at 2013-03-15T16:14:47Z

@saro0h \o/

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

by pborreli at 2013-03-15T16:16:54Z

👍
2013-03-16 16:50:00 +01:00
Sarah Khalil
67fbbac877 [DoctrineBridge] Fixed non-utf-8 recognition 2013-03-16 16:50:00 +01:00
Jean-François Simon
bd38483bf2 [Security] fixed HttpUtils class tests 2013-03-15 16:24:21 +01:00
Fabien Potencier
6c0d2b92ac merged branch jfsimon/issue-7185-2.1 (PR #7388)
This PR was merged into the 2.1 branch.

Commits
-------

b9c37f2 changed sub-requests creation to '::create()'

Discussion
----------

changed sub-requests creation to '::create()'

Added @henrikbjorn suggestion to #7381
2013-03-15 11:53:31 +01:00
Jean-François Simon
b9c37f2727 changed sub-requests creation to '::create()' 2013-03-15 11:44:42 +01:00
Fabien Potencier
4ae667d7a2 merged branch jfsimon/issue-7185-2.1 (PR #7381)
This PR was merged into the 2.1 branch.

Commits
-------

e51432a sub-requests are now created with the same class as their parent

Discussion
----------

[2.1] sub-requests are now created with the same class as their parent

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

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

by lsmith77 at 2013-03-14T19:54:13Z

oh .. i thought this was already the case!

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

by gnutix at 2013-03-15T09:57:55Z

Thanks for the PR @jfsimon ! I just override the Request class for a custom getClientIp() method and I sure will need your fix in order for it to work in all scenarios. I'll test your patch in my project as soon as possible.
2013-03-15 11:04:38 +01:00
Jean-François Simon
e51432abaa sub-requests are now created with the same class as their parent 2013-03-14 17:43:08 +01:00
Fabien Potencier
cdd89fb3be merged branch jfsimon/issue-6203 (PR #7360)
This PR was merged into the 2.1 branch.

Commits
-------

f2ef6bc [FrameworkBundle] removed BC break
cc3a40e [FrameworkBundle] changed temp kernel name in cache:clear
7d87ecd [FrameworkBundle] fixed cahe:clear command's warmup

Discussion
----------

[FrameworkBundle] fixes cahe:clear command's warmup

Solution taken is to replace the last char of the cache directory name to create a temporary cache directory, this way the temporary cache path has the same length than the real one. I tested this on several projects, in dev and prod environments.

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

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

by jfsimon at 2013-03-13T12:32:25Z

@toloco @gergelypolonkai @ghost-x47 @stewe it would be great if you could test this patch on your projects and report result!

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

by toloco at 2013-03-13T12:41:47Z

Im sorry but have the same...

Notice: unserialize(): Error at offset 155 of 174227 bytes in /home/tolopalmer/Projects/shareandcoach/app/bootstrap.php.cache line 915

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

by jfsimon at 2013-03-13T12:45:04Z

@toloco could you paste the backtrace in a gist? and maybe the concerned file?

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

by stof at 2013-03-13T13:11:47Z

@jfsimon You probably have the same issue with the name of the temporary kernel class

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

by jfsimon at 2013-03-13T13:36:13Z

@stof if you're right, it's a nightmare. It must be possible to write a parser/fixer for serialized objects, don't you think?

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

by toloco at 2013-03-13T14:22:56Z

Here you are the gist with the stack and the bootstrap.php.cache file

https://gist.github.com/toloco/5152581

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

by mpdude at 2013-03-13T20:08:08Z

@jfsimon Writing such a parser is painting yourself in the corner.

Use a temp kernel class name of the same length as a quick fix.

#7230 could bring a solution because we might be able to inject a different ConfigCache factory during the command that intercepts and substitutes Resources before they get written into the meta file. Not sure if that PR has a chance of being picked though.

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

by toloco at 2013-03-14T08:19:58Z

So guys? we are blocked with this problem, can I help you? I can provide more stacks if it's needed

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

by mpdude at 2013-03-14T10:05:05Z

@toloco Could you please post the /home/tolopalmer/Projects/shareandcoach/app/cache/dev/appDevUrlMatcher.php.meta file? That's the one that is broken.

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

by jfsimon at 2013-03-14T10:15:20Z

@mpdude you can find its content in the gist https://gist.github.com/toloco/5152581 (1st file, 6th line)

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

by mpdude at 2013-03-14T10:24:55Z

@toloco That file should contain a serialized set of Resources, it's not in the Gist.

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

by jfsimon at 2013-03-14T10:33:12Z

@mpdude it's more visible in the raw file: ttps://gist.github.com/toloco/5152581/raw/48a1a823b5c8e6ba03936a52e8dc0d0ff1888f8a/Error+

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

by jfsimon at 2013-03-14T10:33:27Z

sorry: 48a1a823b5/Error+

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

by toloco at 2013-03-14T10:37:09Z

https://gist.github.com/toloco/5160317 here you are the appDevUrlMatcher.php and meta

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

by jfsimon at 2013-03-14T10:51:46Z

@toloco I applied @mpdude's solution (have a temp kernel class name of the same length than the real one).
Could you test it to see if it fixes your problem?

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

by mpdude at 2013-03-14T10:58:46Z

@jfsimon Thanks!
@toloco If Jean-François' fix does not work, please make sure that the .meta file you posted was the broken one? I was able to unserialize it without problems.

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

by toloco at 2013-03-14T11:02:09Z

Man!!!! you are the fucking boss it works!!

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

by mpdude at 2013-03-14T11:04:30Z

@jfsimon you just made someone happy.

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

by jfsimon at 2013-03-14T11:12:39Z

@toloco @mpdude \o/
2013-03-14 12:28:00 +01:00
Jean-François Simon
f2ef6bc66b [FrameworkBundle] removed BC break 2013-03-14 12:23:30 +01:00
Jean-François Simon
cc3a40ed78 [FrameworkBundle] changed temp kernel name in cache:clear 2013-03-14 11:46:34 +01:00
Fabien Potencier
18cd187ae9 merged branch jfsimon/issue-7012 (PR #7297)
This PR was squashed before being merged into the 2.1 branch (closes #7297).

Commits
-------

ef53456 [DoctrineBridge] Avoids blob values to be logged by doctrine

Discussion
----------

[DoctrineBridge] Avoids blob values to be logged by doctrine

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

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

by pborreli at 2013-03-07T17:07:23Z

what about clob ?

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

by jfsimon at 2013-03-07T17:10:45Z

@pborreli do you think clob values shouldn't be logged?

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

by pborreli at 2013-03-07T17:26:27Z

well they can have same size than blob

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

by beberlei at 2013-03-07T18:07:15Z

I agree, skipping clobs as well would be WIN :-)

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

by francisbesset at 2013-03-08T08:44:08Z

Where are the tests?

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

by beberlei at 2013-03-08T09:25:20Z

Ah yes, the DbalLogger has a testsuite, can you extend it to show this behavior works?

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

by jfsimon at 2013-03-08T10:28:53Z

@francisbesset @beberlei tests written.

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

by staabm at 2013-03-10T16:00:55Z

May I also ask for text/char fields with a certain amount of chars?
2013-03-13 18:37:43 +01:00
Jean-François Simon
ef534568c6 [DoctrineBridge] Avoids blob values to be logged by doctrine 2013-03-13 18:37:43 +01:00
Fabien Potencier
e4896da80c merged branch jfsimon/security-redirect-attributes (PR #7325)
This PR was squashed before being merged into the 2.1 branch (closes #7325).

Commits
-------

6575df6 [Security] use current request attributes to generate redirect url?

Discussion
----------

[Security] use current request attributes to generate redirect url?

Maybe we should consider to use current request attributes to generate the login/logout redirections URL?

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

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

by Seldaek at 2013-03-11T08:33:37Z

Can you explain why?

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

by jfsimon at 2013-03-11T09:30:07Z

@Seldaek let say I prefixed all my URLs with a `{domain}` var (`_locale` for instance), I'd like it to be passed to my redirected request. I guess it could lead to side effects, that's why I tagged this PR `RFC`.

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

by Seldaek at 2013-03-11T09:46:33Z

Fair enough. The main issue I see is that you end up with "garbage" query params in the URL. Any params that was needed by the previous page and not needed by the new one ends up as ?foo=bar in the URL. It's usually not harmful, but not very clean either. I'm not sure what it would take to grab all the params that a route can use, and only copy those over.

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

by jfsimon at 2013-03-11T10:12:49Z

@Seldaek indeed, I didn't think about those query parameters... I'll try to fix this in a simple way this afternoon.

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

by jfsimon at 2013-03-11T14:54:31Z

@Seldaek tell me if what you think of this, it may look like a hack (which wont be acceptable).

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

by Seldaek at 2013-03-11T14:59:39Z

Eh I see. I can't say it's the less hacky thing I ever saw, but it might be alright. I don't think I'm the best person to take this call though.. Let's see what @fabpot thinks.
2013-03-13 18:34:16 +01:00
Jean-François Simon
6575df6be8 [Security] use current request attributes to generate redirect url? 2013-03-13 18:34:15 +01:00
Fabien Potencier
cefc8202e3 merged branch Tobion/max-filesize-validator (PR #7362)
This PR was merged into the 2.1 branch.

Commits
-------

7216cb0 [Validator] fix showing wrong max file size for upload errors

Discussion
----------

[Validator] fix showing wrong max file size for upload errors

this was because the maxSize option wasn't parsed correctly and simple string comparision could lead to wrong results, e.g. 200 > 1000M

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes|]
| Fixed tickets | [#6441,#5551]
| License       | MIT

Will apply cleanly to 2.2
2013-03-13 17:26:08 +01:00
Tobias Schultze
7216cb0407 [Validator] fix showing wrong max file size for upload errors
this was because the maxSize option wasn't parsed correctly and simply string comparision could lead to wrong results, e.g. 200 > 1000M
2013-03-13 15:34:16 +01:00
Fabien Potencier
175cdc0fd0 [TwigBridge] removed double var initialization (refs #7344) 2013-03-13 14:40:23 +01:00
Fabien Potencier
8f2c875750 merged branch benbender/2.1 (PR #7344)
This PR was squashed before being merged into the 2.1 branch (closes #7344).

Commits
-------

c423f16 [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge

Discussion
----------

[2.1][TwigBridge] Fixes Issue #7342 in TwigBridge

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

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

by stof at 2013-03-12T13:28:15Z

Can you add a test to avoid regressions ?

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

by benbender at 2013-03-12T13:54:02Z

Done

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

by stevelacey at 2013-03-12T14:40:59Z

Looks good to me?

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

by pborreli at 2013-03-12T16:04:27Z

👍
2013-03-13 14:31:33 +01:00
Benjamin Bender
c423f16a23 [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge 2013-03-13 14:31:33 +01:00
Jean-François Simon
7d87ecd346 [FrameworkBundle] fixed cahe:clear command's warmup 2013-03-13 12:02:56 +01:00
Fabien Potencier
940d591dc2 merged branch jfsimon/issue-7039 (PR #7347)
This PR was merged into the 2.1 branch.

Commits
-------

fc47589 [BrowserKit] added ability to ignored malformed set-cookie header

Discussion
----------

[BrowserKit] adds ability to ignore malformed set-cookie header

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7039
2013-03-12 19:25:55 +01:00
Fabien Potencier
1b5674eb02 merged branch jfsimon/issue-7281 (PR #7348)
This PR was merged into the 2.1 branch.

Commits
-------

5ad4bd1 [TwigBridge] now enter/leave scope on Twig_Node_Module
fe4cc24 [TwigBridge] fixed fixed scope & trans_default_domain node visitor
c5e999a [TwigBridge] fixed non probant tests & added new one

Discussion
----------

[TwigBundle] fixes errors with the default domain node visitor & scope

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

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

by Julien-Webgenery at 2013-03-12T16:35:58Z

👍

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

by lennerd at 2013-03-12T16:38:40Z

👍

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

by rc2c at 2013-03-12T16:53:04Z

👍
2013-03-12 19:24:10 +01:00
Fabien Potencier
1bc6f7ba27 merged branch jfsimon/issue-7304 (PR #7345)
This PR was merged into the 2.1 branch.

Commits
-------

ae0b8ea [Translation] removed wriong 'use'

Discussion
----------

[Translation] removed wrong 'use'

Fixes last comment from #7304 // cc @stof
2013-03-12 19:22:59 +01:00
Jean-François Simon
5ad4bd1e40 [TwigBridge] now enter/leave scope on Twig_Node_Module 2013-03-12 18:03:08 +01:00
Jean-François Simon
fe4cc249b5 [TwigBridge] fixed fixed scope & trans_default_domain node visitor 2013-03-12 17:20:40 +01:00
Jean-François Simon
c5e999aad4 [TwigBridge] fixed non probant tests & added new one 2013-03-12 17:19:53 +01:00
Jean-François Simon
fc47589244 [BrowserKit] added ability to ignored malformed set-cookie header 2013-03-12 16:50:09 +01:00
Jean-François Simon
ae0b8ea1e2 [Translation] removed wriong 'use' 2013-03-12 15:23:04 +01:00
Fabien Potencier
d77b97cb07 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

💯 great idea !

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

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

🌟 better.

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

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

👍  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.
2013-03-12 12:04:38 +01:00
Jean-François Simon
5bc30bb98a [Translation] added xliff loader/dumper with resname support 2013-03-12 12:04:38 +01:00
Fabien Potencier
e508ecc729 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
2013-03-12 11:55:49 +01:00
Jean-François Simon
e3547c60dd [TwigBridge] fixes 2013-03-12 11:55:49 +01:00
Fabien Potencier
a27f7d8c59 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

👍
2013-03-10 08:25:48 +01:00
Fran Moreno
547350c951 [FrameworkBundle] Fix code status in dockblock 2013-03-09 14:56:26 +01:00
Fabien Potencier
ee495f8b58 merged branch kriswallsmith/class-loader/idempotent (PR #7245)
This PR was merged into the 2.1 branch.

Commits
-------

27cc0df Merge pull request #1 from merk/class-loader/idempotent
95af84c Fixed test to use Reflection
bb08247 [ClassLoader] tweaked test
73bead7 [ClassLoader] made DebugClassLoader idempotent

Discussion
----------

[ClassLoader] made DebugClassLoader idempotent

The DebugClassLoader will wrap itself if `enable()` is called multiple time, such as when running functional tests.

Please merge to 2.2 and master ASAP.

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

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

by kriswallsmith at 2013-03-07T16:38:55Z

ping @fabpot: this will speed up lots of functional tests :)

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

by kriswallsmith at 2013-03-08T04:51:51Z

@fabpot fixed by @merk
2013-03-08 07:14:55 +01:00
Kris Wallsmith
27cc0df835 Merge pull request #1 from merk/class-loader/idempotent
Fixed test to use Reflection
2013-03-07 20:51:06 -08:00
Tim Nagel
95af84c0b8 Fixed test to use Reflection 2013-03-08 15:45:32 +11:00
Fabien Potencier
7241be9b64 [Finder] fixed a potential issue on Solaris where INF value is wrong (refs #7269) 2013-03-06 20:26:55 +01:00
sualko
a31deebd15 Update RouteCompiler.php
Fixes INF problem on solaris.
2013-03-06 20:26:16 +01:00
Fabien Potencier
f9d683eb8d merged branch lazyhammer/crawler-relative-links-2.1 (PR #7244)
This PR was merged into the 2.1 branch.

Commits
-------

a4ec677 [DomCrawler] Fix relative path handling in links

Discussion
----------

[2.1][DomCrawler] Fix relative path handling in links

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

Added relative path canonicalization according to RFC 3986, section 5.2.4

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

by vicb at 2013-03-02T14:48:46Z

@fabpot seems like 2.1 as a deps issue if you look at travis logs
2013-03-06 20:18:40 +01:00
Fabien Potencier
82f6389ac3 merged branch jfsimon/issue-6502 (PR #7260)
This PR was squashed before being merged into the 2.1 branch (closes #7260).

Commits
-------

1d3da29 [FrameworkBundle] avoids cache:clear to break if new/old folders already exist

Discussion
----------

[FrameworkBundle] avoids cache:clear to break if new/old folders already exist

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

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

by mahmouds at 2013-03-04T19:07:20Z

👍
2013-03-06 20:12:21 +01:00
Jean-François Simon
1d3da29779 [FrameworkBundle] avoids cache:clear to break if new/old folders already exist 2013-03-06 20:12:21 +01:00
Fabien Potencier
b9cdb9a26d [HttpKernel] Fixed possible profiler token collision (closes #7272, closes #7171) 2013-03-06 20:10:14 +01:00