Commit Graph

7570 Commits

Author SHA1 Message Date
Fabien Potencier
d59bde7585 merged branch willdurand/propel-bridge (PR #2191)
Commits
-------

5e4b7cb Renamed Propel Bridge: Propel => Propel1
cdad7ab Introducing the Propel Bridge

Discussion
----------

Introducing the Propel Bridge

Basic bridge with stable components for Propel.

This should not affect anything except the need to maintain this code (even if the most part is safe thanks to `@api` tag). As Propel future is linked to Symfony2, to maintain this bridge should not be a problem.
Don't flame me for this proposal, I do that "knowingly".

Regards,
William.

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

by stof at 2011/09/15 12:22:12 -0700

IMO, it would be better to put this code in a repo owned by the Propel organization than in the core.

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

by Richtermeister at 2011/09/15 15:33:02 -0700

Yay, great to see this, very much looking forward to using Propel again.

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

by GromNaN at 2011/09/16 01:37:53 -0700

+1 for @stof proposition.The Silex Core should stay lightweight.

Silex definitely need a site or at least a page in the doc to list all the community extensions.

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

by odino at 2011/09/16 01:39:40 -0700

Silex? :)

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

by GromNaN at 2011/09/16 01:43:20 -0700

Oups, I was looking at Silex PR and got this PR.

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

by lsmith77 at 2011/10/08 01:01:56 -0700

@willdurand we should maybe make this a topic for the next IRC meeting.

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

by willdurand at 2011/10/09 10:26:22 -0700

Agreed :)

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

by willdurand at 2011/11/03 14:18:02 -0700

Good to go ?

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

by willdurand at 2011/11/04 03:34:37 -0700

Just removed the `Query` class. /cc @Stof

Anything else?

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

by willdurand at 2011/11/05 08:45:34 -0700

@fabpot : good to merge ?

The PropelBundle has a `bridge` branch. I'm ready, I'm just waiting you merge this PR to tag the PropelBundle for Symfony 2.0, and after that I'll merge the `bridge` branch into the `master`.

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

by fabpot at 2011/11/16 22:32:42 -0800

What about renaming the directory from `Propel` to `Propel1`? That way, we will be able to have a `Propel` bridge for Propel 2.0.

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

by willdurand at 2011/11/16 23:18:56 -0800

It won't be consistent with the PropelBundle but I guess we don't have any other choice.. So I'm +1 for that.

If it's ok, I'll update this PR, just tell me.

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

by fabpot at 2011/11/17 07:09:58 -0800

yes, +1 for renaming

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

by lsmith77 at 2011/11/17 07:11:45 -0800

Why rename it to ``Propel1``? I think its enough to eventually add a ``Propel2``.

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

by willdurand at 2011/11/17 07:14:05 -0800

`Propel1` is for BC.
`Propel` will be the Propel's future :)

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

by lsmith77 at 2011/11/17 07:17:02 -0800

sounds like a bad idea .. and what happens when you come out with ``Propel3`` ?

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

by stof at 2011/11/17 07:17:31 -0800

@willdurand Maybe the bundle should renamed the same way, for consistency and to let ``PropelBundle`` for the Propel 2 one ? (but this should probably be discussed in another issue tracker)

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

by willdurand at 2011/11/17 07:30:21 -0800

That way we'll be able to handle both Propel 1 & 2 without BC break. You may want to upgrade Symfony2 but not Propel nor PropelBundle. Propel1 bridge has a limited lifetime.

@stof : the PropelBundle will be tagged and a branch will probably appear for Propel1 compatibility.

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

by stof at 2011/11/17 07:34:10 -0800

@willdurand if Symfony provides a Propel bridge using the same namespace for Propel2 and then Propel3, this means that the Sf2 update changing the bridge to use the Propel3 code will make Sf2 incompatible with Propel2 even if you have a tag for Propel2 in the PropelBundle (as you will need to downgrade Symfony to the older tag too). As long as bridges are in the main Symfony repo, they are upgraded the same time Symfony is upgraded and they can bump the requirements.

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

by willdurand at 2011/11/17 07:37:13 -0800

Yes but Propel 1 is frozen, almost dead as we won't add any new features.
Propel2 is the future and there is no plan for a Propel3 which will break BC.

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

by willdurand at 2011/11/17 07:57:05 -0800

Updated!
2011-11-19 15:01:12 +01:00
Fabien Potencier
d4f1721336 [Swiftmailer] fixed composer.json 2011-11-18 17:32:56 +01:00
Fabien Potencier
cddb706810 [Swiftmailer] fixed composer.json 2011-11-18 17:32:16 +01:00
hlecorche
78e9b2fedb [Form] Fixed textarea_widget (W3C standards) 2011-11-18 17:31:57 +01:00
Dariusz Górecki
36cebf0924 Fix infinite loop on circullar reference in form factory
When `->getName()` returns the same as `getParent()` we're going to infinite loop.
2011-11-18 14:23:22 +01:00
Fabien Potencier
3b9776aee6 merged branch rouffj/cs (PR #2671)
Commits
-------

c89d45b Fix cs

Discussion
----------

Fix cs

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

by rouffj at 2011/11/17 23:30:29 -0800

lsmith77: ok, so i revert my change only on RequestMatcher file ?
2011-11-18 12:50:14 +01:00
Fabien Potencier
5ff69e1f7c merged branch beberlei/DoctrineInfoMappingException (PR #2656)
Commits
-------

6d7e6a8 [DoctrineBundle] Enhance error reporting during mapping validation when nested exceptions occur.

Discussion
----------

Doctrine info mapping exception

Better error handling when nested exceptions occur (which is commonly possible with reflection errors).

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

by fabpot at 2011/11/16 02:10:13 -0800

It should probably be done on the 2.0 branch, no?

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

by beberlei at 2011/11/18 02:11:06 -0800

Its not necessarily a bugfix but an enhancement.
2011-11-18 12:35:14 +01:00
Joseph Rouff
c89d45ba2a Fix cs 2011-11-17 23:14:19 +01:00
Christophe Coevoet
413756c103 [BC break][SecurityBundle] Changed the way to register factories 2011-11-17 20:16:17 +01:00
Francesco Levorato
2adc36c3a9 [Security] renamed security option to erase_credentials 2011-11-17 17:27:28 +01:00
William DURAND
5e4b7cb1ba Renamed Propel Bridge: Propel => Propel1 2011-11-17 16:31:53 +01:00
pborreli
cfc7be237b [CI] travis-ci.org integration 2011-11-17 07:05:49 -08:00
Fabien Potencier
ae1e9cbedf fixed some tests broken by previous merge 2011-11-17 16:05:15 +01:00
Fabien Potencier
ec2c81bc84 merged branch stof/security_providers (PR #2454)
Commits
-------

d2195cc Fixed phpdoc and updated the changelog
9e41ff4 [SecurityBundle] Added a validation rule
b107a3f [SecurityBundle] Refactored the configuration
633f0e9 [DoctrineBundle] Moved the entity provider service to DoctrineBundle
74732dc [SecurityBundle] Added a way to extend the providers section of the config

Discussion
----------

[WIP][SecurityBundle] Added a way to extend the providers section of the config

Bug fix: no
Feature addition: yes
BC break: <del>no (for now)</del> yes
Tests pass: yes

This adds a way to extend the ``providers`` section of the security config so that other bundles can hook their stuff into it. An example is available in DoctrineBundle which is now responsible to handle the entity provider (<del>needs some cleanup as the service definition is still in SecurityBundle currently</del>). This will allow PropelBundle to provide a ``propel:`` provider for instance.

In order to keep BC with the existing configuration for the in-memory and the chain providers, I had to allow using a prototyped node instead of forcing using an array node with childrens. This introduces some issues:

- impossible to validate easily that a provider uses only one setup as prototyped node always have a default value (the empty array)
- the ``getFixableKey`` method is needed in the interface to support the XML format by pluralizing the name.

Here is my non-BC proposal for the configuration to clean this:

```yaml
security:
    providers:
        first:
            memory: # BC break here by adding a level before the users
                users:
                     joe: { password: foobar, roles: ROLE_USER }
                     john: { password: foobarbaz, roles: ROLE_USER }
        second:
            entity: # this one is BC
                class: Acme\DemoBundle\Entity\User
        third:
            id: my_custom_provider # also BC
        fourth:
            chain: # BC break by adding a level before the providers
                 providers: [first, second, third]
```

What do you think about it ? Do we need to keep the BC in the config of the bundle or no ?

Btw note that the way to register the factories used by the firewall section should be refactored using the new way to provide extension points in the extensions (as done here) instead of relying on the end user to register factories, which would probably mean a BC break anyway.

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

by lsmith77 at 2011/10/23 09:19:23 -0700

i don't think we should keep BC. the security config is complex as is .. having BC stuff in there will just make it even harder and confusing.

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

by willdurand at 2011/10/23 09:41:25 -0700

Is the security component tagged with `@api` ?

So basically, we just have to create a factory (`ModelFactory` for instance) and to register it in the `security` extension, right ? Seems quite simple to extend and much better than the hardcoded version…

Why did you call the method to pluralize a key `getFixableKey` ?

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

by beberlei at 2011/10/23 14:48:26 -0700

Changing security config will introduce risk for users. We should avoid that

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

by stof at 2011/10/23 15:34:47 -0700

@beberlei as the config is validated, it will simply give them an exception during the loading of the config if they don't update their config.

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

by stof at 2011/10/24 01:01:42 -0700

@schmittjoh @fabpot Could you give your mind about it ?

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

by stof at 2011/10/31 17:08:12 -0700

@fabpot @schmittjoh ping

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

by stof at 2011/11/11 14:08:18 -0800

I updated the PR by implementing my proposal as the latest IRC meeting agreed that we don't need to keep the BC for this change. This allows to add the validation rule now.

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

by stof at 2011/11/16 11:16:06 -0800

@fabpot ping

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

by fabpot at 2011/11/16 22:29:05 -0800

@stof: Before merging, you must also add information about how to upgrade in the CHANGELOG-2.1.md file.

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

by stof at 2011/11/17 00:01:23 -0800

@fabpot done
2011-11-17 16:00:33 +01:00
Fabien Potencier
c98c2ef5fb merged the two Locale listener hooks (this hack was needed when the Firewall was registered before the Routing; this is not needed anymore) 2011-11-17 14:22:57 +01:00
Fabien Potencier
e886d733fb merged the two Router listener hooks (this hack was needed when the Firewall was registered between those two hooks; this is not needed anymore) 2011-11-17 14:22:57 +01:00
Fabien Potencier
e3655f3a5c changed priorities for kernel.request listeners
The Firewall is now executed after the Router. This was needed to have access
to the locale and other request attributes that are set by the Router. This
change implies that all Firewall specific URLs have proper (empty) routes like
`/login_check` and `/logout`.
2011-11-17 14:22:53 +01:00
Johannes Schmitt
46e5fa5c87 fixed previous merges partially, there still seems to be a problem with the test client 2011-11-17 14:04:01 +01:00
Fabien Potencier
d29715f128 merged branch canni/fix_closure_declaration (PR #2662)
Commits
-------

264a033 Fixed uncompatible closure declaraction in FileldTypeValidatorExtensionTest

Discussion
----------

[tests]Fix closure declaration in validation groups tests

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

This is just small fix for `Closure` declaration in `FieldTypeValidatorExtensionTest`, this is not bug, but if someone will look at this declaration in test, it may lead to misunderstanding.
2011-11-17 14:03:47 +01:00
Fabien Potencier
6ae5082bbf [SecurityBundle] fixed typos in functional tests 2011-11-17 14:02:17 +01:00
Dariusz Górecki
264a033728 Fixed uncompatible closure declaraction in FileldTypeValidatorExtensionTest
This is just for keeping things clear, this Closure declaration was errorneous
and may trick users that 2 parameters are given to callable.
2011-11-17 10:03:46 +01:00
Francesco Levorato
104b697767 [Security] added configurable option security.erase_credentials_from_token 2011-11-17 09:57:17 +01:00
Fabien Potencier
43e6c36909 [FrameworkBundle] changed the session listeners to be subscribers 2011-11-17 09:54:24 +01:00
Christophe Coevoet
d2195cc3d1 Fixed phpdoc and updated the changelog 2011-11-17 08:59:41 +01:00
Fabien Potencier
62fb019c62 added event priorities in the profiler 2011-11-17 08:26:11 +01:00
Fabien Potencier
be193cceec updated CHANGELOG for 2.1 2011-11-17 07:47:06 +01:00
Fabien Potencier
1ae3682bb9 merged branch snc/login-referer (PR #2518)
Commits
-------

f9a65ba Redirect to default_target_path if use_referer is true and the referer is the login_path.

Discussion
----------

Login redirect

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

Redirect to default_target_path if use_referer is true and the referer is the login_path.

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

by Seldaek at 2011/10/30 10:52:38 -0700

👍

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

by stealth35 at 2011/10/30 11:04:16 -0700

@snc BC break ?

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

by snc at 2011/10/30 12:11:39 -0700

Well I'm sure it is never intended by a developer to be redirected to the login page after logging in but it could be possible that the controller which displays the login form handles this case, so my change would break it.
2011-11-17 07:41:20 +01:00
Fabien Potencier
12299c4de9 merged branch kriswallsmith/form/checkbox-view (PR #2661)
Commits
-------

79ae3fc [Form] fixed radio and checkbox when data is not bool

Discussion
----------

[Form] fixed checkbox view

The checkbox view was being built based on app data, not client data. This fixes it.

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

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

by fabpot at 2011/11/16 13:31:09 -0800

`RadioType` suffers from the same problem, no?

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

by kriswallsmith at 2011/11/16 13:32:50 -0800

Yeah, I'll fix that too.

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

by kriswallsmith at 2011/11/16 13:43:29 -0800

Updated to include `RadioType`.
2011-11-17 07:05:47 +01:00
Fabien Potencier
d2d4e716ec merged branch drak/vendors (PR #2652)
Commits
-------

86a8b9f Allow vendors checkout transport method to be overridden manually.

Discussion
----------

Allow vendors checkout transport method to be overridden manually.

In one particular environment I cannot checkout using vendors.php using the default http:// transport methods, but only git://

This patch gives complete freedom to override the default.

Side note: http:// as a transport method at github is deprecated as all http:// urls redirect to https://

My motivation for this patch is to allow continuous integration (previous phing patch closed which included this required change) since multiple regular checkouts to github via http protocol get blocked more but git based protocol transport don't.  Without this, vendors.php may not always work and it's required to get the dependencies in order to be able to run the unit tests.

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

by stealth35 at 2011/11/15 06:14:32 -0800

If `http` is deprecated why you put this in default ?

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

by drak at 2011/11/15 06:26:17 -0800

Since the current list of checkouts is using `http`, I just left it.  I try to keep topic branches laser focused so it's clear what the change was about.  If you would like, I can change it because it actually makes sense.  By the way, I double checked with `curl -I http://github.com/symfony/symfony.git` and the only response is a redirect to `https`.

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

by drak at 2011/11/15 18:40:16 -0800

Reopening on `master`.

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

by drak at 2011/11/15 21:32:09 -0800

Ok I've rebased this branch and force updated the branch so it's against 2.0 and has the changes discussed.
2011-11-17 07:04:39 +01:00
Fabien Potencier
8fa8d964a9 merged branch meonkeys/2.0 (PR #2654)
Commits
-------

4fbcc20 UPDATE.md: trivial markdown syntax fix

Discussion
----------

UPDATE.md: trivial markdown syntax fix

Sorry if this is so trivial it's annoying. I just fix 'em as I find 'em, and I keep commits small.
2011-11-17 07:02:48 +01:00
Fabien Potencier
92474cf912 fixed Swiftmailer bridge composer.json 2011-11-17 07:01:49 +01:00
Fabien Potencier
bd708247f0 merged 2.0 2011-11-17 07:00:22 +01:00
Fabien Potencier
d1ae6c7cb6 bumped Symfony version in composer.json files to 2.0.7 2011-11-17 06:58:47 +01:00
Fabien Potencier
3ef8079b50 bumped Symfony version to 2.0.7-DEV 2011-11-17 06:58:18 +01:00
Kris Wallsmith
79ae3fced9 [Form] fixed radio and checkbox when data is not bool 2011-11-16 13:39:36 -08:00
Fabien Potencier
b55a43813e updated VERSION for 2.0.6 2011-11-16 20:35:49 +01:00
Fabien Potencier
021601771d update CONTRIBUTORS for 2.0.6 2011-11-16 20:35:23 +01:00
Fabien Potencier
3b686150d8 updated CHANGELOG for 2.0.6 2011-11-16 20:34:42 +01:00
Francesco Levorato
ede55d2abe [Security] added configuration parameter for AuthorizationManagerProvider 2011-11-16 11:51:44 +01:00
Benjamin Eberlei
6d7e6a87a8 [DoctrineBundle] Enhance error reporting during mapping validation when nested exceptions occur. 2011-11-16 10:59:58 +01:00
Drak
86a8b9f567 Allow vendors checkout transport method to be overridden manually. 2011-11-16 11:09:17 +05:45
Adam Monsen
4fbcc202f6 UPDATE.md: trivial markdown syntax fix 2011-11-15 10:19:29 -08:00
Fabien Potencier
7af5f598d9 merged branch tacker/2.0 (PR #2641)
Commits
-------

8399574 Fixes a small php doc issue of Symfony\Component\Console\Command\Command::setDefinition()

Discussion
----------

Fixes a small php doc issue of Symfony\Component\Console\Command\Command::setDefinition()

Have setDefinition() accept InputDefinition instead of Definition.
2011-11-15 07:59:56 +01:00
Fabien Potencier
2978c28ce5 merged branch stof/db_tests (PR #2644)
Commits
-------

58c2276 Skipped tests when PDO is not available

Discussion
----------

Skipped tests when PDO is not available

Some tests are failing with an exception when PDO SQLite is not available. This skips them instead.
2011-11-15 07:59:42 +01:00
Fabien Potencier
262bf54d51 merged branch drak/doctrinebundles_tests (PR #2650)
Commits
-------

f83ef1e [DoctrineBundle] Fix tests - incorrect class names (copy paste error most probably)

Discussion
----------

[DoctrineBundle] Fix tests - incorrect class names

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

Some classes are incorrectly named resulting in failed tests for DoctrineBundle, looks like a copy paste error.
2011-11-15 07:57:44 +01:00
Fabien Potencier
a765c0a7d6 merged branch jdreesen/trans-formatting-fix (PR #2648)
Commits
-------

470f872 [FrameworkBundle] fixed formatting of farsi translation file

Discussion
----------

[FrameworkBundle] fixed formatting of farsi translation file

It now matches the other languages translation files.
2011-11-15 07:57:06 +01:00
Fabien Potencier
40fb7ae7a2 merged branch jdreesen/typo-fix-1 (PR #2647)
Commits
-------

67d91f0 fixed typo in exception message

Discussion
----------

Fixed typo in exception message

Fixed a small typo in the exception message which was added in d67fbe9e
2011-11-15 07:56:41 +01:00
Fabien Potencier
29018a0269 merged branch jdreesen/trans-update-3 (PR #2646)
Commits
-------

5e57854 [FrameworkBundle] Updated German validator translation

Discussion
----------

[FrameworkBundle] Updated German validator translation
2011-11-15 07:56:03 +01:00
Drak
f83ef1ec4a [DoctrineBundle] Fix tests - incorrect class names (copy paste error most probably) 2011-11-15 07:41:36 +05:45
jdreesen
5e57854db2 [FrameworkBundle] Updated German validator translation 2011-11-14 20:48:14 +01:00