Commit Graph

13469 Commits

Author SHA1 Message Date
Christian Morgan
2ea5eaadc6 Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string) 2013-04-05 22:29:42 +01:00
Fabien Potencier
7221d25fc4 merged branch phc/2.1 (PR #7569)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes] I assume : only changed a comment word
| License       | MIT

Commits
-------

815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
2013-04-05 15:22:11 +02:00
phc
815eb6144c [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag 2013-04-05 14:59:25 +02:00
Fabien Potencier
375ded4227 [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562) 2013-04-05 08:39:48 +02:00
Fabien Potencier
d65788b3c8 merged branch bamarni/patch-3 (PR #7544)
This PR was merged into the 2.1 branch.

Discussion
----------

[WebProfilerBundle] removed next pointer class in a template

It's not needed as there is nothing after the span here, eg. on a 404, see :
http://awesomescreenshot.com/0d5149an51

It displays "n/a ::".

Commits
-------

b0ba9fd [WebProfilerBundle] removed next pointer class in a template
2013-04-05 06:53:36 +02:00
Bilal Amarni
b0ba9fd712 [WebProfilerBundle] removed next pointer class in a template 2013-04-02 11:25:27 +03:00
Fabien Potencier
50822015a6 fixed doc references (closes #7515) 2013-04-01 10:06:05 +02:00
Fabien Potencier
ab1ab7ac18 merge branch '2.1' into 2.2
* 2.1:
  fixed doc references (closes #7515)
  small changes
  [SecurityBundle] Fixed configuration exemple
  idAsIndex should be true with a smallint or bigint id field.
  Fixed long multibyte parameter logging in DbalLogger:startQuery
  Keep the file extension in the temporary copy and test that it exists (closes #7482)
  [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation

Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
2013-04-01 10:05:23 +02:00
Fabien Potencier
e602b19b3c fixed doc references (closes #7515) 2013-04-01 10:04:03 +02:00
Fabien Potencier
bf7daa11e7 merged branch sterrien/patch-4 (PR #7519)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] [Doctrine] [EntityChoiceList] idAsIndex should be true with a smallint id field.

When the id of an entity is a smallint, $this->idAsIndex should also be true.
It was not the case.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: should
License of the code: MIT

Commits
-------

673fd9b  idAsIndex should be true with a smallint or bigint id field.
2013-04-01 10:01:59 +02:00
Fabien Potencier
e57b4e5bc4 merged branch lyrixx/fix-security-config (PR #7528)
This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][SecurityBundle] Fixed configuration exemple

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

Commits
-------

2c7a99b [SecurityBundle] Fixed configuration exemple
2013-04-01 10:00:34 +02:00
Fabien Potencier
b70578f044 merged branch bamarni/minor-2.1 (PR #7533)
This PR was merged into the 2.1 branch.

Discussion
----------

small changes

Commits
-------

766e880 small changes
2013-04-01 09:57:47 +02:00
Fabien Potencier
c65b482a69 merged branch TerjeBr/persistent-token-provider (PR #7534)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security/Http/RememberMe] PersistentTokenBasedRememberMeServices bugfix

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

The database and debug layer cannot handle raw random strings. It may contain invalid ut8 characters and whatnot. So, in order to avoid a lot of database bugs, we must base64_encode the random strings.

Commits
-------

751abe1 Doctrine cannot handle bare random non-utf8 strings
2013-04-01 09:55:23 +02:00
Fabien Potencier
b70bb448fa merged branch webfactory/fix-finder-test-osx (PR #7536)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7536).

Discussion
----------

Fix Finder tests on OS X

... where sys_get_temp_dir() does not return a realpath().

Commits
-------

0ed8441 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
2013-04-01 09:51:50 +02:00
Matthias Pigulla
43a818e830 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var. 2013-04-01 09:51:50 +02:00
Terje Bråten
751abe10d5 Doctrine cannot handle bare random non-utf8 strings 2013-03-31 22:30:03 +02:00
Bilal Amarni
766e880a9d small changes 2013-03-31 20:13:07 +02:00
Grégoire Pineau
2c7a99b679 [SecurityBundle] Fixed configuration exemple
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2013-03-30 23:16:49 +01:00
Simon Terrien
673fd9bc27 idAsIndex should be true with a smallint or bigint id field. 2013-03-29 10:20:11 +01:00
Uwe Jäger
e8cae94758 fix overwriting of request's locale if attribute _locale is missing 2013-03-28 23:37:30 +01:00
Grégoire Pineau
bd264195e1 [Security] Removed unused var 2013-03-28 18:41:24 +01:00
Fabien Potencier
92501eb0af merged branch jmikola/2.2-propertyaccess-docs (PR #7511)
This PR was merged into the 2.2 branch.

Discussion
----------

[PropertyAccess] Documentation cleanup

| Q             | A
| ------------- | ---
| Fixed tickets | none
| License       | MIT

Resubmission of #7498

Commits
-------

8aaa6ef [PropertyAccess] Remove trailing periods from doc blocks
d78fec9 Fix param docs for PropertyAccessor read method
2013-03-28 18:35:23 +01:00
Jeremy Mikola
8aaa6ef0a2 [PropertyAccess] Remove trailing periods from doc blocks
Periods were left in place for entries with multiple sentences/statements.
2013-03-28 11:37:15 -04:00
Jeremy Mikola
d78fec9098 Fix param docs for PropertyAccessor read method 2013-03-28 11:37:10 -04:00
Fabien Potencier
282a9c221b merged branch burci/doctrinebridge-dballogger-bug (PR #7497)
This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][2.2][2.3][Bridge][Doctrine] Fixing long multibyte parameter logging in DbalLogger:startQuery

See #7484

Commits
-------

64a1d39 Fixed long multibyte parameter logging in DbalLogger:startQuery
2013-03-27 20:24:42 +01:00
Peter Buri
64a1d3999a Fixed long multibyte parameter logging in DbalLogger:startQuery 2013-03-27 19:41:01 +01:00
thewilkybarkid
4cf06c1560 Keep the file extension in the temporary copy and test that it exists (closes #7482) 2013-03-27 18:13:16 +01:00
Fabien Potencier
b898b13061 merged branch 77web/validator-translation-ja (PR #7478)
This PR was merged into the 2.1 branch.

Discussion
----------

[Validator] [translation] updated Japanese translation for Validator component

| Q             | A
| ------------- | ---
| Fixed tickets | N/A
| License       | MIT

I will also update translations for new messages available after 2.2 once this request is merged.

Commits
-------

987aded [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
2013-03-26 15:51:15 +01:00
Fabien Potencier
aaf4f12ad9 Merge branch '2.1' into 2.2
* 2.1:
  bumped Symfony version to 2.1.10-DEV
  updated VERSION for 2.1.9
  update CONTRIBUTORS for 2.1.9
  updated CHANGELOG for 2.1.9
  [FrameworkBundle] Reuse definition variable in FormPass

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-03-26 15:39:23 +01:00
Fabien Potencier
e9b6c34aee bumped Symfony version to 2.1.10-DEV 2013-03-26 15:38:40 +01:00
77web
987adeddb7 [Validator][translation][japanese]replaced period to japanese one
[Validator][translation][japanese]fixed japanese translation to more practical one
[Validator][translation][japanese]fixed message ordering to be consistent with other languages
[Validator][translation][japanese]added new validation messages in japanese translation
2013-03-26 20:06:56 +09:00
Fabien Potencier
d54173f38d updated VERSION for 2.1.9 2013-03-26 11:44:36 +01:00
Fabien Potencier
352c4c5e6c update CONTRIBUTORS for 2.1.9 2013-03-26 11:44:12 +01:00
Fabien Potencier
9a3a0bf7a6 updated CHANGELOG for 2.1.9 2013-03-26 11:42:12 +01:00
Fabien Potencier
64ac34dccf [Security] fixed wrong interface 2013-03-26 08:52:57 +01:00
Fabien Potencier
c4bcf46623 merged branch xkobal/master (PR #7436)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7436).

Discussion
----------

Bugs when RememberMe use token_provider

When token_provider is used for remember_me in security.yml, it produces an Exception :

Catchable Fatal Error: Argument 5 passed to Symfony\Component\Security\Http\RememberMe\PersistentTokenBasedRememberMeServices::__construct() must be an instance of Symfony\Component\Security\Http\RememberMe\LoggerInterface, instance of Symfony\Bridge\Monolog\Logger given, called in /home/overblog/public_html/OverblogUser/app/cache/dev/appDevDebugProjectContainer.php on line 2358 and defined in /home/overblog/public_html/OverblogUser/vendor/symfony/symfony/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php line 46

The problem comes from missing use in PersistentTokenBasedRememberMeServices and wrong inheritance in security_rememberme.xml.

Commits
-------

a7784e5 Remove already defined arguments
c3b0ec4 Add missing use
2013-03-26 08:52:21 +01:00
Xavier HAUSHERR
cb4704d1a9 Remove already defined arguments 2013-03-26 08:52:20 +01:00
Xavier HAUSHERR
1ac3bb00ca Add missing use 2013-03-26 08:52:20 +01:00
dened
c4da2d9892 [HttpFoundation] getClientIp is fixed.
The getClientIp now returns ip of the earliest server in a proxy chain when all the servers in the chain are trusted proxies. Before this patch the getClientIp used to return null at such condition.
Some appropriate tests are added.
2013-03-25 11:05:20 +04:00
Fabien Potencier
d9009cb3c6 merged branch franmomu/reuse_variable_formpass (PR #7464)
This PR was merged into the 2.1 branch.

Discussion
----------

[FrameworkBundle] Reuse definition variable in FormPass

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

Commits
-------

f52320d [FrameworkBundle] Reuse definition variable in FormPass
2013-03-24 08:11:17 +01:00
Fran Moreno
f52320d4b9 [FrameworkBundle] Reuse definition variable in FormPass 2013-03-23 21:50:01 +01:00
Fabien Potencier
9885798dd1 merged branch schmittjoh/routingFix (PR #7458)
This PR was merged into the 2.2 branch.

Discussion
----------

Reverts behavior change to UrlGenerator

I do not want to talk much about the behavior change and whether it makes sense or not because I think it does not matter in this situation anyway.

The ``generate`` method is tagged with ``@api``, there is no security issue that was fixed. According to the rules set forth at http://symfony.com/doc/current/book/stable_api.html, the semantics of such a method must not be changed.

There is some more discussion in #6814 and the commit changing the behavior is this one: c66d1f9de3 (diff-0)

Commits
-------

a765375 reverts some behavior changes made in c66d1f9de30fd1b6a86cca10dd79d12c9ba9ff25
2013-03-23 13:53:00 +01:00
Johannes M. Schmitt
a765375e91 reverts some behavior changes made in c66d1f9de30fd1b6a86cca10dd79d12c9ba9ff25 2013-03-23 13:03:22 +01:00
Fabien Potencier
9e7a877f7c merged branch fabpot/webprofiler-customization (PR #7003)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.3] [WebProfiler] added the possibility to override the application name/version in the WDT

| 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

Commits
-------

d35cb9f [WebProfiler] added the possibility to override the application name/version in the WDT
2013-03-23 11:44:58 +01:00
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
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
Fabien Potencier
78ebba558e merged branch lizjulien/7106 (PR #7248)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7248).

Discussion
----------

#7106 - check php version for getcwd()

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

Commits
-------

11d3855  #7106 - fix for ZTS builds
2013-03-23 08:44:02 +01:00
Julien Moulin
11c0fb580d #7106 - fix for ZTS builds 2013-03-23 08:44:01 +01:00
Fabien Potencier
11a0481e32 merged branch tPl0ch/feature/yaml-parameter-escape (PR #7357)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7357).

Discussion
----------

[DependencyInjection] 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).

This PR is deprecating https://github.com/symfony/symfony/pull/7307, since as a new feature it has to be compared against the master branch.

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

Commits
-------

8cdf387 [DependencyInjection] Added '@@' escaping strategy for YamlFileLoader and YamlDumper
2013-03-23 07:58:10 +01:00