Commit Graph

9427 Commits

Author SHA1 Message Date
Fabien Potencier
25028a7c79 merged branch craue/patch-19 (PR #4101)
Commits
-------

f287f08 removed superfluous `public` modifier from interface methods

Discussion
----------

removed superfluous `public` modifier from interface methods
2012-04-24 21:17:26 +02:00
Christian Raue
f287f0804d removed superfluous public modifier from interface methods 2012-04-24 19:15:04 +02:00
Drak
f209f4fc88 Typo spelling mistake 2012-04-24 22:43:51 +05:45
Fabien Potencier
5ed9dbe632 merged branch Tobion/patch-2 (PR #4080)
Commits
-------

9f0daf4 put parentheses back
885104c fix typo

Discussion
----------

fix typo

Fix typo introduced in #4069
Past participle of `read` is `read`
2012-04-24 14:30:47 +02:00
Tobias Schultze
9f0daf47f9 put parentheses back 2012-04-24 15:28:42 +03:00
Fabien Potencier
674cbf9e0e merged branch craue/patch-18 (PR #4094)
Commits
-------

ee57c04 added missing dot in FormType as follow-up to #3922

Discussion
----------

added missing dot in FormType as follow-up to #3922

added missing dot in FormType as follow-up to #3922
2012-04-24 14:15:57 +02:00
Christian Raue
ee57c04b24 added missing dot in FormType as follow-up to #3922 2012-04-24 01:06:23 +02:00
Fabien Potencier
c2a426e23f merged branch bschussek/issue4077 (PR #4085)
Commits
-------

d9e142b [Form] Restored and deprecated method `guessMinLength` in FormTypeGuesser

Discussion
----------

[Form] Restored and deprecated method `guessMinLength` in FormTypeGuesser

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

![Travis Build Status](https://secure.travis-ci.org/bschussek/symfony.png?branch=issue4077)

This is a follow-up PR to #4077 (see comments in #3927 for reference).
2012-04-23 16:39:15 +02:00
Bernhard Schussek
d9e142bd62 [Form] Restored and deprecated method guessMinLength in FormTypeGuesser 2012-04-23 16:02:44 +02:00
Fabien Potencier
b7189fd54a merged branch Tobion/mongotest (PR #4082)
Commits
-------

58b2b2d fix fatal error when mongo not available

Discussion
----------

fix fatal error when mongo not available
2012-04-23 14:39:54 +02:00
Tobias Schultze
58b2b2da54 fix fatal error when mongo not available 2012-04-23 14:17:34 +02:00
Tobias Schultze
885104cb78 fix typo 2012-04-23 14:43:49 +03:00
Fabien Potencier
27b4774ff3 merged branch ruian/guess_pattern (PR #4077)
Commits
-------

f7200e4 [Form] added method `guessPattern` to FormTypeGuesserInterface

Discussion
----------

[Form] add guess pattern

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: https://github.com/symfony/symfony/issues/3766
Todo: -

Due to some trouble when rebase my previous PR i open a new one with Master merged
Refs PR: https://github.com/symfony/symfony/pull/3927

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

by fabpot at 2012-04-23T10:25:57Z

@vicb @bschussek ok for you?

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

by bschussek at 2012-04-23T10:26:51Z

please do also rephrase the commit message to something clearer, like

    [Form] added method `guessPattern` to FormTypeGuesserInterface

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

by bschussek at 2012-04-23T10:27:35Z

Otherwise this looks good :)

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

by ruian at 2012-04-23T10:29:18Z

every changes done
2012-04-23 12:29:33 +02:00
julien.galenski
f7200e479c [Form] added method guessPattern to FormTypeGuesserInterface
rephrase changelog
2012-04-23 12:28:18 +02:00
Fabien Potencier
a8b091c612 update CHANGELOG for 2.1 2012-04-23 12:27:55 +02:00
Fabien Potencier
d5c5d7667d merged branch Baachi/mongo-session-storage (PR #4013)
Commits
-------

40df3bf Add mongodb session storage

Discussion
----------

[HttpFoundation][Session] Add mongodb session storage

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

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

by Baachi at 2012-04-19T19:05:19Z

Review please :)

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

by Baachi at 2012-04-19T19:49:42Z

@stof Can be merged?

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

by stof at 2012-04-19T19:51:28Z

I'm not a Mongo expert but it seems fine. You simply need to wait @fabpot's final review now

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

by Baachi at 2012-04-19T19:52:53Z

Okay, thanks :)

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

by Baachi at 2012-04-20T06:21:52Z

@vicb Sorry, for the email flood :)

I implemented all your suggestions.

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

by fabpot at 2012-04-22T08:27:19Z

@drak, @vicb: Is it ok now?

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

by vicb at 2012-04-22T08:33:31Z

I am ok with this PR
2012-04-23 12:27:25 +02:00
Fabien Potencier
62005b9736 merged branch pulzarraider/windows_proces_hang_fix (PR #4069)
Commits
-------

e3296cb fix php5.4 problem
c2405c0 fix hanging of unit tests on Windows

Discussion
----------

[WIP] [Process] Fix hanging of unit tests on Windows

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

This PR tries to fix hanging unit tests on Windows platform. The problem is caused by known [PHP bug](https://bugs.php.net/bug.php?id=51800). PHP hangs forever while reading from STDOUT pipe if the output is too big.

I tried different combinatios and this is not ideal, but a working patch - STDOUT is sending to a file.

@Tobion, @drak and other developers working on Windows - can you please confirm, if this solution works for you, too?

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

by Seldaek at 2012-04-22T20:56:20Z

Tried it on 5.4.0 - I get the following when I checkout your branch:

```
SS..........ESSSSSSSSSS...E.S

Time: 0 seconds, Memory: 19.75Mb

There were 2 errors:

1) Symfony\Component\Process\Tests\ProcessTest::testProcessResponses with data set #0 ('output', 'getOutput', 'echo \'output\';')
Undefined offset: 1

C:\Users\seld\Web\symfony\framework\src\Symfony\Component\Process\Process.php:342
C:\Users\seld\Web\symfony\framework\src\Symfony\Component\Process\Process.php:168
C:\Users\seld\Web\symfony\framework\src\Symfony\Component\Process\Tests\ProcessTest.php:46

2) Symfony\Component\Process\Tests\ProcessTest::testIsRunning
Undefined offset: 1

C:\Users\seld\Web\symfony\framework\src\Symfony\Component\Process\Process.php:342
C:\Users\seld\Web\symfony\framework\src\Symfony\Component\Process\Tests\ProcessTest.php:106
```

When I remove the skipping of `ProcessTest::testProcessPipes` - it still hangs so it looks like your fix is not working.

Just for reference, with latest master checkout I get this:

```
SS...........SSSSSSSSSS.....S

Time: 2 seconds, Memory: 19.75Mb

OK, but incomplete or skipped tests!
```

Don't have time right now, but if I find time to look at your diff in more details I will, maybe it's possible to fix it.

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

by pulzarraider at 2012-04-22T22:23:05Z

@Seldaek Thanks, fixed php5.4 problem, my php5.3.8 passed every Process tests.

This patch isn't fixing problem with pipes in general. I don't think it's even possible from PHP code. We have to wait for PHP core developers to fix this problem. This patch only fix issue with hanging unit tests (not the one with pipes you mentioned). In my environment, symfony unit tests never finished and hangs on SwitchUserTest from SecurityBundle on 98%. Now with this patch, I can see final informations about all tests and their errors.

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

by Seldaek at 2012-04-23T07:44:16Z

Ok, it passes again on 5.4.
2012-04-23 12:23:49 +02:00
Fabien Potencier
918769ded9 merged branch gajdaw/2_1_component_classloader_cs (PR #4073)
Commits
-------

bc8855e [2.1][Component][ClassLoader] cs

Discussion
----------

[2.1][Component][ClassLoader] cs

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

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

by fabpot at 2012-04-23T06:18:26Z

Can you please remove the changes you have already made in the other PR as I merge 2.0 into master regularly. Then, you will need to squash you commits to avoid any conflict when merging will occur. Thanks.

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

by gajdaw at 2012-04-23T06:50:58Z

I hope that's it.
2012-04-23 12:23:18 +02:00
Fabien Potencier
8c74df3383 merged branch gajdaw/2_1_changelog (PR #4074)
Commits
-------

86cf3fd [2.1][CHANGELOG]: Finder, Comparator new features

Discussion
----------

[2.1][CHANGELOG]: Finder, Comparator new features

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
2012-04-23 12:22:21 +02:00
Włodzimierz Gajda
bc8855e46a [2.1][Component][ClassLoader] cs 2012-04-23 08:41:33 +02:00
Włodzimierz Gajda
86cf3fd0ab [2.1][CHANGELOG]: Finder, Comparator new features 2012-04-23 08:19:23 +02:00
Andrej Hudec
e3296cb744 fix php5.4 problem 2012-04-23 00:05:10 +02:00
Andrej Hudec
c2405c0bbc fix hanging of unit tests on Windows 2012-04-22 21:52:08 +02:00
Fabien Potencier
b0a6956bdc merged branch willdurand/fix-composer-json (PR #4066)
Commits
-------

e344609 [DependencyInjection] Fixed composer.json
1aa0786 [FrameworkBundle] Fixed composer.json
3601f61 [DoctrineBridge] Fixed composer.json

Discussion
----------

Fix composer json

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

by jalliot at 2012-04-22T14:22:24Z

`suggest` no longer requires a version constraint. While you're at it, maybe you could change those to more meaningful strings explaining what each optional dependency provides.

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

by willdurand at 2012-04-22T14:24:27Z

I know, but the version is fine. It's more up to @fabpot to add description in each `suggest` entries.
Anyway, this is not the purpose of this PR. If you want to contribute on that, feel free :)
2012-04-22 18:51:57 +02:00
Fabien Potencier
ac37e99bd6 merged branch IntoWebDevelopment/countable-finder (PR #4068)
Commits
-------

6154ae5 Implement Countable

Discussion
----------

[Finder] Implement the Countable interface

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes - [![Build Status](https://secure.travis-ci.org/IntoWebDevelopment/symfony.png?branch=countable-finder)](http://travis-ci.org/IntoWebDevelopment/symfony)
Fixes the following tickets: -
Todo: -
2012-04-22 18:27:13 +02:00
Fabien Potencier
0d5d7c1bf1 merged branch michal-pipa/WebProcessorTest-fix (PR #4064)
Commits
-------

dff92e7 [Bridge][Monolog] Fixed WebProcessorTest

Discussion
----------

[Bridge][Monolog] Fixed WebProcessorTest

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes [![Build Status](https://secure.travis-ci.org/michal-pipa/symfony.png?branch=WebProcessorTest-fix)](http://travis-ci.org/michal-pipa/symfony)
Fixes the following tickets: -
Todo: -

Fixed WebProcessorTest in compliance with latest monolog changes: Seldaek/monolog@3c4bc178cc.

Test was failing with message: `Symfony\Bridge\Monolog\Tests\Processor\WebProcessorTest::testUsesRequestServerData
Undefined index: SERVER_NAME`

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

by ManuelAC at 2012-04-22T13:47:59Z

👍

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

by willdurand at 2012-04-22T13:49:27Z

👍
2012-04-22 18:25:16 +02:00
Fabien Potencier
dba1847a41 merged branch michal-pipa/changelog-update (PR #4065)
Commits
-------

7fc9326 Added server:run command to CHANGELOG

Discussion
----------

Added server:run command to CHANGELOG
2012-04-22 18:23:18 +02:00
Fabien Potencier
9d5dc7a078 merged branch dlsniper/small-wdt-fix (PR #4063)
Commits
-------

e1cf54c Small fixes for the WDT

Discussion
----------

[WebProfilerBundle] Small fixes for the WDT

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

These are some very small HTML fixes for the new WDT. Tests are passing but Travis is acting strange at the moment.
2012-04-22 18:20:21 +02:00
Manuel de Ruiter
6154ae5b28 Implement Countable 2012-04-22 16:16:11 +02:00
William DURAND
e344609bcb [DependencyInjection] Fixed composer.json
'recommend' section no more exists
2012-04-22 15:37:21 +02:00
William DURAND
1aa07869f2 [FrameworkBundle] Fixed composer.json
'recommend' section no more exists
2012-04-22 15:36:25 +02:00
William DURAND
3601f61a36 [DoctrineBridge] Fixed composer.json
'recommend' section no more exists
2012-04-22 15:32:41 +02:00
Michał Pipa
7fc93260b8 Added server:run command to CHANGELOG 2012-04-22 14:51:56 +02:00
Michał Pipa
dff92e7d27 [Bridge][Monolog] Fixed WebProcessorTest 2012-04-22 14:23:07 +02:00
Florin Patan
e1cf54c24b Small fixes for the WDT 2012-04-22 14:17:46 +03:00
Fabien Potencier
5690430587 merged branch pulzarraider/changelog_redis_profiler_storage (PR #4060)
Commits
-------

1630614 Update changelog - Redis profiler storage

Discussion
----------

Changelog update - Redis profiler storage
2012-04-22 10:23:12 +02:00
Andrej Hudec
16306141ee Update changelog - Redis profiler storage 2012-04-22 09:57:08 +02:00
Fabien Potencier
b9e6bbe21e merged branch weaverryan/remove_security_factories (PR #4058)
Commits
-------

a9d8197 Removing the security_factories.xml file - not needed after sha: 413756c103

Discussion
----------

Removing the security_factories.xml file - not needed after sha: 413756c...

Hi guys!

This is just a left-over file. See sha: 413756c103

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

Thanks!
2012-04-22 08:59:54 +02:00
Ryan Weaver
a9d8197d21 Removing the security_factories.xml file - not needed after sha: 413756c103 2012-04-21 17:16:58 -05:00
Fabien Potencier
03ad8c932d merged branch jalliot/pdo_tests (PR #4051)
Commits
-------

e509e6f Skip PDOSessionHandlerTest if PDO SQLite is not available

Discussion
----------

Skip PDOSessionHandlerTest if PDO SQLite is not available
2012-04-21 12:54:01 +02:00
Fabien Potencier
514f822b00 merged branch jalliot/patch-3 (PR #4044)
Commits
-------

128ac26 Added missing '%' in DI component README

Discussion
----------

Added missing '%' in DI component README

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

by ruian at 2012-04-21T10:37:12Z

@fabpot PR ok
2012-04-21 12:53:38 +02:00
Fabien Potencier
e755a46599 merged branch bamarni/master (PR #4050)
Commits
-------

4a9a9d6 fixed typo
167597c removed unused use statement

Discussion
----------

typo fixes

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

by ruian at 2012-04-21T10:24:04Z

@fabpot this one is Ok just some typos and a useless Namespace using
2012-04-21 12:52:50 +02:00
Jordan Alliot
e509e6ffd1 Skip PDOSessionHandlerTest if PDO SQLite is not available 2012-04-21 12:28:57 +02:00
Bilal Amarni
4a9a9d6eb8 fixed typo 2012-04-21 11:25:22 +02:00
Bilal Amarni
167597c0bd removed unused use statement 2012-04-21 11:24:50 +02:00
Markus Bachmann
40df3bf86f Add mongodb session storage
Some changes based on @stof and @stloyd suggestions

Some changes based on @vicb suggestions

Some changes based on @vicb suggestions

Add changes
2012-04-20 19:19:55 +02:00
Jordan Alliot
128ac26334 Added missing '%' in DI component README 2012-04-20 18:51:25 +03:00
Fabien Potencier
6c714095fa merged branch ruimarinho/profiler_ie7 (PR #4032)
Commits
-------

ffc074b [Profiler] Fixed IE7 JavaScript errors

Discussion
----------

[Profiler] Fixed IE7 JavaScript errors

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

Requires merge of another [PR](https://github.com/doctrine/DoctrineBundle/pull/61) available on the `doctrine/DoctrineBundle` repository (compatibility changes to `db.html.twig`).

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

by fabpot at 2012-04-20T14:15:22Z

That does not work for me.
2012-04-20 17:01:54 +02:00
Rui Marinho
ffc074be54 [Profiler] Fixed IE7 JavaScript errors 2012-04-20 15:51:44 +01:00
Fabien Potencier
ae6ccfa94b fixed typo 2012-04-20 16:24:24 +02:00