Commit Graph

12908 Commits

Author SHA1 Message Date
Fabien Potencier
4c366252a5 merged branch stloyd/bugfix/process_phpdocs (PR #6626)
This PR was merged into the 2.1 branch.

Commits
-------

a62e04f [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`

Discussion
----------

[2.1][Process] Fix docblocks, remove `return` from `PhpProcess#start()`
2013-01-16 10:23:50 +01:00
Gordon Franke
37af92d979 add test for compiler replace alias with invalid alias 2013-01-16 09:59:03 +01:00
Fabien Potencier
f3e905c44b merged branch gimler/compiler_replace_alias_exception_pimp (PR #6757)
This PR was merged into the master branch.

Commits
-------

27d9385 wrap the exception to get information about where the exception comes from

Discussion
----------

Wrap the exception to get more information about where the exception comes from

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

This patch add more information about where the exception comes from.
Actual you get one exception
```
The service definition "fos_user.registration.form" does not exist.
```

After the patch you get
```
[2/2] Try to replace alias "fos_user.registration.form" with "hwi_oauth.registration.form".
[1/2] The service definition "fos_user.registration.form" does not exist.
```

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

by gimler at 2013-01-16T08:38:36Z

@fabpot i have changed the wording

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

by stloyd at 2013-01-16T08:40:53Z

@gimler Maybe you add [test too](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php) ? Anyway 👍
2013-01-16 09:43:59 +01:00
Gordon Franke
27d9385d4d wrap the exception to get information about where the exception comes from 2013-01-16 09:37:50 +01:00
vicentgodella
1c5d74c891 Fixed coding standards issues in invalid-xml-resources.xlf file. 2013-01-16 09:33:58 +01:00
Vicent
552a806762 Fixed coding standards issues. 2013-01-16 01:28:01 +01:00
Vicent
293991df7b [Translation] Added some tests to QtFileLoader.
Added one test for testing exception is thrown if resource is not local.
Added one test for testing exception is thrown if xml resource is invalid.
2013-01-16 00:45:18 +01:00
Fran Moreno
8bfd7a7a35 Remove custom error handler for deprecations 2013-01-16 00:14:35 +01:00
Fran Moreno
efbff0c425 Change deprecated Min and Max constraint 2013-01-16 00:10:57 +01:00
Fran Moreno
9264431e37 Remove custom error handler for deprecations 2013-01-15 23:53:36 +01:00
Fran Moreno
c80c17ebee Change deprecated Min constraint to Range constraint 2013-01-15 23:50:37 +01:00
Fabien Potencier
2b3079f948 merged branch nomack84/patch-2 (PR #6754)
This PR was merged into the master branch.

Commits
-------

4b59d24 Fixed typo in UPGRADE-3.0
632023d [Routing] fix typo in phpdoc and make it more consistent

Discussion
----------

Fixed typo in UPGRADE-3.0
2013-01-15 19:52:31 +01:00
Mario A. Alvarez Garcia
4b59d2432f Fixed typo in UPGRADE-3.0
Fixed Typo
2013-01-15 13:31:20 -05:00
Tobias Schultze
632023d7b0 [Routing] fix typo in phpdoc and make it more consistent 2013-01-15 18:01:40 +01:00
Fabien Potencier
89f9b24575 merged branch fabpot/routing-options (PR #6738)
This PR was merged into the master branch.

Commits
-------

9fc7def added the UPGRADE file for Symfony 3.0
e84cad2 [Routing] updated CHANGELOG
65eca8a [Routing] added new schemes and methods options to the annotation loader
5082994 [Routing] renamed pattern to path
b357caf [Routing] renamed hostname pattern to just hostname
e803f46 made schemes and methods available in XmlFileLoader
d374e70 made schemes and methods available in YamlFileLoader
2834e7e added scheme and method setter in RouteCollection
10183de make scheme and method requirements first-class citizen in Route

Discussion
----------

Routing options

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #5989, #5990, #6049
| License       | MIT

In #5989, it has unanimously been decided to renamed `hostname_pattern` to `hostname` and `pattern` to `path`. That makes a lot of sense and I would like to do the renaming now as `hostname_pattern` is new in Symfony 2.2, so I'd like to avoid breaking BC just after the release. As we are modifying the route options, I've also included changes introduced by @Tobion in #6049 which were discussed in #5990.

As everything is BC, I think it's wise to include that in 2.2. What do you think?

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

by Tobion at 2013-01-14T18:25:53Z

I agree it should be done in 2.2. Thanks for working on it.

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

by vicb at 2013-01-14T23:11:12Z

@fabpot "Everything is BC" until it breaks BC in 3.0, that's why I'd like to see [deprecations in PR summary](https://github.com/symfony/symfony-docs/pull/2116) what do you think ?

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

by vicb at 2013-01-14T23:16:40Z

it would also be great to update the CHANGELOG with deprecations (it could also help people answering your question)

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

by fabpot at 2013-01-15T07:07:03Z

@vicb: I've just updated the CHANGELOG and created the UPGRADE file for 3.0.

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

by vicb at 2013-01-15T07:15:32Z

@fabpot thanks.
2013-01-15 17:25:04 +01:00
Fabien Potencier
9fc7def298 added the UPGRADE file for Symfony 3.0 2013-01-15 17:22:42 +01:00
Fabien Potencier
e84cad28f0 [Routing] updated CHANGELOG 2013-01-15 17:22:41 +01:00
Fabien Potencier
65eca8a3d9 [Routing] added new schemes and methods options to the annotation loader 2013-01-15 17:22:41 +01:00
Fabien Potencier
508299400d [Routing] renamed pattern to path 2013-01-15 17:22:36 +01:00
Fabien Potencier
80c30fa1d9 merged branch kriswallsmith/master (PR #6742)
This PR was merged into the master branch.

Commits
-------

c9e8ee1 fixed typo

Discussion
----------

fixed typo
2013-01-15 07:54:56 +01:00
Fran Moreno
c47f02735a [Validator][Constraints] Update AllValidator using new Validator API 2013-01-15 01:52:28 +01:00
Kris Wallsmith
c9e8ee153d fixed typo 2013-01-14 16:03:02 -08:00
Fran Moreno
a39fdd88f4 Remove getPropertyPath in the tests 2013-01-15 00:53:09 +01:00
Fran Moreno
ffa4c6f25b [Validator][Constraints] CollectionValidator 2013-01-15 00:03:31 +01:00
Fabien Potencier
b357cafd00 [Routing] renamed hostname pattern to just hostname 2013-01-14 17:14:02 +01:00
Victor Berchet
fb526a4809 [FileProfilerStorage] optimize file reads 2013-01-14 15:59:38 +01:00
Fabien Potencier
acad72e55c merged branch oscartv/patch-1 (PR #6736)
This PR was merged into the master branch.

Commits
-------

a0ba4cf Update src/Symfony/Component/Form/Resources/translations/validators.ca.xlf

Discussion
----------

Update src/Symfony/Component/Form/Resources/translations/validators.ca.x...

...lf
2013-01-14 14:50:40 +01:00
oscartv
a0ba4cf537 Update src/Symfony/Component/Form/Resources/translations/validators.ca.xlf 2013-01-14 14:48:41 +01:00
Fabien Potencier
45a8c1a691 merged branch inmarelibero/patch-1 (PR #6729)
This PR was merged into the master branch.

Commits
-------

a5a04b8 fixed italian translation typo

Discussion
----------

fixed italian translation typo
2013-01-14 12:08:23 +01:00
Fabien Potencier
1493fda08d merged branch hason/cs_fix (PR #6731)
This PR was merged into the master branch.

Commits
-------

cd3d6de [Security] Fixed typo in cs translation

Discussion
----------

[Security] Fixed typo in cs translation
2013-01-14 12:07:45 +01:00
Martin Hasoň
cd3d6de849 [Security] Fixed typo in cs translation 2013-01-14 10:10:39 +01:00
Emanuele Gaspari
a5a04b81f3 fixed italian translation typo 2013-01-14 09:21:46 +01:00
Christian Eikermann
2061cc03b7 Update src/Symfony/Component/Validator/Mapping/ClassMetadata.php
getValue() is deprecated since version 2.2 and will be removed in 2.3. Use getPropertyValue() instead.

ClassMetadata is still using the deprecated method, changed it to getPropertyValue to prevent a trigger error.
2013-01-14 09:10:09 +01:00
Maks Slesarenko
2a7ecf76c2 Merge branch 'master' of github:MaksSlesarenko/symfony into added-support-for-propel-enum-types-forms 2013-01-13 16:51:39 -05:00
Fabien Potencier
e2f85cad89 merged branch philipphoffmann/patch-1 (PR #6722)
This PR was merged into the master branch.

Commits
-------

c1d5f16 Update src/Symfony/Component/HttpKernel/Tests/EventListener/RouterProxyListenerTest.php

Discussion
----------

Typo fix

Just a typo fix
2013-01-13 20:55:12 +01:00
Fabien Potencier
de0d077367 merged branch rubenrua/master (PR #6726)
This PR was merged into the master branch.

Commits
-------

309067a Added Galician translation in security component

Discussion
----------

Added Galician translation in security component
2013-01-13 20:53:31 +01:00
rubenrua
309067a897 Added Galician translation in security component 2013-01-13 20:31:40 +01:00
Philipp Hoffmann
c1d5f16c87 Update src/Symfony/Component/HttpKernel/Tests/EventListener/RouterProxyListenerTest.php
Just a typo fix
2013-01-13 12:48:31 +01:00
Fabien Potencier
d506106b77 merged branch maerlyn/master (PR #6719)
This PR was merged into the master branch.

Commits
-------

f582138 [Security] fix Hungarian translation

Discussion
----------

[Security] fix Hungarian translation

Fixing a small translation mistake in the Hungarian translation.
2013-01-12 23:04:55 +01:00
Gábor Fási
f58213867a [Security] fix Hungarian translation 2013-01-12 21:57:43 +01:00
Fabien Potencier
da0b0426ef merged branch schmittjoh/exFix (PR #6716)
This PR was merged into the 2.1 branch.

Commits
-------

785d365 fixes a bug when output/error output contains a % character

Discussion
----------

fixes a bug when output/error output contains a % character
2013-01-12 21:28:26 +01:00
Joseph Bielawski
a62e04f8d1 [Process] Fix docblocks, remove return from PhpProcess#start() as parent returns nothing, cleaned up ExecutableFinder 2013-01-12 13:49:05 +01:00
Johannes M. Schmitt
785d3655dd fixes a bug when output/error output contains a % character 2013-01-12 11:09:29 +01:00
Fabien Potencier
43a9e6caee merged branch franmomu/rename_catalonian_translation (PR #6714)
This PR was merged into the master branch.

Commits
-------

eeceafa [Security] Renamed catalonian translation file

Discussion
----------

[Security] Renamed catalonian translation file

Renamed as validators file in [Validator](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf) and in [Form](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf) following ISO639-1 language code.
2013-01-12 08:14:18 +01:00
Fabien Potencier
4be5ae4203 merged branch alexolmos/patch-1 (PR #6712)
This PR was merged into the master branch.

Commits
-------

fb52d94 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf

Discussion
----------

Update src/Symfony/Component/Security/Resources/translations/security.es...

..._CA.xlf
2013-01-12 08:12:58 +01:00
Fabien Potencier
3245c1ce3a merged branch pborreli/typophpdoc (PR #6710)
This PR was merged into the master branch.

Commits
-------

b1c6881 Fixed PHPDoc

Discussion
----------

Fixed PHPDoc
2013-01-12 08:12:39 +01:00
Fabien Potencier
5fb9bc6af6 merged branch jorgemartind/patch-1 (PR #6709)
This PR was merged into the master branch.

Commits
-------

9d31064 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf

Discussion
----------

Update src/Symfony/Component/Security/Resources/translations/security.es...

..._CA.xlf

[Security] update catalonian translation
2013-01-12 08:12:01 +01:00
Fabien Potencier
9a579062b0 merged branch lazyhammer/security-translations (PR #6711)
This PR was merged into the master branch.

Commits
-------

0a060ca Fix Russian and Ukrainian translations for Security component

Discussion
----------

[Security] Fix Russian and Ukrainian translations
2013-01-12 08:11:32 +01:00
Fabien Potencier
36b946932f merged branch umpirsky/security-sr-cyrl (PR #6713)
This PR was merged into the master branch.

Commits
-------

67f7ed5 Added Serbian Cyrillic tanslation for security component

Discussion
----------

Added Serbian Cyrillic tanslation for security component
2013-01-12 08:10:33 +01:00
umpirsky
67f7ed5358 Added Serbian Cyrillic tanslation for security component 2013-01-11 19:40:23 +01:00