Commit Graph

14678 Commits

Author SHA1 Message Date
Fabien Potencier
4efac29ba2 merged branch fabpot/removed-unused-code (PR #8440)
This PR was merged into the 2.3 branch.

Discussion
----------

removed unused code

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

c60bdf5 removed unused code
2013-07-08 15:00:35 +02:00
Fabien Potencier
82dbaee06d [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124) 2013-07-08 11:12:10 +02:00
Fabien Potencier
92c30b913b merged branch entering/browser-kit-beautify-code (PR #8432)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8432).

Discussion
----------

[BrowserKit] CookieJar remove unneeded var, Client remove unneeded else

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

10c6799 [BrowserKit] CookieJar remove unneeded var, Client remove unneeded else
2013-07-07 17:48:29 +02:00
entering
4d2051c1d4 CookieJar remove unneeded var, Client remove unneeded else 2013-07-07 17:48:29 +02:00
Fabien Potencier
eaf9ede606 merged branch WouterJ/di_alias_dumper_bug (PR #8435)
This PR was squashed before being merged into the 2.3 branch (closes #8435).

Discussion
----------

[DI] Fixed bug requesting non existing service from dumped frozen container

When dumping a frozen container without aliases, the method `Container::has()` will throw a *"Warning: array_key_exists() expects parameter 2 to be array, null given"* warning. It's because `PhpDumper::addAliases` returns `''` if no aliases are given. This will work for a normal constructor, because it calls the `Container::__construct` method, but the frozen constructor doesn't do that. So it requires a `$this->aliases = array();` in the constructor.

This PR fixes this bug (and adds the test). Bug is introduced in #8252 and 63367a3d5615ff65251ccee4f73223107275f65f

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

8bb4e4d [DI] Fixed bug requesting non existing service from dumped frozen container
2013-07-07 17:47:47 +02:00
WouterJ
8bb4e4d332 [DI] Fixed bug requesting non existing service from dumped frozen container 2013-07-07 17:47:47 +02:00
Venu
d3eb9b7041 [Validator] Fixed groups argument misplace for validateValue method from validator class 2013-07-04 23:18:29 +05:30
Fabien Potencier
f03a4894d5 merged branch birko/patch-1 (PR #8411)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8411).

Discussion
----------

Update validators.sk.xlf

updatet pluralization translations for lenght validators

Commits
-------

00c2e5c Update validators.sk.xlf
2013-07-03 12:44:49 +02:00
František Bereň
ab9e3eede1 Update validators.sk.xlf 2013-07-03 12:44:49 +02:00
Fabien Potencier
afd79eae83 merged branch zakharovvi/filesystem_test_case (PR #8333)
This PR was merged into the master branch.

Discussion
----------

[Filesystem] create FilesystemTestCase from FilesystemTest

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

FilesystemTest methods are useful for testing any class are working with file system

Commits
-------

266df16 [Filesystem] create FilesystemTestCase from FilesystemTest
2013-07-02 14:54:27 +02:00
Tobias Schultze
6dbd1e102b [WebProfiler] fix content-type parameter 2013-07-02 14:51:26 +02:00
Fabien Potencier
41f5c184b7 merged branch stof/config_argument (PR #8359)
This PR was merged into the 2.2 branch.

Discussion
----------

Passed the config when building the Configuration in ConfigurableExtension

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

This passes the config to ``getConfiguration`` instead of passing an empty array in ConfigurableExtension. This makes the class usable for bundle overwriting the ``getConfiguration`` method to use the config instead of using the default logic (which does not need the config).

Commits
-------

a830001 Passed the config when building the Configuration in ConfigurableExtension
2013-07-02 14:49:11 +02:00
Fabien Potencier
7c326bd1d8 merged branch Ocramius/bump/proxymanager-dependency-bump (PR #8382)
This PR was merged into the master branch.

Discussion
----------

Bumping max version of ProxyManager, supporting 0.4.0

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

18352fc Bumping max version of ProxyManager, supporting 0.4.0
2013-07-02 14:45:09 +02:00
Fabien Potencier
107852b330 merged branch wwotoole/patch-1 (PR #8400)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8400).

Discussion
----------

Replace romaji period characters with Japanese style zenkaku period char...

...acters

Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.

Commits
-------

1b3b1a7 Replace romaji period characters with Japanese style zenkaku period characters
2013-07-02 09:41:46 +02:00
Warwick
b602544bf7 Replace romaji period characters with Japanese style zenkaku period characters
Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.
2013-07-02 09:41:45 +02:00
Fabien Potencier
4c0bfd3313 fixed CS 2013-07-01 14:24:43 +02:00
Fabien Potencier
af101a5a63 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  typo first->second
  Fixed variable name used in translation cache

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/CssSelector/Node/FunctionNode.php
	src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
2013-07-01 14:17:23 +02:00
Fabien Potencier
fdf2d6228c fixed CS 2013-07-01 14:15:46 +02:00
Fabien Potencier
80826aa480 merged branch jakzal/console-interaction-check (PR #8386)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Avoided an unnecessary check if a stream is an interactive terminal

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

It only makes sense to do the second check, if the first one evaluates to false (so the `--no-interaction` option was not passed).

Running `posix_isatty()` raises a warning with some stream types (like in-memory stream). With this patch, warning could be avoided by passing the `--no-interaction option` (which is what we want with an in-memory stream).

The warning I'm getting is:

```
PHP Warning:  posix_isatty(): could not use stream of type 'MEMORY' in vendor/symfony/console/Symfony/Component/Console/Application.php on line 866
```

Commits
-------

e46fd4e [Console] Avoided an unnecessary check.
2013-06-30 20:39:17 +02:00
Jakub Zalas
e46fd4e8fa [Console] Avoided an unnecessary check.
It only makes sense to do the second check if the --no-interaction
option was not passed.

Running posix_isatty() raises a warning with some stream types (like MEMORY).
With this patch, warning could be avoided by passing the --no-interaction option.
2013-06-30 20:29:21 +02:00
Marco Pivetta
18352fc5c5 Bumping max version of ProxyManager, supporting 0.4.0 2013-06-28 23:58:32 +02:00
Fabien Potencier
b76a6fc72c merged branch stof/french_translations (PR #8370)
This PR was merged into the 2.3 branch.

Discussion
----------

Added missing French validator translations

Commits
-------

0cc8872 Added missing French validator translations
2013-06-27 13:25:43 +02:00
Christophe Coevoet
0cc8872cab Added missing French validator translations 2013-06-27 13:04:11 +02:00
Artem Lopata
a2b15359d8 [Form] Fix of "PATCH'ed forms are never valid"
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8111
| License       | MIT
2013-06-27 09:49:09 +03:00
Fabien Potencier
939f8720ac merged branch cordoval/patch-3 (PR #8363)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8363).

Discussion
----------

typo first->second

Commits
-------

2d9a84b typo first->second
2013-06-27 08:12:15 +02:00
Luis Cordova
1b0f69373c typo first->second 2013-06-27 08:12:14 +02:00
Christophe Coevoet
a830001ca3 Passed the config when building the Configuration in ConfigurableExtension 2013-06-26 14:56:23 +02:00
Fabien Potencier
c60bdf5459 removed unused code 2013-06-26 10:36:28 +02:00
Fabien Potencier
f4c1a3a131 merged branch Burgov/patch-4 (PR #8355)
This PR was merged into the master branch.

Discussion
----------

Fixed typo

Commits
-------

6fdf8cf Fixed typo
2013-06-25 16:31:00 +02:00
Bart van den Burg
6fdf8cf56d Fixed typo 2013-06-25 16:33:52 +03:00
Fabien Potencier
465965a71b merged branch gnutix/2.3 (PR #8339)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8339).

Discussion
----------

[Routing] Add an extension-point for DI into the Matcher/Generator Dumpers

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

The Routing's MatcherDumper and GeneratorDumper classes are instantiated very deeply into the `Router::getGenerator()` and `Router::getMatcher()` methods.

This pull requests aims to :
 1. separate the instances creation
 2. ease overriding (lesser risks of changes at framework updates)
 3. ease dependencies injection for these classes (as we can't inject dependencies in another way, be it service definition, compiler pass or whatever I'm aware of).

An example of usage would be the following : https://gist.github.com/gnutix/5844630
It's a real case I'm having in my company's current project.

Commits
-------

5a03a7f [Routing] Add an extension-point for DI into the Matcher/Generator Dumpers
2013-06-24 21:22:42 +02:00
Dorian Villet
40b598c82e Add an extension-point for DI into the Matcher/Generator Dumpers 2013-06-24 21:22:42 +02:00
Fabien Potencier
1a0b38a48a merged branch cedric-g/patch_translator (PR #8310)
This PR was submitted for the 2.3 branch but it was merged into the 2.2 branch instead (closes #8310).

Discussion
----------

[FrameworkBundle] Fixed variable name used in translation cache

This simply fixes the `$catalogueXXX` variable name used in the translation cache files in case the user use locales such as `en-US`, the generated variable's name was `$catalogueEn-Us`, with this fix it will be `$catalogueEnUs`.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7824
| License       | MIT
| Doc PR        | -

Commits
-------

e50399c [FrameworkBundle] Fixed variable name used in translation cache
2013-06-24 09:44:23 +02:00
Cédric Girard
b272419ab9 Fixed variable name used in translation cache 2013-06-24 09:44:05 +02:00
Fabien Potencier
31ac13bcd1 Merge branch '2.3'
* 2.3: (33 commits)
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  Removed PHP 5.5 from the allowed failures.
  [Intl] Fixed tests failing on PHP 5.5
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test.
  [CssSelector] tweaked README file (closes #8287)
  added a node about HTML extension in readme
  [Console] Fixed the table rendering with multi-byte strings.
  Feature/fix unit tests
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  Throw exception if value is passed to VALUE_NONE input, long syntax
  fixed date type format pattern regex
  [Security] fixed usage of the salt for the bcrypt encoder (refs #8210)
  [FrameworkBundle] tweaked previous merge (refs #8242)
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:33 +02:00
Fabien Potencier
d7999d7108 Merge branch '2.2' into 2.3
* 2.2:
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
  force the Content-Type to html in the web profiler controllers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:02 +02:00
Fabien Potencier
c875d0aae1 [Form] fixed INF usage which does not work on Solaris (closes #8246) 2013-06-23 09:35:41 +02:00
Fabien Potencier
fa42a90bd8 merged branch jakzal/2.3-tests-on-php-5.5 (PR #8324)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fixed tests failing on PHP 5.5 and removed this version from the allowed failures

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

69ec7c8 Removed PHP 5.5 from the allowed failures.
3492186 [Intl] Fixed tests failing on PHP 5.5
2013-06-23 09:01:37 +02:00
Fabien Potencier
66e2227c2d merged branch sqmk/patch-1 (PR #8337)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8337).

Discussion
----------

Fix grammar

Commits
-------

4163f71 Fix grammar
2013-06-23 08:56:04 +02:00
Michael Squires
a2e440a52c Fix grammar 2013-06-23 08:56:04 +02:00
Vitaliy Zakharov
266df16add [Filesystem] create FilesystemTestCase from FilesystemTest 2013-06-21 23:11:07 +06:00
Jakub Zalas
69ec7c8363 Removed PHP 5.5 from the allowed failures. 2013-06-21 09:32:21 +01:00
Jakub Zalas
349218692e [Intl] Fixed tests failing on PHP 5.5 2013-06-21 09:19:25 +01:00
Fabien Potencier
5b14665964 bumped Symfony version to 2.2.4 2013-06-19 15:03:30 +02:00
Fabien Potencier
74a033d95b updated VERSION for 2.2.3 2013-06-19 14:09:49 +02:00
Fabien Potencier
8c353ddde6 update CONTRIBUTORS for 2.2.3 2013-06-19 14:09:22 +02:00
Fabien Potencier
bf881db902 updated CHANGELOG for 2.2.3 2013-06-19 14:09:01 +02:00
Fabien Potencier
1815f5998a Merge branch '2.1' into 2.2
* 2.1:
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
2013-06-19 14:03:55 +02:00
Fabien Potencier
8fd817b4d2 merged branch Strate/strate/improvement/get-parent-of-node (PR #8302)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8302).

Discussion
----------

[Config] Allow to get parent of BaseNode

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no (improvement)
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Like an ArrayNode have method `getChildren`, I might to be good idea for having method `getParent` of all nodes.

Commits
-------

a9a7ecc [Config] Allow to get parent of BaseNode
2013-06-19 11:29:08 +02:00
Strate
d95c245d65 Allow to get parent of BaseNode 2013-06-19 11:29:07 +02:00