Commit Graph

13455 Commits

Author SHA1 Message Date
Jean-François Simon
839c78a4b0 Revert "merged branch jfsimon/issue-6928 (PR #7378)"
This reverts commit 70ec4f6c61, reversing
changes made to 3a03f3e346.
2013-03-20 14:19:35 +01:00
Fabien Potencier
0631f9edcd Merge branch '2.0' into 2.1
* 2.0:
  updated VERSION for 2.0.23
  update CONTRIBUTORS for 2.0.23
  updated CHANGELOG for 2.0.23

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-03-20 13:47:59 +01:00
Fabien Potencier
47cf973b92 merged branch nikrou/relative-path-with-slash (PR #7434)
This PR was merged into the 2.1 branch.

Commits
-------

e6b7515 [DomCrawler] added support for query string with slash

Discussion
----------

[DomCrawler] added support for query string with slash

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

Link\getUri() failed to return correct uri when current query string contains slash
Test pass on branch 2.1 but fails on master
2013-03-20 13:44:25 +01:00
Fabien Potencier
9948536833 updated VERSION for 2.0.23 2013-03-20 12:32:41 +01:00
Fabien Potencier
96618b5dad update CONTRIBUTORS for 2.0.23 2013-03-20 12:32:15 +01:00
Fabien Potencier
ad86c4811a updated CHANGELOG for 2.0.23 2013-03-20 12:15:45 +01:00
Fabien Potencier
e1cd990a77 [Form] fixed failing test 2013-03-20 12:02:29 +01:00
Nicolas Roudaire
e6b75153e3 [DomCrawler] added support for query string with slash
Link\getUri() failed to return correct uri when current query string contains slash
2013-03-20 09:46:19 +01:00
Fabien Potencier
6c531c132b merged branch kherge/2.2 (PR #7428)
This PR was merged into the 2.2 branch.

Commits
-------

633c051 Fixed invalid file path for hiddeninput.exe on Windows.

Discussion
----------

[2.2] [Console] Fix "The system cannot find the path specified." on Windows for askHiddenResponse().

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none available
| License       | MIT
| Doc PR        | n/a
2013-03-19 23:06:41 +01:00
Kevin Herrera
633c051409 Fixed invalid file path for hiddeninput.exe on Windows. 2013-03-19 13:48:08 -07:00
Fabien Potencier
b3ca7988cc Merge branch '2.1' into 2.2
* 2.1:
  Add a public modifier to an interface method
  [HttpRequest] fixes Request::getLanguages() bug
  [HttpCache] added a test (cached content should be kept after purging)
  [DoctrineBridge] Fixed non-utf-8 recognition
  [Security] fixed HttpUtils class tests
2013-03-19 21:41:20 +01:00
Fabien Potencier
e055b806bf merged branch stof/toolbar_ie (PR #7423)
This PR was merged into the 2.2 branch.

Commits
-------

39445c5 [WebProfilerBundle] Fixed the toolbar styles to apply them in IE8

Discussion
----------

[WebProfilerBundle] Fixed the toolbar styles to apply them in IE8

| Q             | A
| ------------- | ---
| Fixed tickets | #7422
| License       | MIT

Currently, the toolbar breaks the design of the whole page in IE8 and lower as it does not have styles applied. Even though it is a debugging tool and devs are often using modern browsers, it is painful to be forced to disable it when testing the site in IE (I won't bother about supporting the profiler JS in IE8 though as this is a different page which can be displayed in a modern browser even when testing in IE).
The reason of the issue is that [IE8 removes style tags at the beginning when setting the innerHTML](http://social.msdn.microsoft.com/forums/en-US/iewebdevelopment/thread/33fd33f7-e857-4f6f-978e-fd486eba7174/). As the fix is as easy as moving the tag after the div, I don't see a reason to reject this change.

I sent the bugfix to 2.2 because these templates have been refactored a lot between 2.1 and 2.2 so the fix would have been different. However, it is also possible to fix it in 2.1 if you want.
2013-03-19 15:30:59 +01:00
Tobias Schultze
7ef90d2f32 fix xsd definition for strict-requirements 2013-03-19 15:23:22 +01:00
Christophe Coevoet
39445c5897 [WebProfilerBundle] Fixed the toolbar styles to apply them in IE8
Fixes #7422
2013-03-19 15:14:34 +01:00
Fabien Potencier
d7fa84162b merged branch fabpot/fix-heredocs (PR #7417)
This PR was merged into the 2.2 branch.

Commits
-------

601da45 [ClassLoader] fixed heredocs handling

Discussion
----------

[ClassLoader] fixed heredocs handling

The end of an hereodc must have a newline to avoid PHP syntax errors.
2013-03-19 09:33:24 +01:00
Fabien Potencier
601da456ba [ClassLoader] fixed heredocs handling
The end of an hereodc must have a newline to avoid PHP syntax errors.
2013-03-19 09:32:26 +01:00
Fabien Potencier
949baf415b merged branch fabpot/fix-heredocs (PR #7416)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7416).

Commits
-------

6d29979 [ClassLoader] fixed handling of heredocs

Discussion
----------

[ClassLoader] fixed handling of heredocs

| 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
2013-03-19 09:20:23 +01:00
Fabien Potencier
67b5e1cc64 fixed handling of heredocs 2013-03-19 09:20:23 +01:00
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
ed6c52b712 merged branch pborreli/no-xdebug-travis (PR #7398)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7398).

Commits
-------

df99ecf [travis-ci] removing xdebug extension

Discussion
----------

[travis-ci] removing xdebug extension

we don't need it (no coverage), and removing it speeds travis build by 1 minute approx (composer + icu + phpunit)
2013-03-18 15:29:32 +01:00
Pascal Borreli
7372597db0 removing xdebug extension 2013-03-18 15:29:32 +01:00
Fabien Potencier
d55877a7b4 merged branch Tobion/trans-refactor (PR #7058)
This PR was merged into the 2.2 branch.

Commits
-------

0992032 [Translator] fix metadata
3b71000 [Translator] fix typecast in transChoice
88f98c9 [Translator] optimized adding of resources and saving a call to array_unique
e88bf7b [Translator] fix phpdoc of MessageCatalogueInterface::add and ::replace
c97ee8d [Translator] mention that the message id may also be an object that can be cast to string in TranslatorInterface and fix the IdentityTranslator that did not respect this
5a36b2d [Translator] fix MessageCatalogueInterface::getFallbackCatalogue that can return null
d1c34e8 [Translator] coding style

Discussion
----------

[Translator] several fixes and refactorings

Reasoning see individual commits.

BC break: no <del>yes because I added an array typehint to `MessageCatalogueInterface::add` and `::replace` since it's required. I could remove the typhint again so there would be no bc break, but IMO having it is much more explicit and consistent as there are already other array typhints as in the constructor.</del>

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

by Tobion at 2013-02-14T09:36:35Z

@fabpot removed typehint and code movement. Added 2 more commits.

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

by Tobion at 2013-03-04T16:14:37Z

@fabpot ping
2013-03-18 15:27:58 +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
Fabien Potencier
d9181ba5b0 merged branch jfsimon/issue-7185-2.2 (PR #7390)
This PR was merged into the 2.2 branch.

Commits
-------

53cf12b replaced new occurences of 'Request::create()' with '::create()'

Discussion
----------

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

Following #7381

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7185, #7186
2013-03-18 14:37:15 +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
Jean-François Simon
53cf12b544 replaced new occurences of 'Request::create()' with '::create()' 2013-03-15 13:43:45 +01:00
Fabien Potencier
801a7f887b Merge branch '2.1' into 2.2
* 2.1:
  changed sub-requests creation to '::create()'

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
	src/Symfony/Component/Security/Http/HttpUtils.php
2013-03-15 11:54:52 +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
81e27e927d fixed merge issue 2013-03-15 11:26:01 +01:00
Fabien Potencier
0d7593c636 Merge branch '2.1' into 2.2
* 2.1:
  sub-requests are now created with the same class as their parent
  [FrameworkBundle] removed BC break
  [FrameworkBundle] changed temp kernel name in cache:clear
  [DoctrineBridge] Avoids blob values to be logged by doctrine
  [Security] use current request attributes to generate redirect url?
  [Validator] fix showing wrong max file size for upload errors
  [TwigBridge] removed double var initialization (refs #7344)
  [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge
  [FrameworkBundle] fixed cahe:clear command's warmup
  [TwigBridge] now enter/leave scope on Twig_Node_Module
  [TwigBridge] fixed fixed scope & trans_default_domain node visitor
  [TwigBridge] fixed non probant tests & added new one
  [BrowserKit] added ability to ignored malformed set-cookie header
  [Translation] removed wriong 'use'
  [Translation] added xliff loader/dumper with resname support
  [TwigBridge] fixes

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
	src/Symfony/Component/Security/Http/HttpUtils.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
2013-03-15 11:14:31 +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
Fabien Potencier
edd9a4e3ad merged branch fzerorubigd/master (PR #7384)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7384).

Commits
-------

7dc1e84 fix validator translation

Discussion
----------

fix plural string in persian (fa) translation/ validation component

| Q             | A
| ------------- | ---
| Bug fix?      | yes (plural fix in persian translation)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
2013-03-14 21:52:50 +01:00
fzerorubigd
64aca11785 fix validator translation 2013-03-14 21:52:50 +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
82a78ed545 merged branch BenoitLeveque/assets-install-finder-issue (PR #7341)
This PR was merged into the 2.2 branch.

Commits
-------

602cdee replace INF to PHP_INT_MAX inside Finder component.

Discussion
----------

[2.2][Finder] fix assets:install issue

I have some bundle with assets, and when i do.
```
app/console assets:install --env=prod
```
I don't have any of my file inside web/bundles, only empty first level directory like "css"
bug issue introduced by 7c66dffa6b

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

by fabpot at 2013-03-13T13:34:10Z

Can you base your patch on the 2.1 branch as the bug is also there? Thanks.

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

by BenoitLeveque at 2013-03-13T14:29:55Z

i didn't reproduce this issue on the latest commit (175cdc0fd0) on 2.1 branch

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

by taylorotwell at 2013-03-13T14:35:28Z

Yeah, it appears the Finder component's recursion is basically broken on the 2.2 branch.

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

by BenoitLeveque at 2013-03-14T13:24:52Z

@fabpot i can't reproduce this issue on the 2.1 branch because you already fix it, see 7241be9b64
2013-03-14 14:30:47 +01:00
Fabien Potencier
7966d8f831 merged branch janschoenherr/patch-4 (PR #7365)
This PR was squashed before being merged into the 2.2 branch (closes #7365).

Commits
-------

d9ee869 [HttpKernel] Updated TraceableEventDispatcher.php

Discussion
----------

[HttpKernel] Updated TraceableEventDispatcher.php

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

Currently, if no listeners are registered for an dispatched event, the StopwatchEvent "$eventName.'.loading'" is never being stopped.
2013-03-14 12:41:06 +01:00
janschoenherr
d9ee8695dc [HttpKernel] Updated TraceableEventDispatcher.php 2013-03-14 12:41:05 +01:00
Fabien Potencier
4b9d810889 merged branch Tobion/null-for-optional-param (PR #7369)
This PR was merged into the 2.2 branch.

Commits
-------

d7a7434 [Routing] fix url generation for optional parameter having a null value

Discussion
----------

[Routing] fix url generation for optional parameter having a null value

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes|]
| Fixed tickets | [#7316]
| License       | MIT
2013-03-14 12:32:55 +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
Tobias Schultze
d7a74349a9 [Routing] fix url generation for optional parameter having a null value 2013-03-14 10:39:13 +01:00