Commit Graph

6719 Commits

Author SHA1 Message Date
Fabien Potencier
78c1d75c36 merged branch excelwebzone/2.0 (PR #2170)
Commits
-------

c05ef6c  Added trans-unit "41" (hebrew translation)

Discussion
----------

Added trans-unit "41" (hebrew translation)
2011-09-14 07:47:27 +02:00
excelwebzone
c05ef6ce99 Added trans-unit "41" (hebrew translation) 2011-09-13 18:47:49 -07:00
Fabien Potencier
27dcc187f6 bumped versions of Swiftmailer 2011-09-13 17:09:48 +02:00
Fabien Potencier
c6663601ab merged branch snc/chmod-fixes-2.0 (PR #2143)
Commits
-------

3e2f1a4 Removed executable bits from all php files

Discussion
----------

[2.0] Removed executable bits from all PHP files
2011-09-09 18:01:40 +02:00
H. Westphal
3e2f1a4b13 Removed executable bits from all php files 2011-09-09 15:16:17 +02:00
Fabien Potencier
17f115104d merged branch chx/2.0 (PR #2141)
Commits
-------

24b80ae Removed a leftover use.

Discussion
----------

Removed a leftover use.

lsmith told me to put in this request instead.
2011-09-09 14:50:48 +02:00
Jordan Alliot
95dc7e104c Fixed fourth argument of Filesystem->mirror() 2011-09-09 11:09:47 +01:00
Karoly Negyesi
24b80aedf3 Removed a leftover use. 2011-09-09 02:13:17 -07:00
Fabien Potencier
ca5141ed7b merged branch jalliot/fix-dup-request (PR #2134)
Commits
-------

ae52303 [HttpFoundation] Fixed duplicate of request

Discussion
----------

[HttpFoundation] Fixed duplicate of request

closes #2133
2011-09-09 11:09:40 +02:00
Jordan Alliot
ae5230344c [HttpFoundation] Fixed duplicate of request
closes #2133
2011-09-08 12:28:21 +01:00
Fabien Potencier
11023bec6d merged branch micheleorselli/2.0 (PR #2118)
Commits
-------

a7f0aab fix italian translation for branch 2.0

Discussion
----------

fix italian validators translation for 2.0
2011-09-07 07:37:10 +02:00
Michele Orselli
a7f0aabb02 fix italian translation for branch 2.0 2011-09-07 00:00:09 +02:00
Fabien Potencier
c5541dc206 merged branch stewe/2.0 (PR #2109)
Commits
-------

cd40ed4 Added missing method to HTTP Digest entry point

Discussion
----------

Added missing method to HTTP Digest entry point

Re-submitting to 2.0 branch as it is a bugfix, thanks!
2011-09-06 13:55:49 +02:00
Stefano Sala
cd40ed43a3 Added missing method to HTTP Digest entry point 2011-09-06 13:32:33 +02:00
Fabien Potencier
e0a3605e63 merged branch stealth35/trans_few_op (PR #2093)
Commits
-------

8d50c16 few optimisations for XliffFileLoader and XmlFileLoader

Discussion
----------

few optimisations for XliffFileLoader and XmlFileLoader

 - file_put_contents + file_get_contents -> copy
 - use stripos insteed preg_match
 - removed useless `$tmpfiles` in XliffFileLoader
2011-09-06 07:38:29 +02:00
Fabien Potencier
63db2357c5 merged branch stealth35/asset_com_v2 (PR #2094)
Commits
-------

3a7e038 [FrameworkBundle] sanitize target arg in asset:install command

Discussion
----------

[FrameworkBundle] sanitize target arg in asset:install command

`php app/console assets:install web/`

(removed tailing /)

 before
`Installing assets for Symfony\Bundle\FrameworkBundle into web//bundles/framework`
after
`Installing assets for Symfony\Bundle\FrameworkBundle into web/bundles/framework`
2011-09-06 07:37:26 +02:00
Fabien Potencier
a3ff291edc merged branch stloyd/pl_translation_sync (PR #2098)
Commits
-------

83254b8 [Validator] Sync polish translation

Discussion
----------

[Validator] Sync polish translation
2011-09-06 07:31:46 +02:00
stloyd
83254b8b37 [Validator] Sync polish translation 2011-09-05 18:55:50 +02:00
stealth35
3a7e038fb9 [FrameworkBundle] sanitize target arg in asset:install command 2011-09-05 15:17:10 +02:00
stealth35
8d50c162b9 few optimisations for XliffFileLoader and XmlFileLoader 2011-09-05 15:06:29 +02:00
Fabien Potencier
41b25a404a merged branch yethee/ru_translations (PR #2090)
Commits
-------

515fe27 [FrameworkBundle] Sync the Russian translations

Discussion
----------

[FrameworkBundle] Sync the Russian translations
2011-09-05 12:20:04 +02:00
Deni
515fe27ce8 [FrameworkBundle] Sync the Russian translations 2011-09-05 13:58:36 +04:00
Fabien Potencier
747dc3f73b merged branch aboks/dutch_validator_translations (PR #2086)
Commits
-------

8cf7990 [FrameworkBundle] Added Dutch validator translation for trans-unit 41

Discussion
----------

[FrameworkBundle] Added Dutch validator translation for trans-unit 41

This message was added in #2065.
2011-09-05 09:28:08 +02:00
Fabien Potencier
2cdbec0f9e merged branch jdreesen/trans-update-1 (PR #2084)
Commits
-------

df3bde4 [FrameworkBundle] Updated German validator translation

Discussion
----------

[FrameworkBundle] Updated German validator translation

Updated german translation to include trans-id 41, which was added in #2065.
2011-09-05 09:28:00 +02:00
Arnout Boks
8cf79903e5 [FrameworkBundle] Added Dutch validator translation for trans-unit 41 2011-09-05 09:16:00 +02:00
jdreesen
df3bde472e [FrameworkBundle] Updated German validator translation 2011-09-04 16:04:35 +02:00
Fabien Potencier
161fd1c47e merged branch stof/validator_translations (PR #2083)
Commits
-------

ca6299d [FrameworkBundle] Fixed a typo in the translation file per @PeymanHR

Discussion
----------

[FrameworkBundle] Fixed a typo in the translation file per @PeymanHR

Closes #2082
2011-09-04 11:10:29 +02:00
Christophe Coevoet
ca6299dc6b [FrameworkBundle] Fixed a typo in the translation file per @PeymanHR
Closes #2082
2011-09-04 10:54:39 +02:00
Fabien Potencier
6677dabda5 merged branch jmikola/entity-validator (PR #2076)
Commits
-------

d19f1d7 [Doctrine] Fix UniqueEntityValidator reporting a false positive by ignoring multiple query results

Discussion
----------

[Doctrine] Fix UniqueEntityValidator reporting a false positive by ignoring multiple query results

An entity should only be considered unique if its search criteria returns no matches or a single, identical entity. Multiple results indicates that conflicting entities exist.

Note: the DoctrineMongoDBBundle's unique validator checks identifier values if the object strict-equality check is false. This may be a worthwhile improvement, as it would prevent reporting a validation error for an enttiy which is going to overwrite its conflicting counter-part in the database.

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

by jmikola at 2011/09/01 14:23:27 -0700

This is the Doctrine bridge equivalent for my fix to DoctrineMongoDBBundle: https://github.com/symfony/DoctrineMongoDBBundle/pull/42

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

by fabpot at 2011/09/02 00:13:52 -0700

As this is a bug fix, can you base your PR on the symfony/2.0 branch? Thanks.
2011-09-02 09:43:19 +02:00
Fabien Potencier
adb7291b67 Merge branch 'EvanK-patch-1' into 2.0
* EvanK-patch-1:
  Per the [documentation][1], the `NotBlank` constraint should be using the `empty` language construct, otherwise it will not trigger on, for example, a boolean false from an unchecked checkbox field.
2011-09-02 09:39:11 +02:00
Evan Kaufman
639513a67a Per the [documentation][1], the NotBlank constraint should be using the empty language construct, otherwise it will not trigger on, for example, a boolean false from an unchecked checkbox field.
[1]: http://symfony.com/doc/2.0/reference/constraints/NotBlank.html
2011-09-02 09:37:48 +02:00
Jeremy Mikola
d19f1d7621 [Doctrine] Fix UniqueEntityValidator reporting a false positive by ignoring multiple query results
An entity should only be considered unique if its search criteria returns no matches or a single, identical entity. Multiple results indicates that conflicting entities exist.
2011-09-01 17:20:30 -04:00
Fabien Potencier
bddcb4cc11 fixed a unit test 2011-09-01 11:05:39 +02:00
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