Commit Graph

6757 Commits

Author SHA1 Message Date
Fabien Potencier
b5783dffe1 updated CHANGELOG for 2.1 2011-09-14 09:06:29 +02:00
Fabien Potencier
fabec37edc [FrameworkBundle] added tests for DIC parameters replacements in route defaults 2011-09-14 09:06:00 +02:00
Fabien Potencier
400159de4f [FrameworkBundle] made DIC placeholders replacement in route defaults only when the parameter exists in the container 2011-09-14 08:49:02 +02:00
Fabien Potencier
53b4cd8c9c [FrameworkBundle] made code more robust 2011-09-14 08:48:23 +02:00
Fabien Potencier
92d35c81c0 [FrameworkBundle] fixed CS and phpdoc 2011-09-14 08:47:38 +02:00
Fabien Potencier
8faf27864d merged branch mvrhov/route_dic_params (PR #1934)
Commits
-------

13b77bf Treat defaults enclosed between % as parameters from dic This allows as to define default like this

Discussion
----------

[Route] Treat defaults enclosed between % as parameters from dic

This allows as to define default like this

foo:
    pattern:  /{_locale}/login
    defaults:
        _controller: my_login_controller:loginAction
        _locale: %session.default_locale%

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

by lsmith77 at 2011/08/10 07:00:14 -0700

this is a bit of a BC break .. but in general it does address a huge need for being able to make routes more easily configurable.

also didnt check this, but we should make sure that this doesnt open any security issues.

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

by maoueh at 2011/08/10 08:31:18 -0700

Hi,

There is an issue pending for the same feature here #1718. Maybe this one could be linked to #1718 somehow.

Regards,
Matt

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

by fabpot at 2011/09/12 23:51:53 -0700

@lsmith77: Why is it a BC break?

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

by lsmith77 at 2011/09/13 00:04:46 -0700

well its only a BC break on the off chance that someone puts stuff enclosed in % in the defaults atm and does not expect them to be interpreted as parameters. not very likely. but at the least we might want to first check if the parameter exists before replacing it.

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

by mvrhov at 2011/09/13 23:28:48 -0700

So, do I check if parameter exists inside dic and throw a notice if not, or do I just fix the comment?
2011-09-14 08:42:27 +02:00
Fabien Potencier
73c8d2ba74 [Form] fixed error bubbling for Date and Time types when rendering as multiple choices (closes #2062) 2011-09-14 08:30:47 +02:00
Fabien Potencier
ea930e5255 merged branch excelwebzone/hebrew_translations (PR #2164)
Commits
-------

ce056d6  Updated hebrew translation for validators

Discussion
----------

Updated hebrew translation for validators

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

by stof at 2011/09/13 08:33:48 -0700

Could you add the trans-unit 41 in the 2.0 branch ?

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

by excelwebzone at 2011/09/13 18:49:33 -0700

just added https://github.com/symfony/symfony/pull/2170
2011-09-14 07:47:39 +02:00
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
cfc202be93 bumped versions of Twig and Swiftmailer 2011-09-13 17:09:09 +02:00
excelwebzone
ce056d6b02 Updated hebrew translation for validators 2011-09-13 07:21:52 -07:00
Fabien Potencier
b3141b4b46 merged branch stealth35/typo_rb (PR #2161)
Commits
-------

1fc01fc [Translation] typo in ResourceBundleLoader

Discussion
----------

[Translation] typo in ResourceBundleLoader

e6e5146ccb (L1R33)
2011-09-13 13:30:23 +02:00
stealth35
1fc01fcd1f [Translation] typo in ResourceBundleLoader 2011-09-13 13:21:32 +02:00
Fabien Potencier
b016b04967 updated CHANGELOG for 2.1 2011-09-13 08:49:25 +02:00
Fabien Potencier
affb0cbca2 merged branch stealth35/trans_rb (PR #2136)
Commits
-------

e6e5146 [Translation] now support ResourceBundle

Discussion
----------

[2.1][Translation] now support ResourceBundle

support `.res` and `.dat` bundles

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

by marijn at 2011/09/08 08:59:39 -0700

There are a few references to `ressource`, I guess that is a typo...

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

by stealth35 at 2011/09/08 09:13:32 -0700

@marijn thank, done

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

by fabpot at 2011/09/11 00:42:37 -0700

Is it possible to add a dumper like we have for all other loaders?

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

by stof at 2011/09/11 03:46:39 -0700

Btw, you need to rebase your branch as it conflicts with master

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

by stealth35 at 2011/09/11 04:04:23 -0700

@fabpot it's more difficult (or the easy way it's to use `exec` with `derb`), I can create the text resources
@stof oki

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

by fabpot at 2011/09/11 23:52:19 -0700

@stealth35: Can you remove the `@api` tags? We will review what is included into the public API later on. thanks.

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

by stealth35 at 2011/09/12 04:18:07 -0700

@fabpot done
2011-09-13 08:49:05 +02:00
Fabien Potencier
26a65d61b1 updated CHANGELOG for 2.1 2011-09-13 08:48:32 +02:00
Fabien Potencier
51403530b9 merged branch stealth35/http_found_auth (PR #2029)
Commits
-------

aecfd0a [HttpFoundation] Support user and password in url

Discussion
----------

[HttpFoundation] Support user and password in url

Allow `http://user:password@test.com` for url request and `basic auth`

Added Methods for `Request`
  - `getUser`
  - `getPassword `

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

by stealth35 at 2011/08/26 07:52:57 -0700

@seldaek @stof thanks guys it's done

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

by stof at 2011/08/28 11:52:11 -0700

btw, you should rebase your branch on top of the upstream master branch as it conflicts

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

by stealth35 at 2011/08/28 13:15:55 -0700

@stof done

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

by stof at 2011/09/04 02:09:11 -0700

@stealth35 you made an error when rebasing: you merged the previous version of the branch instead of forcing the push, thus duplicating all commits in the PR (rebasing rewrites the history so it creates new commits). Could you clean your branch ?

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

by stealth35 at 2011/09/05 02:00:17 -0700

@stof 👍

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

by stealth35 at 2011/09/06 08:21:00 -0700

should be 2.0 ?

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

by fabpot at 2011/09/11 23:52:30 -0700

@stealth35: Can you remove the `@api` tags? We will review what is included into the public API later on. thanks.

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

by stealth35 at 2011/09/12 04:02:01 -0700

@fabpot done
2011-09-13 08:47:11 +02:00
Fabien Potencier
47b7860450 updated CHANGELOG for 2.1 2011-09-13 08:46:58 +02:00
Arnout Boks
a7b5c1c076 [Classloader] Fixed failing test on Windows 2011-09-12 13:21:31 +02:00
stealth35
e6e5146ccb [Translation] now support ResourceBundle 2011-09-12 13:17:14 +02:00
stealth35
aecfd0a891 [HttpFoundation] Support user and password in url 2011-09-12 13:01:04 +02:00
H. Westphal
beeec5eee2 Allow socket dsn (for example mongodb:///tmp/mongodb-27017.sock). 2011-09-11 13:38:37 +02:00
H. Westphal
218eaba265 Fixed storage of time value. 2011-09-11 12:26:12 +02:00
Martin Hasoň
b9b60843aa [FrameworkBundle] Updated Czech translations for image validator 2011-09-10 16:55:59 +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
18d3dfe0bf merged branch snc/chmod-fixes (PR #2130)
Commits
-------

a0a97c6 Removed executable bits from all php files

Discussion
----------

Removed executable bits from all PHP files

Some files had a file mode of 755 and this PR changes them to 644. The reason behind this is that git always thinks that those files are changed when accessing the repository via a samba share on windows (tested with PhpStorm).

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

by fabpot at 2011/09/09 05:51:30 -0700

That was on my radar too. Can you do the same for the 2.0 branch?
2011-09-09 14:51:44 +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
Fabien Potencier
b99bb1e31b merged branch michelsalib/translation-command (PR #2051)
Commits
-------

ef322f6 -- add command that extracts translation messages from templates

Discussion
----------

[2.1] Extracting translation messages from templates

As seen here #1283 and here #2045, I push the command that extract translation from templates.

There are still a lot of new things here, but it seems more manageable.

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

by stof at 2011/09/04 02:04:40 -0700

@michelsalib Could you try to refactor the code to make it more flexible by moving the creating of the file to the dumpers to support other outputs (database...) ?

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

by michelsalib at 2011/09/04 02:35:50 -0700

You are right, I shall do it tonight.

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

by michelsalib at 2011/09/04 11:53:35 -0700

I just pushed a refactoring that should allow more flexibility. Dumpers are now responsive for writing the files. This way it is now possible to implement the DumperInterface that dump to a database and add it to the TranslationWriter.
I updated the tests accordingly.

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

by fabpot at 2011/09/05 23:27:27 -0700

To be consistent with other dumpers in the framework, the dumpers extending `FileDumper` should use `FileDumper` as a suffix like in `YmlFileDumper`.

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

by fabpot at 2011/09/05 23:41:12 -0700

A general note on PHPDoc: The first line of a phpdoc ends with a dot and starts with a present verb like in  `Extracts translation messages from template files.`

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

by michelsalib at 2011/09/06 01:23:31 -0700

I fixed most of the remarks. I just need to go through the phpdoc (in a few minutes).

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

by stloyd at 2011/09/06 01:28:55 -0700

@michelsalib you should use `git rebase` (see [docs](http://symfony.com/doc/current/contributing/code/patches.html#id1)) instead of `git merge`.

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

by michelsalib at 2011/09/06 01:31:06 -0700

@stloyd sorry. I will rebase (squash) everything when I am finished.

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

by kaiwa at 2011/09/06 01:31:18 -0700

Hey, it might be a little bit late, but may i ask a not code-related question?

Is it correct that the `--force` option only means to write the output to a file instead of writing it to stdout?

If so,

1. is it semantically correct? I mean... i'm not a native english speaker, but from unix programs i'm used to interpret a `--force` option as something like "overwrite", "ignore errors" or "suppress warnings". An option which is used in case of trouble most time. Feels confusing to me to be forced ;-) to use the `--force` option for simply writing to files.

2. does it makes sense to have a default behaviour instead of requiring the user to give either `--force` or `--dump-messages`? In which cases does the user wants to dump the messages to the console? Is it only for debugging / to review the messages?

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

by michelsalib at 2011/09/06 01:33:58 -0700

@kaiwa Your concerns seems perfectly right. Initially I just wanted to mimic the `doctrine:schema:update` command. But it can be changed.
@fabpot what do you think ?

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

by michelsalib at 2011/09/06 02:01:22 -0700

@stloyd I tried to do a `git rebase` and I am quite lost. I think I messed something when merge instead of rebase. How can I clean/squash my PR properly ?

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

by stloyd at 2011/09/06 02:11:29 -0700

@michelsalib for now just work as it is ;-) When I back from work I will try to help you to rebase it properly.

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

by michelsalib at 2011/09/06 02:12:17 -0700

@stloyd Thank you !

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

by stloyd at 2011/09/06 12:39:18 -0700

@michelsalib I was trying to rebase your code and revert it this _bad_ commit (merge), but without success.

IMO best way would be making _brand new_ branch based on symfony/master, and the `git cherry-pick` ([hint](http://ariejan.net/2010/06/10/cherry-picking-specific-commits-from-another-branch)) commits you need (almost all in this PR but without this one with merge), then you will need to apply again _by hand_ changes from commit fce24c7fa2 (this clean up you have done there).

I'm sorry I can't give you more help...

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

by michelsalib at 2011/09/07 09:41:36 -0700

@stloyd I finally succeed to fix this PR. Thanks to your help! I must admit the whole thing with `cherry-pick` command was quite epic.
@fabpot Don't be sorry, I am about to fix the PHPDoc. I shall squash right after.

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

by michelsalib at 2011/09/07 10:07:20 -0700

I just squashed and did a last polish of the code. You might want to read it again before merge.

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

by fabpot at 2011/09/07 11:40:48 -0700

 ok, code looks really good now. I think the only missing thing is some more unit tests (for the extractors for instance).

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

by michelsalib at 2011/09/07 12:18:59 -0700

Thanks, I'll look into it tomorrow.

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

by michelsalib at 2011/09/08 15:13:10 -0700

Hi,
I just added unit tests for both extractors (php and yaml).
Concerning the yaml extractor, the test is quite tricky because I need to mock the twig environment while returning a twig tree that contain a trans block and a trans filter. But it work fine with as little side effects as possible. Also I am not sure that the test should be in the TwigBundle.
IMO, the PR seems ready.

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

by stof at 2011/09/08 15:34:41 -0700

As the extractor is in bridge, the tests should be in the folder containing the tests for the bridge in tests/

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

by michelsalib at 2011/09/08 15:41:45 -0700

Thanks @stof, it is now fixed.

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

by michelsalib at 2011/09/09 00:48:47 -0700

thanks @stloyd, it is fixed now.

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

by michelsalib at 2011/09/09 01:25:24 -0700

Fixed again ;)
2011-09-09 11:17:04 +02:00
Karoly Negyesi
24b80aedf3 Removed a leftover use. 2011-09-09 02:13:17 -07:00
Fabien Potencier
5dcfeb2854 merged branch jalliot/check-disposition (PR #2132)
Commits
-------

0bc2a6d [HttpFoundation] Added check for disposition value

Discussion
----------

[HttpFoundation] Added check for disposition value
2011-09-09 11:10:51 +02: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
Michel Salib
ef322f680d -- add command that extracts translation messages from templates
-- add missing files

-- tweak translation command files

-- dumpers are now responsive for writting the files

-- moved the twig extractor the bridge

-- clear temp files after unit tests
-- check the presence of dumper in translation writer

-- General cleaning of the code

-- clean phpDoc

-- fix PHPDoc

-- fixing class name in configuration

-- add unit tests for extractors (php and twig)

-- moved test to correct location

-- polish the code

-- polish the code
2011-09-09 10:23:54 +02:00
Jordan Alliot
ae5230344c [HttpFoundation] Fixed duplicate of request
closes #2133
2011-09-08 12:28:21 +01:00
Jordan Alliot
0bc2a6d67b [HttpFoundation] Added check for disposition value 2011-09-08 10:20:37 +01:00
H. Westphal
a0a97c6a22 Removed executable bits from all php files 2011-09-07 22:51:20 +02:00
H. Westphal
85c380647c Added support for sorting by time like other profiler storage implementations. 2011-09-07 22:38:22 +02:00
H. Westphal
73692c62cf Fixed MongoDbProfilerStorage::find() when passing empty parameters. 2011-09-07 22:32:54 +02:00
H. Westphal
4cd2dec01d Use token as identifier to make usage of the automatically created index. 2011-09-07 20:49:37 +02:00
Fabien Potencier
49e1eee2a1 merged branch craue/patch-12 (PR #2116)
Commits
-------

b7c2a2e [FrameworkBundle] fixed typo in German validator translation

Discussion
----------

[FrameworkBundle] fixed typo in German validator translation
2011-09-07 07:40:28 +02:00
Fabien Potencier
addfbd4ec4 merged branch micheleorselli/update_it_validator_translation (PR #2117)
Commits
-------

8198078 updated italian translation for validators

Discussion
----------

updated italian translation in validators.it.xliff

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

by stof at 2011/09/06 14:06:39 -0700

could you do the update up-to the id 41 against the 2.0 branch (as they should be there) ? Only 42 and up are new for 2.1

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

by stloyd at 2011/09/06 14:12:28 -0700

@micheleorselli, as @stof mentioned you should make two PRs. One against __2.0__ to fix translation issues, and second against __master__ to add those new ones, available only in __2.1+__

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

by micheleorselli at 2011/09/06 15:04:17 -0700

@stof @stloyd: translation for 2.0 branch are updated in PR #2118
2011-09-07 07:38:40 +02:00
Fabien Potencier
f15cbc6014 Merge branch '2.0'
* 2.0:
  fix italian translation for branch 2.0
  Added missing method to HTTP Digest entry point
2011-09-07 07:38:06 +02: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
Michele Orselli
8198078d96 updated italian translation for validators 2011-09-06 22:35:40 +02:00
Christian Raue
b7c2a2e70b [FrameworkBundle] fixed typo in German validator translation 2011-09-06 22:44:30 +03:00
Fabien Potencier
89df6bbfc4 merged branch jdreesen/trans-update-2 (PR #2112)
Commits
-------

1134c1a [Validator] Fixed typo in Image constraint
428a01c Merge branch 'master' of git://github.com/symfony/symfony into trans-update-2
3843afa [FrameworkBundle] Improved German validator translation
ac54080 [FrameworkBundle] Updated German translations for image validator

Discussion
----------

Updated/improved german validator translation & fixed typos in Image constraint
2011-09-06 21:08:58 +02:00