Commit Graph

7367 Commits

Author SHA1 Message Date
Fabien Potencier
a4413b828b merged branch helmer/return_void (PR #2337)
Commits
-------

c4226bb Removed redundant "@return void"-s

Discussion
----------

Removed redundant "@return void"-s

.. as mandated by [symfony-docs](https://github.com/symfony/symfony-docs) [PR#754](https://github.com/symfony/symfony-docs/pull/754)
2011-10-07 11:59:30 +02:00
Fabien Potencier
aeb27ebebb merged branch stloyd/date_time_validator_tests (PR #2338)
Commits
-------

d7c9644 [Validator] Extend and fix DateValidator & TimeValidator tests

Discussion
----------

[2.0][Validator] Extend and fix DateValidator & TimeValidator tests

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 11:56:54 +02:00
Jordi Boggiano
5473d3b6c9 [Translation] Allow use of UTF-8 encoded catalogues into non-UTF-8 applications 2011-10-07 11:21:05 +02:00
Jordi Boggiano
deb6dea76d [Translation] Add failing tests to verify that UTF-8 lang files can't be used with another charset 2011-10-07 11:20:16 +02:00
Joseph Bielawski
d7c9644d29 [Validator] Extend and fix DateValidator & TimeValidator tests 2011-10-07 10:47:59 +02:00
Helmer Aaviksoo
c4226bb6dc Removed redundant "@return void"-s 2011-10-07 11:15:35 +03:00
Fabien Potencier
a74ae9d325 [HttpFoundation] made X_REWRITE_URL only available on Windows platforms 2011-10-07 08:20:12 +02:00
Fabien Potencier
0e852fe232 Merge branch '2.0'
* 2.0:
  [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0)
  [Form] Fixed lacking attributes in DateTimeType
2011-10-06 21:40:44 +02:00
Fabien Potencier
15f19e50fc [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0) 2011-10-06 21:40:38 +02:00
Fabien Potencier
3f567b8208 [FrameworkBundle] moved a parameter in the same file as the one where the service is defined for better consistency 2011-10-05 19:17:58 +02:00
Fabien Potencier
5fe18cad90 merged branch fivestar/fix-form-datetime-2_0 (PR #2326)
Commits
-------

828b18f [Form] Fixed lacking attributes in DateTimeType

Discussion
----------

[Form] Fixed lacking attributes in DateTimeType

Added invalid_message and invalid_message_parameters. (Moved from #2311)
2011-10-05 11:21:28 +02:00
Katsuhiro OGAWA
828b18f467 [Form] Fixed lacking attributes in DateTimeType 2011-10-05 17:57:43 +09:00
Fabien Potencier
69922c41a9 merged branch SongoQ/polish_translations (PR #2319)
Commits
-------

4909169 Typo, should be "znaków"

Discussion
----------

[FrameworkBundle] Polish validator translations - Typo, should be "znaków"
2011-10-04 16:20:42 +02:00
Fabien Potencier
79bea5677a merged branch yethee/ru_translations (PR #2318)
Commits
-------

9219cf9 [FrameworkBundle] Sync the Russian translations with the SizeLength constraint

Discussion
----------

[FrameworkBundle] Sync the Russian translations with the SizeLength const
2011-10-04 16:20:32 +02:00
Marcin Chylek
4909169ca4 Typo, should be "znaków" 2011-10-04 15:05:36 +02:00
Deni
9219cf9f7d [FrameworkBundle] Sync the Russian translations with the SizeLength constraint 2011-10-04 16:49:04 +04:00
Fabien Potencier
92420ad6c9 merged 2.0 2011-10-04 13:49:11 +02:00
Fabien Potencier
1f2e72d84a updated VERSION for 2.0.4 2011-10-04 13:47:14 +02:00
Fabien Potencier
408c913991 update CONTRIBUTORS for 2.0.4 2011-10-04 13:46:51 +02:00
Fabien Potencier
b6ef87f68e updated CHANGELOG for 2.0.4 2011-10-04 13:46:16 +02:00
Fabien Potencier
f172547d84 updated vendors for 2.0.4 2011-10-04 13:43:49 +02:00
Fabien Potencier
1fa3d8e701 merged branch SongoQ/polish_translations (PR #2315)
Commits
-------

31840b9 Updated Polish validator translations (trans-unit id="47" and id="48")

Discussion
----------

Updated Polish validator translations (trans-unit id="47" and id="48")
2011-10-04 09:36:45 +02:00
Fabien Potencier
d81131ea65 merged branch alifity/id-trans-unit-47-48 (PR #2316)
Commits
-------

8404b35 Updated indonesian translations for trans-unit 47 and 48

Discussion
----------

Updated indonesian translations for trans-unit 47 and 48
2011-10-04 09:36:35 +02:00
Fabien Potencier
55e7e1a198 [Translation] changed some unit tests for PHPUnit 3.6.0 compatibility 2011-10-04 09:36:09 +02:00
Fabien Potencier
fbe9aa526e merged 2.0 2011-10-04 09:32:13 +02:00
Fabien Potencier
92d19063a8 [Translation] changed some unit tests for PHPUnit 3.6.0 compatibility 2011-10-04 08:43:04 +02:00
Alif Rachmawadi
8404b354ba Updated indonesian translations for trans-unit 47 and 48 2011-10-04 10:26:20 +07:00
Marcin Chylek
31840b97c6 Updated Polish validator translations (trans-unit id="47" and id="48") 2011-10-03 23:13:07 +02:00
Fabien Potencier
dffda2291c merged branch excelwebzone/hebrew_translations (PR #2314)
Commits
-------

eac2a77  Oops.. translated the variable by mistake
51b3b59  Updated Hebrew validator translations (trans-unit id="48")

Discussion
----------

Updated Hebrew validator translations (trans-unit id="48")
2011-10-03 18:04:12 +02:00
Fabien Potencier
cf4a91e923 [ClassLoader] fixed usage of trait_exists() 2011-10-03 18:02:59 +02:00
excelwebzone
eac2a7781d Oops.. translated the variable by mistake 2011-10-03 07:50:24 -07:00
excelwebzone
51b3b59b54 Updated Hebrew validator translations (trans-unit id="48") 2011-10-03 07:48:23 -07:00
Fabien Potencier
6b16757199 [Security] changed a RuntimeException to LogicException for consistencies between the different Token classes (closes #2310) 2011-10-03 09:03:36 +02:00
Fabien Potencier
8d6add638b [DoctrineBridge] fixed directory reference when the directory cannot be created 2011-10-03 08:58:15 +02:00
Fabien Potencier
ee375ae412 merged branch dpb587/patch-appkern (PR #2312)
Commits
-------

5419638 [HttpKernel] Show the actual directory needing to be created.

Discussion
----------

[HttpKernel] Show the actual directory needing to be created.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -

before: Unable to create the logs directory (/home/symfony/root/app)
after: Unable to create the logs directory (/home/symfony/root/app/logs)
2011-10-03 08:57:14 +02:00
Danny Berger
54196382b7 [HttpKernel] Show the actual directory needing to be created. 2011-10-03 02:08:17 -04:00
Fabien Potencier
30ddf24df3 merged branch aboks/translations_nl (PR #2307)
Commits
-------

0299d38 [FrameworkBundle] Updated Dutch validator translations

Discussion
----------

[FrameworkBundle] Updated Dutch validator translations

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-03 07:02:33 +02:00
Arnout Boks
0299d38570 [FrameworkBundle] Updated Dutch validator translations 2011-10-01 14:26:33 +02:00
Fabien Potencier
c78921f0d3 merged branch jalliot/missing-guessers (PR #2306)
Commits
-------

ee0fe7a Added guessers for Size and SizeLength constraints

Discussion
----------

Added guessers for Size and SizeLength constraints

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -

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

by jalliot at 2011/09/30 13:40:37 -0700

BTW, I've noticed that some constraints currently don't have guessers in 2.0:

* ``False`` (which could be guessed as a checkbox)
* ``True`` (which could be guessed as a required checkbox)
* ``Choice`` (which could be guessed as a choice type with medium confidence and with the choice list being guessed as the list provided for the constraint)

Are there any reasons why this is not implemented in 2.0 or should I try to make a PR for it?

There is also the ``Collection`` case but I guess it would be too difficult for this one...
2011-09-30 23:05:31 +02:00
Fabien Potencier
b639d74c5c merged branch jalliot/trans-fr (PR #2305)
Commits
-------

f9b2be9 Added french translation for SizeLength and UserPassword constraints

Discussion
----------

Added french translation for SizeLength and UserPassword constraints

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

by fabpot at 2011/09/30 13:45:46 -0700

47 is already taken for "This value should be the user current password". Should be 48.

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

by jalliot at 2011/09/30 13:59:01 -0700

@fabpot Fixed and added translation for 47 as well.
2011-09-30 23:02:43 +02:00
Jordan Alliot
f9b2be9c9c Added french translation for SizeLength and UserPassword constraints 2011-09-30 22:56:56 +02:00
Jordan Alliot
ee0fe7a2b5 Added guessers for Size and SizeLength constraints 2011-09-30 22:31:52 +02:00
Fabien Potencier
6295e55329 [DoctrineBundle] made the previous fix only available in the development environment 2011-09-30 18:10:34 +02:00
Fabien Potencier
87416b4756 [DoctrineBundle] tweaked previous merge 2011-09-30 18:08:38 +02:00
Fabien Potencier
4790a5e43f merged branch Gregwar/proxy_file_issue (PR #1968)
Commits
-------

0e00e3f [DoctrineBundle] CS
0c4b793 [DoctrineBundle] Fixed performances issues on "On-demand" proxy file generation
e866a67 [DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloader

Discussion
----------

[DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloaded

See:
https://github.com/symfony/symfony/issues/1965
https://github.com/symfony/symfony/issues/1535

This fix is not really clean and there's maybe a factorizing work to do on it, but this work and avoid me spending my day deleting session cookies each time I clear cache.

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

by stloyd at 2011/08/23 10:37:28 -0700

You should follow Symfony2 CS (http://symfony.com/doc/current/contributing/code/standards.html).

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

by ruudk at 2011/09/26 02:50:13 -0700

+1

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

by fabpot at 2011/09/27 07:01:51 -0700

It looks like a bug fix, so this PR should be closed and a new one based on the 2.0 branch should be open. @beberlei: are you fine with this patch?

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

by beberlei at 2011/09/29 04:24:22 -0700

What is this for? I dont understand the bug and the solution here screams cache slam.

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

by beberlei at 2011/09/29 04:34:02 -0700

Ok i get the problem but the solution is still a monsterous hack. Can we find a real solution to the problem? There has to be one.

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

by Gregwar at 2011/09/29 04:34:25 -0700

@beberlei, when an user is authenticated for instance, there can be proxies serialized in session.

Si if you clear the cache in dev environment you'll get an error because the matching proxy classes won't exist and you'll be forced to clear your cookies and reauth, which can be annoying

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

by Gregwar at 2011/09/29 04:38:45 -0700

@beberlei, yes, I agree that we should do something more elegant, but the problem is that when PHP "meet" the proxy class we can't really know what was the "original" class it is supposed to extend

And as @schmittjoh said, this will only be executed very rarely

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

by beberlei at 2011/09/29 05:18:35 -0700

You agree you want something more suitable and still want this to be merged?

To ease the immediate pain wr could allow this however only in debug mode. A real solution here is maybe to move the proxy files out of the env folders. Rhey dont depend ont the env after all.

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

by stloyd at 2011/09/29 05:21:33 -0700

Proxy is not depending on env, but generation of proxy is... So this solution will be hard IMO, or even unacceptable...

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

by Gregwar at 2011/09/29 05:25:39 -0700

@beberlei what I meant is that I agree that's dirty but I don't think of anything better to solve this...

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

by fabpot at 2011/09/29 06:23:03 -0700

Even if the current patch is not the best solution, we should probably apply it to fix the problem and think about a better solution afterwards. Does it sound good for everybody?
2011-09-30 18:07:40 +02:00
Fabien Potencier
73fb30fdf6 merged branch danielholmes/patch-2 (PR #2302)
Commits
-------

84808f4 [DependencyInjection] Removed unused property

Discussion
----------

[DependencyInjection] Removed unused property

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-09-30 16:58:32 +02:00
Daniel Holmes
84808f40b3 [DependencyInjection] Removed unused property
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-01 00:46:18 +10:00
Fabien Potencier
5c8a2fb48d [Routing] fixed route overriden mechanism when using embedded collections (closes #2139) 2011-09-30 12:01:46 +02:00
Fabien Potencier
245d57ac76 merged branch dpb587/patch-monoweb (PR #2296)
Commits
-------

e70c884 [Bridge/Monolog] Fix WebProcessor to accept a Request object.

Discussion
----------

[Bridge/Monolog] Fix WebProcessor to accept a Request object.

WebProcessor.php is type hinting a bad interface. Adds a simple test case.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -

Before:

    1) Symfony\Tests\Bridge\Monolog\Processor\WebProcessorTest::testUsesRequestServerData
    Argument 1 passed to Symfony\Bridge\Monolog\Processor\WebProcessor::__construct() must be an instance of Symfony\Bridge\Monolog\Processor\RequestInterface, instance of Symfony\Component\HttpFoundation\Request given, called in ./symfony/vendor/symfony/tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php on line 31 and defined

    ./symfony/vendor/symfony/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php:24
    ./symfony/vendor/symfony/tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php:31

    FAILURES!
    Tests: 1, Assertions: 0, Errors: 1.

After:

    Starting test 'Symfony\Tests\Bridge\Monolog\Processor\WebProcessorTest::testUsesRequestServerData'.
    OK (1 test, 3 assertions)

Global:

    OK, but incomplete or skipped tests!
    Tests: 4337, Assertions: 10590, Incomplete: 36, Skipped: 23.
2011-09-30 08:30:29 +02:00
Danny Berger
e70c884f49 [Bridge/Monolog] Fix WebProcessor to accept a Request object. 2011-09-30 01:58:45 -04:00