Commit Graph

6736 Commits

Author SHA1 Message Date
Fabien Potencier
78346ae43b merged branch elnur/entities-to-array-transformer (PR #2053)
Commits
-------

6bd1749 Fixed a bug when multiple expanded choices would render unchecked because of the Form Framework's strict type checking.

Discussion
----------

[DoctrineBridge] Entities to array transformer

Fixed a bug when multiple expanded choices would render unchecked because of the Form Framework's strict type checking.

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

by fabpot at 2011/08/31 09:01:47 -0700

Looks good to me. Can you squash your commits before I merge? Thanks.
2011-09-01 11:00:54 +02:00
Fabien Potencier
db535caf50 merged branch simpleit/2.0 (PR #2074)
Commits
-------

0224a34 Fixes typo on ACL Doctrine cache.

Discussion
----------

[2.0] Impossible to use ACL provider cache

Using ACL provider cache is impossible. It's due to a typo in the configuration file (an undescore in place of a dot). My PR fixes this. Maybe add some tests to validate the ACL cache feature?
2011-09-01 10:57:49 +02:00
Vincent
0224a34bb1 Fixes typo on ACL Doctrine cache. 2011-09-01 11:35:36 +03:00
Elnur Abdurrakhimov
6bd1749553 Fixed a bug when multiple expanded choices would render unchecked because of the Form Framework's strict type checking. 2011-08-31 20:27:38 +04:00
Fabien Potencier
326dccc0a5 merged branch real-chocopanda/fix-sqlite-profiler (PR #2070)
Commits
-------

f448029 [HttpKernel] Tweaked SQLite to speed up SqliteProfilerStorage

Discussion
----------

[HttpKernel] Tweaked SQLite to speed up SqliteProfilerStorage

See: http://stackoverflow.com/questions/6108602/avoiding-locked-sqlite-database-timeouts-with-php-pdo

This is the PR rebased for symfony/2.0 (the old PR was #1864)

---
Hi,

Here is a PR as discussed in issue #1856.
It solves a "fatal error" in the `SqliteProfilerStorage`.
I tested it all day long for real and it works fine.

Regards,
William
2011-08-31 15:16:58 +02:00
William DURAND
f448029061 [HttpKernel] Tweaked SQLite to speed up SqliteProfilerStorage
See: http://stackoverflow.com/questions/6108602/avoiding-locked-sqlite-database-timeouts-with-php-pdo
2011-08-31 13:29:56 +02:00
Fabien Potencier
9a8f9f7329 merged branch brikou/uniqueEntity_message (PR #2065)
Commits
-------

eb8f3cb added uniqueEntity message translation (fr)
df9f223 added missing french translations
f4c133e removed trailing dot to make it consistent with other validator messages

Discussion
----------

[Translation] Unique Entity message

I've added the translation of uniqueEntity validation message, I've used ``trans-unit id="41"`` which seems to be unused
2011-08-31 12:40:38 +02:00
Fabien Potencier
1de7ebf91b merged branch real-chocopanda/fix-hasListeners-ContainerAwareEventDispatcher (PR #2066)
Commits
-------

2cfa22c Fix Method ContainerAwareEventDispatcher::hasListeners

Discussion
----------

Fix Method ContainerAwareEventDispatcher::hasListeners

Related to #1903.

This is the squashed on 2.0 branch version of the PR #1903

---
Fix Method ContainerAwareEventDispatcher::hasListeners

Fix the fact that Method ContainerAwareEventDispatcher::hasListeners return false if my service is not lazyLoaded

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

by cedriclombardot at 2011/08/31 01:40:45 -0700

@stof it's fixed
2011-08-31 12:33:30 +02:00
clombardot
2cfa22ca54 Fix Method ContainerAwareEventDispatcher::hasListeners 2011-08-31 10:39:33 +02:00
Brikou CARRE
eb8f3cb723 added uniqueEntity message translation (fr) 2011-08-31 09:16:30 +02:00
Brikou CARRE
df9f223b43 added missing french translations 2011-08-31 09:12:51 +02:00
Brikou CARRE
f4c133efbb removed trailing dot to make it consistent with other validator messages 2011-08-31 08:56:13 +02:00
Fabien Potencier
a6670c214a [Routing] fixed a caching issue when annotations are used on a base class used by more than one concrete class
Doctrine caches annotations. For methods, it uses PHP reflection and the getDeclaringClass() to create
a unique cache key. Unfortunately, if you have 2 classes that extend another one, the cache will be shared.
It's not a problem except that before this patch, the default route name was also cached (as the cache is serialized
after we changed the object). So, all other classes inherited this default route name. The fix is quite easy:
just don't change the read annotation object.
2011-08-30 21:39:58 +02:00
Fabien Potencier
946ccb6bd2 [Routing] fixed annotation loaders for abstract classes, added more unit tests 2011-08-30 20:57:43 +02:00
Fabien Potencier
6a81f07862 [Routing] made a small speed optimization 2011-08-30 20:53:32 +02:00
Fabien Potencier
8497f5f7fc merged branch aggressivex/translation-pcre-patch (PR #2047)
Commits
-------

723cb71 [Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization

Discussion
----------

[Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization

[Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization

Corrected branches: From 2.0 to 2.0

more info: https://github.com/symfony/symfony/pull/2038
2011-08-28 22:32:31 +02:00
Luis Muñoz
723cb71390 [Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization 2011-08-28 22:05:29 +02:00
Fabien Potencier
07bdb8ac84 merged branch stloyd/patch-3 (PR #2011)
Commits
-------

020fa51 [RedirectResponse] Added missing `doctype` and `title` tag

Discussion
----------

[RedirectResponse] Added missing `doctype` and `title` tag
2011-08-26 18:08:50 +02:00
Fabien Potencier
62bbad41b7 merged branch jalliot/assets-install-ignore-vcs (PR #2026)
Commits
-------

24bacdc Ignore VCS files in assets:install command (closes #2025)

Discussion
----------

Ignore VCS files in assets:install command (closes #2025)

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

by stloyd at 2011/08/25 06:10:22 -0700

`ignoreVCS` is set to `true` by default, AFAIK also `getIterator()` is not needed.

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

by jalliot at 2011/08/25 06:30:32 -0700

@stloyd I knew about ``ignoreVCS`` defaulting to ``true`` but I thought it made it clearer but you're right it's not really useful.
As for ``getIterator`` I thought the conversion couldn't be made automatically on a method call like here but apparently it works so I changed it.
Thanks.

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

by tiagojsag at 2011/08/25 08:41:02 -0700

This approach creates another problem: the already existing VCS files are deleted when the command is executed, which makes at least SVN throw errors.

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

by jalliot at 2011/08/25 08:50:55 -0700

@tiagojsag If you remove the call to ``remove`` on line 83, does everything work?
Because I'm not really sure we need to remove the entire dir first since ``mirror`` should be able to adapt itself.

BTW, wouldn't it be better if you didn't commit the ``web/bundles`` dir in your SVN and instead ask to call the ``assets:install`` command each time?

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

by stof at 2011/08/25 08:58:16 -0700

Great news about SVN: the incoming 1.7 version stops adding a ``.svn`` folder in every directory but uses a single one at the root of the project (like git does for instance), solving this sort of issues about copying files :)

@tiagojsag this command has always removed the old asset folders before copying the new ones, and there is not real mean to do otherwise by keeping things simple. You could consider ignoring the ``vendor/bundles`` folder in the SVN and running the command when doing checkout (thus allowing devs to use symlinks if they want)

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

by tiagojsag at 2011/08/25 09:01:39 -0700

yes, that was the solution I was using before submitting this bug report. I also agree that it's the simplest and fastest way to address this, provided that docs get updated, so that no one spends their time trying to figure out why files are not synced with their svn repo.

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

by jalliot at 2011/08/25 09:03:11 -0700

@stof That's really great to hear!
But still this PR should be merged to avoid legacy files from current versions of SVN or other VCS.

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

by stof at 2011/08/25 09:04:31 -0700

@jalliot sure. My comment was mainly about the opposite issue raised by @tiagojsag
2011-08-26 17:41:12 +02:00
Fabien Potencier
ff7f654175 merged branch jalliot/simplified-copy (PR #2030)
Commits
-------

9a05db0 Simplified Filesystem->copy()
707e8aa merged 2.0 branch
98966c8 updated VERSION and deps

Discussion
----------

Simplified Filesystem->copy()
2011-08-26 12:06:03 +02:00
Daniel Holmes
777f876b90 [HttpFoundation] Added test that exposes error in session saving 2011-08-26 20:00:57 +10:00
Jordan Alliot
9a05db0e7e Simplified Filesystem->copy() 2011-08-26 09:37:17 +01:00
Jordan Alliot
24bacdcd3b Ignore VCS files in assets:install command (closes #2025) 2011-08-26 09:36:52 +01:00
Fabien Potencier
707e8aaecb merged 2.0 branch 2011-08-26 10:01:25 +02:00
Fabien Potencier
98966c8779 updated VERSION and deps 2011-08-26 09:59:43 +02:00
Fabien Potencier
bb8a3f1ae5 updated vendors 2011-08-26 09:42:19 +02:00
Fabien Potencier
9f40ba6c2a bumped Symfony version to 2.0.2-DEV 2011-08-26 09:34:52 +02:00
Fabien Potencier
7cb402d806 updated VENDORS for 2.0.1 2011-08-26 08:46:48 +02:00
Fabien Potencier
7275c88777 updated CHANGELOG for 2.0.1 2011-08-26 08:46:45 +02:00
Fabien Potencier
f9ce68fad4 update VERSION for 2.0.1 2011-08-26 08:45:13 +02:00
Fabien Potencier
8f50592f31 [HttpFoundation] changed \LogicException to \InvalidArgumentException 2011-08-26 08:45:12 +02:00
Fabien Potencier
194d2a7219 update CONTRIBUTORS for 2.0.1 2011-08-26 08:45:12 +02:00
Fabien Potencier
1c7694ff30 [HttpFoundation] added a missing exception 2011-08-25 10:38:08 +02:00
Fabien Potencier
a79f22544e [HttpKernel] added a test for uploading a file via an array instead of an UploadedFile instance 2011-08-25 10:07:28 +02:00
Fabien Potencier
9112bed669 merged branch stloyd/patch-4 (PR #2018)
Commits
-------

542cfd6 [ServerBag] Skip unnecessary loop in `getHeaders()`

Discussion
----------

[ServerBag] Skip unnecessary loop in `getHeaders()`
2011-08-25 09:45:41 +02:00
Fabien Potencier
7f2c4ab557 merged branch jmikola/ContainerAwareEventDispatcher-key-conflict (PR #2022)
Commits
-------

84c1719 [FrameworkBundle] Avoid listener key conflicts in ContainerAwareEventDispatcher

Discussion
----------

[FrameworkBundle] Avoid listener key conflicts in ContainerAwareEventDispatcher

Since the key was previously concatenating service ID and method without a separator, it's possible that two different listeners could conflict (e.g. service/method pairs: foo/bar and fo/obar).
2011-08-25 09:45:33 +02:00
Jeremy Mikola
84c1719335 [FrameworkBundle] Avoid listener key conflicts in ContainerAwareEventDispatcher
Since the key was previously concatenating service ID and method without a separator, it's possible that two different listeners could conflict (e.g. service/method pairs: foo/bar and fo/obar).
2011-08-24 15:05:22 -04:00
Joseph Bielawski
542cfd62df [ServerBag] Skip unnecessary loop in getHeaders() 2011-08-24 21:56:02 +03:00
Fabien Potencier
536538fb83 [DoctrineBundle] removed an unused and confusing parameter (the connection class can be changed via the wrapper_class setting of a connection) 2011-08-24 18:08:06 +02:00
Fabien Potencier
0fc0f99b9d fixed CS 2011-08-24 17:06:56 +02:00
Fabien Potencier
8cdedd13c5 merged branch Seldaek/toolbar_debugging (PR #2019)
Commits
-------

89f477e [WebProfilerBundle] Throw exception if a collector template isn't found
6ca72cf [WebProfilerBundle] Allow .html.twig in collector template names

Discussion
----------

WDT debugging

While implementing collectors I did a mistake in the template name and it never told me, so I was left wondering why my stuff didn't show up. Not so nice IMO. Also the first commit is to allow template names to be specified fully. I don't see why this shouldn't be allowed, since it is the way you specify templates everywhere else.
2011-08-24 17:06:22 +02:00
Fabien Potencier
d7f078929c [FrameworkBundle] fixed duplicated RequestContext instances 2011-08-24 15:10:47 +02:00
Jordi Boggiano
89f477eb0a [WebProfilerBundle] Throw exception if a collector template isn't found 2011-08-24 13:53:49 +02:00
Jordi Boggiano
6ca72cf9ac [WebProfilerBundle] Allow .html.twig in collector template names 2011-08-24 10:37:03 +02:00
Fabien Potencier
755e0d4a37 tweaked CHANGELOG 2011-08-24 09:12:04 +02:00
Fabien Potencier
0805c9c6da added the 2.0.x CHANGELOG file 2011-08-24 09:10:15 +02:00
Joseph Bielawski
020fa51c54 [RedirectResponse] Added missing doctype and title tag 2011-08-24 05:31:42 +03:00
Daniel Holmes
e294211343 [DomCrawler] Removed unused document property in Form 2011-08-24 13:45:37 +10:00
Fabien Potencier
9231f1d1dd merged branch jmikola/remove-subscriber-with-priorities (PR #2014)
Commits
-------

39fabab [EventDispatcher] Fix removeSubscriber() to work with priority syntax

Discussion
----------

[EventDispatcher] Fix removeSubscriber() to work with priority syntax

Previously only addSubscriber() was being tested with priority syntax. This adds a unit test for removeSubscriber() and fixes a bug that would have caused it to fail.
2011-08-23 22:51:37 +02:00
Jeremy Mikola
39fabab013 [EventDispatcher] Fix removeSubscriber() to work with priority syntax 2011-08-23 16:41:08 -04:00