Commit Graph

5754 Commits

Author SHA1 Message Date
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
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
b9cdb9a26d [HttpKernel] Fixed possible profiler token collision (closes #7272, closes #7171) 2013-03-06 20:10:14 +01:00
Gordon Franke
9d88495817 remove dead code in yaml component 2013-03-06 18:01:03 +01:00
Fabien Potencier
22c1aa3636 fixed typo 2013-03-06 17:55:57 +01:00
Fabien Potencier
380306717c merged branch trivago/webprofiler_redis_add_select (PR #7177)
This PR was squashed before being merged into the 2.1 branch (closes #7177).

Commits
-------

c82c754 RedisProfilerStorage wrong db-number/index-number selected

Discussion
----------

RedisProfilerStorage wrong db-number/index-number selected

bug: in the webprofiler the wrong database (0) is selected when storage should not go to index 0. on redis connect the default behaviour is to select index/database number 0, but it is necessary to select a special index/database.
see: http://rediscookbook.org/multiple_databases.html

[HttpKernel] [Profiler] [RedisProfilerStorage] added select for a db-number/db-index to dsn-patttern

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

Usage with index/db-number = 7 :
```xml
<!-- config_dev.xml -->

<symfony:profiler only-exceptions="false" dsn="redis://127.0.0.1:6379/7" lifetime="3600" />

```

```yml
#config_dev.yml

framework:
...
    profiler:
    ...
        dsn: redis://127.0.0.1:6379/7

```

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

by fabpot at 2013-02-27T07:21:02Z

Can you also add some unit tests?

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

by JohnDoe007 at 2013-02-27T09:36:28Z

@fabpot the function getRedis() is currently not testable, I think. this means I have to do a bigger change to the class, add a public function initRedis() or something and move initialize code there to make the initialization process, where my change is, testable. is this ok to do it in that bugfix/pull request? or should I add this test change to master and only adding this small bugfix to the 2.1-branch?

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

by fabpot at 2013-03-06T16:47:37Z

Thanks, I've merged the fix. Can you work on the changes needed to allow the code to be testable (on the master branch)?
2013-03-06 17:50:58 +01:00
René Kerner
c82c754b8e RedisProfilerStorage wrong db-number/index-number selected 2013-03-06 17:50:58 +01:00
Fabien Potencier
446f56847b merged branch jfsimon/issue-7232-2.1 (PR #7236)
This PR was merged into the 2.1 branch.

Commits
-------

6681df0 [Console] fixed StringInput binding
6b98883 [Console] added string input test
32f1904 Revert "merged branch jfsimon/issue-6749 (PR #7220)"

Discussion
----------

[Console] fixes tests

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

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

by gigablah at 2013-03-02T13:25:10Z

Apparently 5b19c892cf broke the console shell. I was wondering why all commands executed through the shell in 2.2.0 were throwing "Too many arguments" exception.

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

by stof at 2013-03-02T13:27:09Z

@gigablah This is already fixed in the 2.2 branch as this PR has already been merged in 2.2 (but the revert is also needed in 2.1)

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

by gigablah at 2013-03-02T13:51:44Z

Ah, guess I'll have to wait for it to be pushed to the symfony/console repository then.
2013-03-06 17:40:53 +01:00
Fabien Potencier
dcb1441d23 [DependencyInjection] added a test for the previous merge (refs #7261) 2013-03-06 17:38:10 +01:00
chx
e86fefa709 Unset loading[$id] in ContainerBuilder on exception 2013-03-06 17:37:21 +01:00
Kris Wallsmith
bb08247ece [ClassLoader] tweaked test 2013-03-03 08:31:27 -08:00
Kris Wallsmith
73bead7eb6 [ClassLoader] made DebugClassLoader idempotent 2013-03-02 11:24:53 -08:00
Dmitrii Chekaliuk
a4ec6772df [DomCrawler] Fix relative path handling in links
Added relative path canonicalization according to RFC 3986, section 5.2.4
2013-03-02 17:23:18 +02:00
Jean-François Simon
6681df0a12 [Console] fixed StringInput binding 2013-03-01 17:50:10 +01:00
Jean-François Simon
6b98883903 [Console] added string input test 2013-03-01 17:44:08 +01:00
Jean-François Simon
32f190481a Revert "merged branch jfsimon/issue-6749 (PR #7220)"
This reverts commit f52120bdd3, reversing
changes made to 66c2be30d0.
2013-03-01 17:42:51 +01:00
Fabien Potencier
0e7b5fb3bb fixed CS 2013-03-01 11:39:52 +01:00
Fabien Potencier
08757db05e Merge branch '2.0' into 2.1
* 2.0:
  [Console] Fixed comment

Conflicts:
	src/Symfony/Component/Console/Output/OutputInterface.php
2013-03-01 07:42:22 +01:00
Fabien Potencier
f52120bdd3 merged branch jfsimon/issue-6749 (PR #7220)
This PR was merged into the 2.1 branch.

Commits
-------

5b19c89 [Console] fixed unparsed StringInput tokens
635b1fc StringInput resets the given options.

Discussion
----------

[Console] fixes unparsed StringInput tokens

`StringInput` instances call `setToken` after constructor, `parse` method is called in constructor, so `StringInput` tokens where never parsed.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6749
2013-02-28 18:08:29 +01:00
Jean-François Simon
5b19c892cf [Console] fixed unparsed StringInput tokens 2013-02-28 17:44:20 +01:00
Matthijs van den Bos
8f8ba380d6 [DomCrawler] fix handling of schemes by Link::getUri()
A link (anchor tag with an href attr) in crawled by the Crawler
can contain any valid URI, including mailto: links.

Currently this is not correctly supported by Link::getUri.
Schemes that do not start with 'http' are treated as relative URIs
and appenden to the base URI. This leads to strange URIs like this:
http://foo.com/mailto:foo@bar.com

Fixed Link::getUri to treat any URI with a schema part as an
absolute URL. Updated the unit tests to test for this.
2013-02-28 13:15:59 +01:00
Denis Gorbachev
3be3dde806 [Console] Fixed comment 2013-02-27 22:08:35 +13:00
Fabien Potencier
d10ad0f9e7 merged branch lsmith77/debugclassloader_findfile_2_1 (PR #7168)
This PR was merged into the 2.1 branch.

Commits
-------

0690709 added a DebuClassLoader::findFile() method to make the wrapping less invasive

Discussion
----------

added a DebuClassLoader::findFile() method to make the wrapping less invasive

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

i have classified it as a bug fix, since due to the wrapping it can break assumptions about the loaded class loader, so implementing this method at least doesnt break the assumption that ``findFile()`` is available.

actually i think we should also introduced a loader interface to reduce the duct typing

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

by stof at 2013-02-24T16:39:46Z

👎 for the interface:

- it would make the use of the autoloader more difficult (you would have to require the interface before requiring the loader)
- it would forbid using these wrappers with the composer ClassLoader

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

by digitalkaoz at 2013-02-24T19:16:36Z

mh, i think all autoloaders should follow a common interface, maybe its worth to think about a PSR?

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

by lsmith77 at 2013-02-24T19:27:27Z

ah I see

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

by stof at 2013-02-24T20:33:07Z

@digitalkaoz Such an interface would have to be in PHP itself, otherwise, you would have to require it first each time (as it cannot be autoloaded before registering the autoloader). And an autoloader in PHP is just a callable.

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

by digitalkaoz at 2013-02-24T20:47:10Z

Yes @stof, i know, but it would be nice if all autoloaders follows a common pattern , call it a convention ;)
2013-02-27 08:22:37 +01:00
Matthijs van den Bos
b1ea8e5b68 Fixed handling absent href attribute in base tag
The HTML5 spec states that the href attribute is optional for the
base tag. Fixed the DomCrawler::addHtmlContent() method to support this

See here and here:
http://www.w3.org/TR/html-markup/base.html#base.attrs.href
http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#the-base-element
2013-02-26 17:49:54 +01:00
Lukas Kahwe Smith
0690709dbb added a DebuClassLoader::findFile() method to make the wrapping less invasive 2013-02-24 16:51:26 +01:00
Fabien Potencier
7c4323fbb0 bumped Symfony version to 2.1.9-DEV 2013-02-23 22:57:49 +01:00
Fabien Potencier
dffc31531a updated VERSION for 2.1.8 2013-02-23 22:28:36 +01:00
Fabien Potencier
22dbfc009f Merge branch '2.0' into 2.1
* 2.0:
  [Form] Fixed "label" option to accept the value "0"
  [DomCrawler] lowered parsed protocol string (fixes #6986)

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
	tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
2013-02-23 07:41:44 +01:00
Guilherme Blanco
06ebb0db87 Defined stable version point of Doctrine. 2013-02-22 13:53:49 -05:00
Fabien Potencier
52bd4ffa56 merged branch cloppy/2.1 (PR #7153)
This PR was squashed before being merged into the 2.1 branch (closes #7153).

Commits
-------

b2080c4 [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)

Discussion
----------

[HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6750
| License       | MIT
| Doc PR        |
2013-02-22 19:02:23 +01:00
Johannes Klauss
b2080c40e2 [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750) 2013-02-22 19:02:22 +01:00
Fabien Potencier
205021b5b3 merged branch bschussek/issue6153 (PR #7155)
This PR was merged into the 2.1 branch.

Commits
-------

b7bd630 [Form] Fixed TimeType not to render a "size" attribute in select tags

Discussion
----------

[Form] Fixed TimeType not to render a "size" attribute in select tags

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6153
| License       | MIT
| Doc PR        | -
2013-02-22 18:53:32 +01:00
Bernhard Schussek
b7bd630652 [Form] Fixed TimeType not to render a "size" attribute in select tags 2013-02-22 13:51:30 +01:00
Bernhard Schussek
00fbb7ec32 [Form] Added test for "label" option to accept the value "0" 2013-02-22 13:14:20 +01:00
Eric Caron
368f62f19c Expanded fault-tolerance for unusual cookie dates 2013-02-22 07:39:07 +01:00
Bernhard Schussek
f8812b28f3 [Form] Fixed "label" option to accept the value "0" 2013-02-21 18:06:34 +01:00
Fabien Potencier
e7e61fdcc9 merged branch jfcixmedia/2.1 (PR #5838)
This PR was squashed before being merged into the master branch (closes #5838).

Commits
-------

201f3e6 [Form] Fixed cannot unset string offsets in CsrfValidationListener

Discussion
----------

[Form] Fixed cannot unset string offsets in CsrfValidationListener

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

A php fatal error is happening when someone rewrite the entire form data for an object with a single input.
```
Fatal error: Cannot unset string offsets in vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php on line 72
```

Example:

```html
<form action="/app_dev.php/post/create" method="post" >
    <div id="posttype">
        <div>
            <label for="posttype_name" class="required">Name</label>
            <input type="text" id="posttype_name" name="posttype[name]" required="required" maxlength="255" />
        </div>
        <div>
            <label for="posttype_text" class="required">Text</label>
            <textarea id="posttype_text" name="posttype[text]" required="required"></textarea>
        </div>
        <input type="hidden" id="posttype__token" name="posttype[_token]" value="83a1617c694fbdea43c2527f1a55c7419ce82a42" /></div>
        <p>
            <button type="submit">Create</button>
        </p>
</form>
```

If someone alters the html to add a simple input at the bottom of the form like this one:
```html
<input type="text" id="posttype" name="posttype" value="test123" />
```

The result will be a php fatal error.

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

by bschussek at 2012-10-26T09:49:05Z

Thank you for the pull request! Could you please reference the pull request in the test?

```php
// https://github.com/symfony/symfony/pull/5838
public function testStringFormData()
{
    ...
```

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

by jfcixmedia at 2012-10-26T10:21:29Z

@bschussek  Added, thanks.
2013-02-20 22:55:01 +01:00
Fabien Potencier
cf15198faa merged branch cloppy/Dom-Crawler-fix (PR #7127)
This PR was merged into the 2.0 branch.

Commits
-------

cb03074 [DomCrawler] lowered parsed protocol string (fixes #6986)

Discussion
----------

[DomCrawler] lowered parsed protocol string (fixes #6986)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6986
| License       | MIT
| Doc PR        | symfony/symfony-docs#123

Are UTs needed for this?
2013-02-19 21:07:22 +01:00
Johannes Klauss
cb0307474e [DomCrawler] lowered parsed protocol string (fixes #6986) 2013-02-19 18:21:02 +01:00
Fabien Potencier
50c3de3e89 merged branch fabpot/locale-fix (PR #7099)
This PR was merged into the 2.1 branch.

Commits
-------

3e40c17 [HttpKernel] fixed locale management when exiting sub-requests

Discussion
----------

[HttpKernel] fixed locale management when exiting sub-requests

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

This fix is temporary as #7007 will fix it properly in Symfony 2.3.

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

by vicb at 2013-02-17T20:17:44Z

changelog ?

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

by fabpot at 2013-02-17T20:27:22Z

The changelogs are updated when we release a new version only.

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

by stof at 2013-02-17T20:41:00Z

@fabpot the intl locale should be reset to the right value too

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

by stof at 2013-02-17T20:42:31Z

hmm sorry, I missed the fact that you are changing the locale in the Request again, which will set the intl one
2013-02-19 08:53:45 +01:00
Fabien Potencier
3e40c176bd [HttpKernel] fixed locale management when exiting sub-requests
This fix is temporary as #7007 will fix it properly in Symfony 2.3.
2013-02-19 08:38:43 +01:00
Fabien Potencier
6fb7904ba0 Merge branch '2.0' into 2.1
* 2.0:
  [Process] Fix regression introduced in #6620 / 880da01c49, fixes #7082
2013-02-18 22:27:57 +01:00
Jordi Boggiano
179cd58646 [Process] Fix regression introduced in #6620 / 880da01c49, fixes #7082 2013-02-17 20:36:49 +01:00
Fabien Potencier
98d57500f2 [HttpKernel] added some tests for previous merge 2013-02-17 12:42:57 +01:00
Michel Weimerskirch
0eff68f8c8 Fix REMOTE_ADDR for cached subrequests
Fixes #7091
2013-02-17 12:37:52 +01:00
Jordi Boggiano
5e8d844678 [Process] Warn user with a useful message when tmpfile() failed 2013-02-14 12:14:27 +01:00
Fabien Potencier
0209eb6c47 Merge branch '2.0' into 2.1
* 2.0:
  [DependencyInjection] fixed tests (refs #7017)
2013-02-11 12:42:49 +01:00