Commit Graph

7003 Commits

Author SHA1 Message Date
Fabien Potencier
d35cb9f880 [WebProfiler] added the possibility to override the application name/version in the WDT 2013-03-23 11:43:44 +01:00
Fabien Potencier
cec98c1d7a [DependencyInjection] fixed PHP notice when the scope is not defined 2013-03-23 11:39:42 +01:00
Fabien Potencier
55f0e76495 [HttpFoundation] added missing entry in the CHANGELOG 2013-03-23 11:06:01 +01:00
Bilal Amarni
5bb44f52a0 [HttpFoundation] UploadedFile - moved a security check
Squashed commit of the following:

commit b03b32ecc985c4a4f9dc7df2d3336a4cd75aae30
Merge: fb7004b fc70e13
Author: Bilal Amarni <bilal.amarni@gmail.com>
Date:   Wed Feb 27 11:33:37 2013 +0100

    [HttpFoundation] UploadedFile - moved a security check

commit fc70e138c1d3858775c9efe51268cae6d7ec3f69
Author: Bilal Amarni <bilal.amarni@gmail.com>
Date:   Thu Jan 24 11:07:29 2013 +0100

    explicitly passed UPLOAD_ERR_OK constant in a test

commit dda03a2faab9539ca3a93736dd2bc0ec27feb4e7
Author: Bilal Amarni <bilal.amarni@gmail.com>
Date:   Fri Jan 18 17:24:06 2013 +0100

    [HttpFoundation] UploadedFile - moved a security check from move() to isValid()
2013-03-23 10:56:11 +01:00
Fabien Potencier
550df5a85a moved the request scope creation to the ContainerAwareHttpKernel class 2013-03-23 10:14:37 +01:00
Fabien Potencier
69dbbdda3d added missing entries in CHANGELOGs 2013-03-23 10:10:35 +01:00
Fabien Potencier
f465d2aa6f merged branch marcosQuesada/serializer/denormalize-camelcase (PR #6951)
This PR was merged into the master branch.

Discussion
----------

[2.3] [Serializer] Enabled camelCase format to be used on denormalize method

 Enabled camelCase formater , that way when hydrating from arrays, attributes as attribute_name could be implemented as attributteName parameter, with getAttributeName and setAttributeName, giving different formating option from setAttribute_name  getAttribute_name.

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

Commits
-------

fbffdf0 Enabled camelCase format to be used on denormalize method, that way camel_case attribute can be used on object as getCamelCase()
2013-03-23 09:19:40 +01:00
Fabien Potencier
25a5395d9d merged branch lmcnearney/querystring (PR #7028)
This PR was squashed before being merged into the master branch (closes #7028).

Discussion
----------

[2.3] [Routing] Added access to querystring in RequestContext

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

This is related to a Silex change request: https://github.com/fabpot/Silex/pull/623

Commits
-------

4a2b755 [2.3] [Routing] Added access to querystring in RequestContext
2013-03-23 09:12:44 +01:00
Lance McNearney
4a2b75536e [2.3] [Routing] Added access to querystring in RequestContext 2013-03-23 09:12:43 +01:00
Fabien Potencier
77ec799751 Merge branch '2.2'
* 2.2:
  #7106 - fix for ZTS builds
  Added '@@' escaping strategy for YamlFileLoader and YamlDumper
  [Yaml] fixed bugs with folded scalar parsing
  [Form] made DefaultCsrfProvider using session_status() when available
  Added unit tests to Dumper
  Update .travis.yml (closes #7355)
  [HttpFoudantion] fixed Request::getPreferredLanguage()
  Revert "merged branch jfsimon/issue-6928 (PR #7378)"
  Routing issue with installation in a sub-directory ref: https://github.com/symfony/symfony/issues/7129
2013-03-23 09:06:49 +01:00
Fabien Potencier
a045925d2a [ClassLoader] added missing CHANGELOG entry for previous merge 2013-03-23 09:02:48 +01:00
Fabien Potencier
86d76195fb merged branch Smart-Core/master (PR #7076)
This PR was merged into the master branch.

Discussion
----------

[2.3] Add missing WinCacheClassLoader

Commits
-------

af86e5b Add missing WinCacheClassLoader
2013-03-23 09:00:58 +01:00
Fabien Potencier
03fc97d11a Merge branch '2.1' into 2.2
* 2.1:
  #7106 - fix for ZTS builds
  Added '@@' escaping strategy for YamlFileLoader and YamlDumper
  [Yaml] fixed bugs with folded scalar parsing
  [Form] made DefaultCsrfProvider using session_status() when available
  Added unit tests to Dumper
  Update .travis.yml (closes #7355)
  [HttpFoudantion] fixed Request::getPreferredLanguage()
  Revert "merged branch jfsimon/issue-6928 (PR #7378)"
  Routing issue with installation in a sub-directory ref: https://github.com/symfony/symfony/issues/7129

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
	src/Symfony/Component/Routing/RouteCollection.php
2013-03-23 08:49:54 +01:00
Fabien Potencier
8ae7d98569 merged branch DHorchler/2.1 (PR #7193)
This PR was merged into the 2.1 branch.

Discussion
----------

Routing issue with installation in a sub-directory

ref: https://github.com/symfony/symfony/issues/7129

Commits
-------

8d9cd42 Routing issue with installation in a sub-directory ref: https://github.com/symfony/symfony/issues/7129
2013-03-23 08:47:35 +01:00
Julien Moulin
11c0fb580d #7106 - fix for ZTS builds 2013-03-23 08:44:01 +01:00
Fabien Potencier
bbf9ec93e9 [Finder] added a CHANGELOG entry for the previous merge 2013-03-23 08:42:25 +01:00
Fabien Potencier
e5be0ded50 merged branch jfsimon/finder-access-denied-exception (PR #7256)
This PR was merged into the master branch.

Discussion
----------

[Finder] Adds AccessDeniedException

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

Commits
-------

714ace8 [finder] Introduced AccessDeniedException
2013-03-23 08:39:29 +01:00
Fabien Potencier
2f7a9fde7f updated various CHANGELOG files that were not updated when the PRs were merged 2013-03-23 08:35:36 +01:00
Fabien Potencier
9fba645cb2 [Console] added a note in the CHANGELOG for the previous merge, fixed some CS 2013-03-23 08:15:46 +01:00
Fabien Potencier
062cce0018 merged branch pkruithof/progress-helper-enhancements (PR #7300)
This PR was squashed before being merged into the master branch (closes #7300).

Discussion
----------

[Console] Progress helper enhancements

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

Two enhancements:

1. The progress bar clears the current line before writing the current progress. This can cause some flickering in the terminal. I've modified the write method to append whitespace to the line to be written, so it matches the previous line's length.
2. Added a `setCurrent` method to set the current progress. Rather than advancing by 1 or more steps, sometimes you want to just set the current state. For example if you are downloading a file, and a callback provides you with the current download status. A workaround for this could be to keep track of the previous event, calculate the difference, and advancing by the diff. But it's easier to just set the current progress.

Sidenotes:
* The [`overwrite`](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Helper/ProgressHelper.php#L387) method copied documentation of the Output's [`write`](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Output/Output.php#L139) method. The difference is, the overwrite method does not handle an array of messages. I've updated the documentation for this.
* The helper uses `strlen` to calculate line lengths. This could cause a problem when using multibyte strings. I'd change it to `mb_strlen`, but I'm not sure if the `mb_string` extension is required by Symfony.

Commits
-------

5ae76f0 [Console] Progress helper enhancements
2013-03-23 08:10:00 +01:00
Peter Kruithof
5ae76f0dbf [Console] Progress helper enhancements 2013-03-23 08:10:00 +01:00
Thomas Ploch
9875c4bcb4 Added '@@' escaping strategy for YamlFileLoader and YamlDumper
Added the possibility to to use '@@' as an escaping strategy for
parameters that should be treated as strings but start with '@'
(i.e. safe mailer passwords).
2013-03-23 07:58:10 +01:00
Erin Millard
bbcdfe25ca [Yaml] fixed bugs with folded scalar parsing 2013-03-23 11:54:33 +10:00
Fabien Potencier
883bf909b1 merged branch hason/di_exceptions (PR #7313)
This PR was merged into the master branch.

Discussion
----------

[DependencyInjection] Added missing support for setting previous exception

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

Commits
-------

9b4cd73 [DependencyInjection] Added missing support for setting previous exception
2013-03-22 17:25:48 +01:00
Fabien Potencier
aac8f8fe3d merged branch bamarni/form-default-csrf-provider-session-status (PR #7449)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] made DefaultCsrfProvider using session_status() when available

| Q             | A
| ------------- | ---
| Bug fix?      | [on PHP 5.4]
| Tests pass?   | [yes]
| License       | MIT

Commits
-------

5afea04 [Form] made DefaultCsrfProvider using session_status() when available
2013-03-22 16:37:06 +01:00
Jean-François Simon
714ace8250 [finder] Introduced AccessDeniedException
This exception is thrown when trying to open a non-readable directory.

Squashed commits:
[Finder] Fixed small errors
[Finder] small changes about AccessDeniedException
[Finder] removed unnecessary comment
[Finder] added access denied exception test
[Finder] Updated AccessDeniedException base class
[Finder] fixed access denied exception test
[Finder] native adapters now throw AccessDeniedException on stderr
2013-03-22 06:21:57 +01:00
Bilal Amarni
5afea04d4a [Form] made DefaultCsrfProvider using session_status() when available 2013-03-21 16:59:06 +01:00
Fabien Potencier
9568768fd9 merged branch fabpot/kernel-flexibility (PR #7437)
This PR was merged into the master branch.

Commits
-------

7c3179a [HttpKernel] moved the Container compilation for more flexibility
757194c [HttpKernel] made the Kernel class more flexible (closes #7396)

Discussion
----------

[HttpKernel] made the Kernel class more flexible (closes #7396)

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

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

by jrobeson at 2013-03-20T14:04:53Z

I still (personally) think that the compile() method is still too close to the building of the container. Is there a reasonable way to move the compile() method away from the rest of the logic used to build the container?

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

by elnur at 2013-03-20T14:34:23Z

I like this one. Can't wait to see this merged.

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

by stof at 2013-03-20T14:50:22Z

@jrobeson compiling the container is part of building it (it is the step running the compiler passes)

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

by jrobeson at 2013-03-20T15:32:26Z

i read the code stof .. that is what it does :) . I just thought it'd be easier to modify the container from the kernel of the compile() call was placed after the  buildContainer() call at https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Kernel.php#L556

This is something i had to work around when migrating to symfony. It's not a big deal to me anymore, so no worries.

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

by stof at 2013-03-20T15:36:12Z

@jrobeson the container is not fully build until you compile it. Half of the work is done by the compile() call.

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

by fabpot at 2013-03-20T15:38:24Z

I've moved the compile method as it makes things even more flexible.

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

by jrobeson at 2013-03-20T15:41:45Z

@stof : i know .. which is even better reason to move it outside that big method.

@fabpot: thanks!
2013-03-20 18:03:16 +01:00
Eddie Jaoude
992a4401e9 Added unit tests to Dumper 2013-03-20 17:54:45 +01:00
Fabien Potencier
bb83b3ea43 [HttpKernel] added a safeguard for when a fragment is rendered outside the context of a master request 2013-03-20 17:13:45 +01:00
Fabien Potencier
ff9d6883bb fixed Request management for FragmentHandler 2013-03-20 17:13:44 +01:00
Fabien Potencier
1b98ad34ff fixed Request management for LocaleListener 2013-03-20 17:13:40 +01:00
Fabien Potencier
a7b2b7e92b fixed Request management for RequestListener 2013-03-20 16:58:09 +01:00
Fabien Potencier
0892135f45 [HttpKernel] ensured that the Request is null when outside of the Request scope 2013-03-20 16:58:09 +01:00
Fabien Potencier
ec1e7ca6ac [DependencyInjection] added a way to automatically update scoped services
A service can now be marked as synchronized; when set, all method calls
involving this service will be called each time this service is set.
When in a scope, methods are also called to restore the previous version of the
service.
2013-03-20 16:58:08 +01:00
Fabien Potencier
7c3179a364 [HttpKernel] moved the Container compilation for more flexibility 2013-03-20 16:37:56 +01:00
Jean-François Simon
c928ddc77d [HttpFoudantion] fixed Request::getPreferredLanguage() 2013-03-20 15:10:59 +01:00
Fabien Potencier
d699a929e0 Merge branch '2.2'
* 2.2: (70 commits)
  change wrapped exception message to be more usefull
  updated VERSION for 2.0.23
  update CONTRIBUTORS for 2.0.23
  updated CHANGELOG for 2.0.23
  [Form] fixed failing test
  [DomCrawler] added support for query string with slash
  Fixed invalid file path for hiddeninput.exe on Windows.
  fix xsd definition for strict-requirements
  [WebProfilerBundle] Fixed the toolbar styles to apply them in IE8
  [ClassLoader] fixed heredocs handling
  fixed handling of heredocs
  Add a public modifier to an interface method
  removing xdebug extension
  [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
  replaced new occurences of 'Request::create()' with '::create()'
  changed sub-requests creation to '::create()'
  fixed merge issue
  ...

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
	src/Symfony/Component/DomCrawler/Link.php
	src/Symfony/Component/Translation/Translator.php
2013-03-20 15:03:03 +01:00
Fabien Potencier
e24ce2f22f Merge branch '2.1' into 2.2
* 2.1:
  updated VERSION for 2.0.23
  update CONTRIBUTORS for 2.0.23
  updated CHANGELOG for 2.0.23
  [Form] fixed failing test
  [DomCrawler] added support for query string with slash
2013-03-20 14:55:39 +01:00
Fabien Potencier
757194c775 [HttpKernel] made the Kernel class more flexible (closes #7396) 2013-03-20 14:55:07 +01:00
Fabien Potencier
4047bf229f merged branch jfsimon/preg-bytes-conversion (PR #7413)
This PR was merged into the master branch.

Commits
-------

3674c22 changed bytes conversion method

Discussion
----------

Changed bytes conversion method

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

**The old way:**

```php
switch (strtolower(substr($memory, -1))) {
    case 'g':
        $memory *= 1024;
    case 'm':
        $memory *= 1024;
    case 'k':
        $memory *= 1024;
}
```

**The new way:**

```php
if (preg_match('#^(\d+)([bkmgt])#i', $memory, $match)) {
    $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
    $memory = ($match[1] * (1 << $shift[strtolower($match[2])]));
}
```

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

by bendavies at 2013-03-18T16:27:52Z

pretty unreadable, no?

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

by benja-M-1 at 2013-03-18T16:29:25Z

I agree, I would not like to have to debug it.

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

by pborreli at 2013-03-18T16:31:43Z

just for my culture, what does : `1 << $var` ?

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

by bendavies at 2013-03-18T16:33:23Z

@pborreli it's a left shift http://php.net/manual/en/language.operators.bitwise.php

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

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

@bendavies @benja-M-1 it's concise and easily recognised (if you understood it the first time).
FYI I didn't find it myself... pretty clever isn't it?

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

by benja-M-1 at 2013-03-18T16:50:53Z

Clearly too much clever for me :)

And what about moving this code in its own class to avoid the copy/paste?

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

by jfsimon at 2013-03-18T16:52:51Z

@benja-M-1 It would add a dependency to the components using it :(

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

by bendavies at 2013-03-18T16:55:26Z

@jfsimon clever indeed, but not necessarily better!

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

by jfsimon at 2013-03-18T16:57:18Z

@bendavies that's true.

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

by Tobion at 2013-03-18T17:00:56Z

There are other places where it could be used too (e.g. FileValidator).

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

by bendavies at 2013-03-18T17:06:01Z

on the other side of the argument, i *hate* the sneaky fall through on the switch statement.
very confusing the first time you see it!

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

by bendavies at 2013-03-18T17:19:42Z

this method has already made it into symfony here: https://github.com/symfony/symfony/pull/7395

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

by jfsimon at 2013-03-19T08:16:19Z

@Tobion I have some questions about the `FileValidator`:
* Why is th `k` in lower case and the `M` in upper case?
* Why is the size divided by 1000 and not 1024?

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

by Tobion at 2013-03-19T08:30:23Z

I was wondering the same. I guess this config (which is also displayed to users) uses the official metric prefixes (k = kilo, M = mega). So it's not about the computer terms where 1 KB = 1024 byte.

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

by vicb at 2013-03-19T16:03:21Z

kB =1000, kiB=1024.
Imo regexps should be case insensitive and account for the "i".
I am not in favor of the changes in this pr (the current way is also documented on php.net fwiw)
2013-03-20 14:37:17 +01:00
Gordon Franke
d015a0f660 change wrapped exception message to be more usefull 2013-03-20 14:23:26 +01:00
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
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
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
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
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
84ff273986 merged branch jfsimon/issue-7037 (PR #7395)
This PR was merged into the master branch.

Commits
-------

a011842 [HttpKernel] fixed memory collector
def2ccb Add PHP memory_limit to WDT

Discussion
----------

[HttpKernel] fixed memory collector

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

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

by vicb at 2013-03-15T20:21:55Z

OT, that's great to see many contributions for you @jfsimon, thanks !

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

by jfsimon at 2013-03-18T09:35:54Z

Thanks @vicb, this is so lovely :)
2013-03-18 18:10:19 +01:00
Jean-François Simon
3674c22b31 changed bytes conversion method 2013-03-18 17:08:21 +01:00
Jean-François Simon
a011842982 [HttpKernel] fixed memory collector 2013-03-18 16:18:56 +01:00
Elnur Abdurrakhimov
366bba6919 Add a public modifier to an interface method 2013-03-18 15:34:11 +01:00
Fabien Potencier
1c0f481ec1 merged branch bamarni/patch-1 (PR #7005)
This PR was merged into the master branch.

Commits
-------

ed58e36 [HttpKernel] CLI - don't always display errors

Discussion
----------

[HttpKernel] CLI - don't always display errors

I had closed #6370 by mistake when cleaning up my branches.

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

by sstok at 2013-02-13T15:13:16Z

👍
2013-03-18 15:30:54 +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
ea9883f4be merged branch jfsimon/issue-6592 (PR #7331)
This PR was merged into the master branch.

Commits
-------

57aa3d5 [FrameworkBundle] adds --clean option translation:update command

Discussion
----------

[FrameworkBundle] adds --clean option translation:update command

This PR adds `--clean` option to `translation:update` command.
This options activates unused translation removal.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6592
2013-03-18 15:16:29 +01:00
Fabien Potencier
94ca2754ff merged branch jfsimon/issue-7069 (PR #7271)
This PR was merged into the master branch.

Commits
-------

b6a5457 [Validator] Fixed member (getter/property) metadata readers. [Validator] added overridden getter metadata test [Validator] class member reflection build requires object instance [Validator] fixed error [Validation] fixed member metadata reflection cache [Validation] added property metedata test [Validation] fixed class/member metadata mapping [Validation] removed var_dump
9b6cd80 Update src/Symfony/Component/Validator/Mapping/GetterMetadata.php

Discussion
----------

[Validator] Use concrete Class Methods to check validations

This PR just adds a test to #7069.

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

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

by vicb at 2013-03-05T18:21:02Z

@jfsimon Do you have a response about my comment in the original PR ?

At least we now have a BC break (ie new is no more called).

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

by jfsimon at 2013-03-05T18:30:43Z

@vicb I didn't saw it. I update the description.

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

by vicb at 2013-03-05T18:34:01Z

np, do you have a reply ?

_BCB = yes should trigger a note in the changelog_

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

by jfsimon at 2013-03-05T18:51:15Z

@vicb a response about the `newReflectionMember` method update?

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

by vicb at 2013-03-05T19:08:54Z

Yep

"Jean-François Simon" <notifications@github.com> wrote:

>@vicb a response about the `newReflectionMember` method update?
>
>---
>Reply to this email directly or view it on GitHub:
>https://github.com/symfony/symfony/pull/7271#issuecomment-14457748

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

by Gladhon at 2013-03-06T08:04:38Z

@vicb
newReflectionMember is a Method that comes from the parent and has no argument "object". So it can only get the reflection Member of the configured class, while we need once (in this special case) need the method of the concrete class.

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

by jfsimon at 2013-03-06T08:29:11Z

@vicb @Gladhon correct me if I'm wrong.

This method is only used to check the member scope. In the case of a getter, this scope is always public (`method_exists` returns true only if method is visible, then is this case public, isn'it?), so the `isPublic`, `isProtected` and `isPrivate` methods can be safely overriden. Am I right?

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

by Gladhon at 2013-03-06T08:43:54Z

Yes i am in agreement with that.

But I just think about to change the getPropertyValue also in PropertyMetadata. Can that make sense in any case ?

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

by vicb at 2013-03-06T08:56:21Z

@jfsimon `method_exists` returns `true` when the method exists, whatever its visibility.

My question is whether it would make sense to change the signature of `newReflectionMember` to accept an objet ?
That would be a BC break but the implementation proposed here is also a BC break (`newReflectionMember` which was called from `getReflectionMember` is no more called with this PR - it could have been overriden by a dev)

Finally `PropertyMetadata` should probably be updated in the same way.

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

by vicb at 2013-03-06T08:57:33Z

_and fyi you can both work on the same PR, ie @Gladhon you can send some changes (a PR) to the repo of @jfsimon_

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

by Gladhon at 2013-03-06T10:22:07Z

Well, i like it how it is now. Cause if we change that, you also need to have a object if calling "isPublic". For me it makes more sence to have only the object parameter if its realy needed.
Where do you see a real benefit if we change the `newReflectionMember` instead ?

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

by jfsimon at 2013-03-07T13:43:43Z

@vicb I think passing object instance to `getReflectionMember` is **required** for consistency.
I just pushed it.
2013-03-18 15:13:05 +01:00
Jean-François Simon
b6a545711a [Validator] Fixed member (getter/property) metadata readers.
[Validator] added overridden getter metadata test
[Validator] class member reflection build requires object instance
[Validator] fixed error
[Validation] fixed member metadata reflection cache
[Validation] added property metedata test
[Validation] fixed class/member metadata mapping
[Validation] removed var_dump
2013-03-18 15:05:03 +01:00
Jean-François Simon
57aa3d51a7 [FrameworkBundle] adds --clean option translation:update command
[FrameworkBundle] moved operation classes to component

[FrameworkBundle] fixed catalogue operation classes

[Translation] renamed catalogue operation classes

[Translation] renamed operation classes
2013-03-18 14:53:00 +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
Lee McDermott
def2ccb6d2 Add PHP memory_limit to WDT 2013-03-15 17:17:12 +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
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
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
Tobias Schultze
d7a74349a9 [Routing] fix url generation for optional parameter having a null value 2013-03-14 10:39:13 +01:00
Jérôme Tamarelle
cce3a6bfca [HttpKernel] Collect data if the controller is a Closure
Use the same format as object methods to describe closures and collect
the file and the line where it's been declared.

These informations should be added in the views of the webprofiler.
2013-03-13 23:08:54 +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
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
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
Benoit Leveque
602cdeeaed replace INF to PHP_INT_MAX inside Finder component.
bug issue introduced by 7c66dffa6b
2013-03-12 12:39:20 +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
639c30c9be fixed id case when setting a service (also slightly enhanced an error message) 2013-03-11 23:11:53 +01:00
Oleg Zinchenko
663c796458 Property accessor custom array object fix 2013-03-11 18:33:57 +01:00
Fabien Potencier
6c1e86c3e1 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 :).
2013-03-11 18:23:12 +01:00
Abdellatif Ait boudad
4f3771db91 [2.2][HttpKernel] fixed wrong option name in FragmentHandler::fixOptions 2013-03-11 18:23:12 +01:00
Fabien Potencier
7c66dffa6b 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
2013-03-11 18:18:44 +01:00
Martin Hasoň
9b4cd73748 [DependencyInjection] Added missing support for setting previous exception 2013-03-09 06:37:35 +01:00
Toni Uebernickel
f5dc03d842 fix xargs pipe to work with spaces in dir names 2013-03-08 17:54:57 +01:00
Fabien Potencier
62f3d2acd5 merged branch Tobion/debug-command (PR #7301)
This PR was merged into the 2.2 branch.

Commits
-------

15bf033 [FrameworkBundle] fix router debug command
d16d193 [FramworkBundle] removed unused property of trans update command
5361f83 [FramworkBundle] fix phpdoc of commands

Discussion
----------

[FrameworkBundle] router debug command fix

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

See commits.
2013-03-08 14:32:59 +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
Tim Nagel
95af84c0b8 Fixed test to use Reflection 2013-03-08 15:45:32 +11:00
Tobias Schultze
5361f83be8 [FramworkBundle] fix phpdoc of commands 2013-03-07 14:36:36 +01:00
Muriel
523ef290db Fix warning for buildXml method
Fix "Warning: Missing argument 3" for XmlEncoder::buildXml() called several times in XmlEncoder::selectNodeType()
2013-03-06 22:43:23 +01:00
Fabien Potencier
4cf084859b fixed typo (closes #7290) 2013-03-06 22:28:09 +01:00
Fabien Potencier
3263fe17bb merged branch gajdaw/finder_unified_tests (PR #7197)
This PR was merged into the 2.2 branch.

Commits
-------

a59e5e4 [Finder] Unified tests

Discussion
----------

[Finder] Unified tests

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

Tests for `Finder` are very difficult to read because they contain calls to:

    sys_get_temp_dir() . '/symfony2_finder/'

This improved version simplifies adding and removing new dirs and files.
2013-03-06 20:43:20 +01:00
Matthijs van den Bos
3441dba0da fixed ticket 7210 2013-03-06 20:37:18 +01:00
Fabien Potencier
fea27c1cb3 merged branch Tobion/scheme-method-def-tolerance (PR #7268)
This PR was merged into the 2.2 branch.

Commits
-------

54c333d [Routing] unify and fix the loader tests
41ad9d8 [Routing] make xml loader more tolerant

Discussion
----------

[Routing] make xml loader more tolerant

schemes and methods may also be delimited by whitespace, comma or pipe.
Fixes https://github.com/symfony/symfony/pull/6049#issuecomment-11315698
this eases migration as now `methods="GET|POST"` also works
the second commit unifies the tests and fixes some strange assertions that were useless

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [yes but not really]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| License       | MIT
2013-03-06 20:31:19 +01: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
Fabien Potencier
6b6ccbbe24 merged branch vicb/dic/scopeexc (PR #6846)
This PR was squashed before being merged into the master branch (closes #6846).

Commits
-------

9024c07 [2.3] [DI] Improve the generated PHPDoc of the dumped PHP container

Discussion
----------

[2.3] [DI] Improve the generated PHPDoc of the dumped PHP container

By adding "@throws InactiveScopeException" where applicable

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

by vicb at 2013-01-23T11:51:11Z

thanks @stof

> Native types should be lowercase

Never say that to @fabpot :)

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

by stof at 2013-01-23T12:10:56Z

@vicb he has an exception for ``Boolean`` (and explained why) but the reason cannot be applied to ``object``

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

by vicb at 2013-01-23T13:01:55Z

@stof all "Object"s should be covered now. Yeah I know he has such a mannerism !

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

by stof at 2013-01-23T19:01:07Z

@vicb none of the dumping tests modified ? this looks weird

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

by stof at 2013-01-23T19:06:06Z

hmm, travis is indeed agreeing with me...

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

by vicb at 2013-01-23T20:07:16Z

I'll fix that tomorrow

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

by vicb at 2013-01-24T08:37:55Z

travis I hope you like it !
2013-03-06 18:58:06 +01:00
Victor
9024c07d03 [2.3] [DI] Improve the generated PHPDoc of the dumped PHP container 2013-03-06 18:58:05 +01:00
Fabien Potencier
feaee3615f Merge branch '2.2'
* 2.2: (26 commits)
  [FrameworkBundle] Fixes invalid serialized objects in cache
  remove dead code in yaml component
  Fixed typo in UPGRADE-2.2
  fixed typo
  RedisProfilerStorage wrong db-number/index-number selected
  [DependencyInjection] added a test for the previous merge (refs #7261)
  Unset loading[$id] in ContainerBuilder on exception
  Default validation message translation fix.
  remove() should not use deprecated getParent() so it does not trigger deprecation internally
  adjust routing tests to not use prefix in addCollection
  add test for uniqueness of resources
  added tests for addDefaults, addRequirements, addOptions
  adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component
  added tests for remove() that wasnt covered yet and special route name
  refactor interator test that was still assuming a tree
  adjust tests to no use addPrefix with options
  adjusted tests to not use RouteCollection::getPrefix
  [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3
  [Console] fixed StringInput binding
  [Console] added string input test
  ...
2013-03-06 18:50:21 +01:00
Fabien Potencier
2850fca233 Merge branch '2.1' into 2.2
* 2.1:
  [FrameworkBundle] Fixes invalid serialized objects in cache
  remove dead code in yaml component
  fixed typo
  RedisProfilerStorage wrong db-number/index-number selected
  [DependencyInjection] added a test for the previous merge (refs #7261)
  Unset loading[$id] in ContainerBuilder on exception
  [Console] fixed StringInput binding
  [Console] added string input test
  Revert "merged branch jfsimon/issue-6749 (PR #7220)"
  fixed CS

Conflicts:
	src/Symfony/Component/Console/Tests/Input/StringInputTest.php
	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
2013-03-06 18:38:49 +01:00
Fabien Potencier
7de4ec8869 merged branch fabpot/translator-consistency (PR #7100)
This PR was merged into the master branch.

Commits
-------

0ef08f5 [Translator] fixed inconsistency in Translator

Discussion
----------

[2.3] [Translator] fixed inconsistency in Translator

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

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

by stof at 2013-02-17T20:44:32Z

shouldn't you make ``setFallbackLocale`` call ``setFallbackLocales`` ?

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

by fabpot at 2013-02-18T14:04:39Z

@stof: done

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

by stof at 2013-02-18T14:18:10Z

shoudn't you also update the place where the method is used (in FrameworkBundle probably) to use the non-deprecated one ?
2013-03-06 18:22:34 +01:00
Fabien Potencier
34c9323782 merged branch gimler/profiler_status_text (PR #7095)
This PR was merged into the master branch.

Commits
-------

b0bca01 add status text to web profiler response panel

Discussion
----------

[2.3] add status text to web profiler response panel

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

Add the status text to the web profiler response panel

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

by Burgov at 2013-02-17T11:08:37Z

The response object allows for setting a custom status message, so displaying the predefined one could be confusing.

E.g. ```$reponse->setStatusCode(403, "You can't go here!")```

However, there is no getter for it to be read... Perhaps it should be added?

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

by fabpot at 2013-02-17T11:32:37Z

I think displaying the default text is good enough. I suppose that the intent is to easily remember what a given status code means. There is no getter for the status text as it has no real meaning in terms of HTTP.

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

by gimler at 2013-02-17T16:50:47Z

Yes this was my intention. But i think this is a good point the response should have a `getStatusText` method.
So actual to only point where the status text is use is when the response is converted to string.

@fabpot i would add the `getStatusText` method to the `response` class and modify the PR to use this text. Do you agree with that?

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

by fabpot at 2013-02-17T17:13:07Z

Ad I said in my previous comment, not having a `getStatusText()` was in fact intentional.
2013-03-06 18:01:56 +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
d59cf10593 merged branch jfsimon/issue-7169 (PR #7179)
This PR was squashed before being merged into the master branch (closes #7179).

Commits
-------

c6fe27f [2.3] [DomCrawler] adds schema relative URL support to link

Discussion
----------

[2.3] [DomCrawler] adds schema relative URL support to link

Adds support for `//relative/schema` URLs to `DomCrawler` links.

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

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

by stof at 2013-02-25T19:17:10Z

👍
2013-03-06 17:43:17 +01:00
Jean-François Simon
c6fe27f63e [2.3] [DomCrawler] adds schema relative URL support to link 2013-03-06 17:43:17 +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
Fabien Potencier
d0022e31d7 merged branch Tobion/deprecation-trigger (PR #7266)
This PR was merged into the 2.2 branch.

Commits
-------

c0687cd remove() should not use deprecated getParent() so it does not trigger deprecation internally
708c0d3 adjust routing tests to not use prefix in addCollection
6180c5b add test for uniqueness of resources
c0de07b added tests for addDefaults, addRequirements, addOptions
0a1cfcd adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component
ea694e4 added tests for remove() that wasnt covered yet and special route name
9e2bcb5 refactor interator test that was still assuming a tree
ceb9ab4 adjust tests to no use addPrefix with options
2b8bf6b adjusted tests to not use RouteCollection::getPrefix
acff735 [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3

Discussion
----------

[2.2][Routing] Trigger deprecation and refactor tests to not use deprecated methods

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

@fabpot please don't squash because it also added new tests
2013-03-06 17:23:04 +01:00
Maksim Muruev
709518bafd Default validation message translation fix.
Add 'validators' for $translationDomain. Detailed discussion https://github.com/fabpot/Silex/pull/641
2013-03-06 17:05:34 +01:00
Tobias Schultze
c0687cd5fa remove() should not use deprecated getParent() so it does not trigger deprecation internally 2013-03-05 15:23:59 +01:00
Tobias Schultze
708c0d3ff9 adjust routing tests to not use prefix in addCollection 2013-03-05 15:23:58 +01:00
Tobias Schultze
6180c5b031 add test for uniqueness of resources 2013-03-05 15:23:57 +01:00
Tobias Schultze
c0de07b960 added tests for addDefaults, addRequirements, addOptions 2013-03-05 15:23:56 +01:00
Tobias Schultze
0a1cfcdb5f adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component 2013-03-05 15:23:56 +01:00
Tobias Schultze
ea694e445d added tests for remove() that wasnt covered yet and special route name 2013-03-05 15:23:55 +01:00
Tobias Schultze
9e2bcb5d9e refactor interator test that was still assuming a tree 2013-03-05 15:23:54 +01:00
Tobias Schultze
ceb9ab44a4 adjust tests to no use addPrefix with options 2013-03-05 15:23:53 +01:00
Tobias Schultze
2b8bf6beec adjusted tests to not use RouteCollection::getPrefix 2013-03-05 15:23:53 +01:00
Tobias Schultze
acff7356ce [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3 2013-03-05 15:23:52 +01:00
Tobias Schultze
54c333dc25 [Routing] unify and fix the loader tests 2013-03-05 15:04:24 +01:00
Tobias Schultze
41ad9d8eb2 [Routing] make xml loader more tolerant
schemes and methods may also be delimited by whitespace, comma or pipe.
this eases migration as now schemes="GET|POST" also works
2013-03-05 15:01:56 +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
49984b6fba merged branch pborreli/patch-6 (PR #7228)
This PR was merged into the 2.2 branch.

Commits
-------

c6c71bf Fixed trailing whitespace

Discussion
----------

Fixed trailing whitespace
2013-03-01 15:58:56 +01:00
Jean-François Simon
5bf2f7110f [Console] added deprecation annotation 2013-03-01 15:42:44 +01:00
Jean-François Simon
f95f8e2a3b [Console] added string input test 2013-03-01 15:41:03 +01:00
Jean-François Simon
4b12118bc2 Revert "merged branch jfsimon/issue-6749 (PR #7220)"
This reverts commit f52120bdd3, reversing
changes made to 66c2be30d0.
2013-03-01 15:36:15 +01:00
Fabien Potencier
e047ac898b fixed CS 2013-03-01 11:46:19 +01:00
Fabien Potencier
c67072a34a [HttpKernel] fixed version 2013-03-01 11:43:11 +01:00