Commit Graph

14516 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
e01c6c22e8 merged branch jakzal/bugfix/di-tests-segfault (PR #8298)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Replaced try/catch block with an @expectedException annotation

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

This fix doesn't seem like changing anything but thanks to it, PHP 5.3.3 stops segfaulting.

Tests started failing after merging #8285. However, it's not the change which made them failing (the change is totally unrelated to the segfaulting test case). I suspect it has something to do with memory management in the early PHP 5.3 versions. We've had this kind of failures in the past.

Commits
-------

494e803 [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test.
2013-06-17 15:51:03 +02:00
Jakub Zalas
494e8035ad [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test. 2013-06-17 14:32:29 +01:00
Fabien Potencier
caaaec3155 [CssSelector] tweaked README file (closes #8287) 2013-06-17 09:15:51 +02:00
Fabien Potencier
46cb3b8095 merged branch jfsimon/css-selector-readme-update (PR #8287)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8287).

Discussion
----------

[CssSelector] added a node about HTML extension in readme

It's a common mistake to use `CssSelector` with XML without knowing that `HTML` extension must be disbaled first (see #8286). This PR adds a note about that in the component's readme file.

Commits
-------

4235b26 [CssSelector] added a node about HTML extension in readme
2013-06-17 09:13:34 +02:00
Jean-François Simon
0cb95e07ac added a node about HTML extension in readme 2013-06-17 09:13:34 +02:00
Fabien Potencier
0da84dac18 merged branch jakzal/bugfix/table-helper-multi-byte (PR #8285)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fixed the table rendering with multi-byte strings.

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

Commits
-------

ab1439e [Console] Fixed the table rendering with multi-byte strings.
2013-06-16 14:10:21 +02:00
Jakub Zalas
ab1439eb32 [Console] Fixed the table rendering with multi-byte strings. 2013-06-15 18:55:04 +01:00
Fabien Potencier
092fae1f6b merged branch hostnet/feature/fix-unit-tests (PR #8275)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8275).

Discussion
----------

Feature/fix unit tests

Fixed two cases where tests were relying on the pcntl extension

Commits
-------

39477dd Feature/fix unit tests
2013-06-14 11:45:32 +02:00
Rick Prent
3381f3f897 Feature/fix unit tests 2013-06-14 11:45:32 +02:00
Fabien Potencier
add4207838 merged branch romainneutron/process-stream-select2.2 (PR #8274)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Process] Disable exception on stream_select timeout

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

Commits
-------

c0da3ae [Process] Disable exception on stream_select timeout
2013-06-13 18:05:48 +02:00
Romain Neutron
c0da3ae445 [Process] Disable exception on stream_select timeout 2013-06-13 17:57:04 +02:00
Fabien Potencier
6a15a3adc7 merged branch fabpot/session-regenerate-fix (PR #8270)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] fixed issue with session_regenerate_id (closes #7380)

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

Commits
-------

77f2aa8 [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
2013-06-13 17:25:25 +02:00
Fabien Potencier
f554ada374 merged branch fabpot/bcrypt-salt (PR #8266)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fixed usage of the salt for the bcrypt encoder (refs #8210)

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

see #8210

Commits
-------

b5ded81 [Security] fixed usage of the salt for the bcrypt encoder (refs #8210)
2013-06-13 17:24:34 +02:00
Fabien Potencier
77f2aa8ec8 [HttpFoundation] fixed issue with session_regenerate_id (closes #7380) 2013-06-13 14:48:26 +02:00
Fabien Potencier
ed3bcb047a [DomCrawler] added a note about the default charset 2013-06-13 13:40:37 +02:00
Fabien Potencier
6d2bec72b4 merged branch lsmith77/container_check_alias_in_has_method (PR #8252)
This PR was merged into the 2.3 branch.

Discussion
----------

Container check alias in has method

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=container_check_alias_in_has_method)](https://travis-ci.org/lsmith77/symfony)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This bug might also be in 2.2 but we encountered it in 2.3 and the relevant code was changed slightly from 2.2 to 2.3. We noticed this issue here:
https://github.com/symfony-cmf/RoutingBundle/issues/109

The issue is caused by the ``$container->has->('router')`` check in the Router related commands:
https://github.com/symfony/FrameworkBundle/blob/master/Command/RouterDebugCommand.php#L32

As with the CMF we use a chain router service that is aliased to ``router``, the commands do not get registered.

One could classify this as a BC break, but imho its a bug fix.

Commits
-------

aa79393 also consider alias in Container::has()
2013-06-13 12:54:18 +02:00
Fabien Potencier
d0983f0a79 merged branch lsmith77/force_content_type (PR #8050)
This PR was merged into the 2.2 branch.

Discussion
----------

[WebProfilerBundle] force the Content-Type to html in the web profiler controllers

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=force_content_type)](https://travis-ci.org/lsmith77/symfony)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This just forces the Content-Type to match what will be returned, otherwise if the request format happens to be something else than HTML (which can be the case when building an app that only does JSON/XML with FOSRestBundle) it can happen that the Response class automatically sets a different Content-Type.

The approach taken here matches https://github.com/nelmio/NelmioApiDocBundle/blob/master/Controller/ApiDocController.php#L24

Commits
-------

6d2135b force the Content-Type to html in the web profiler controllers
2013-06-13 10:00:03 +02:00
Fabien Potencier
d849d5d134 Merge branch '2.2' into 2.3
* 2.2:
  Throw exception if value is passed to VALUE_NONE input, long syntax
  fixed date type format pattern regex
  [FrameworkBundle] tweaked previous merge (refs #8242)
  do not re-register commands each time a Console\Application is run
  [Process] moved env check to the Process class (refs #8227)
  fix issue where $_ENV contains array vals
  [DomCrawler] Fix handling file:// without a host
  [Form] corrected interface bind() method defined against in deprecation notice
  [Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol

Conflicts:
	src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
	src/Symfony/Component/DomCrawler/Link.php
	src/Symfony/Component/Form/Form.php
2013-06-13 09:51:49 +02:00
Fabien Potencier
9a76c4f017 merged branch tiagojsag/console_input_options_fix (PR #8199)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8199).

Discussion
----------

[Console] Throw exception if value is passed to VALUE_NONE input optin, long syntax

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

Input options with InputOption::VALUE_NONE accept values in both short and long syntaxes:
- When using the long syntax, no exception is thrown;
- When using short, a "The %s option does not exist" exception is thrown.

This PR only addresses the long syntax case. The short syntax case would require considerable refactoring of the parse code, which I believe should be discussed.

I included a test that illustrates the above mentioned problem for the long syntax scenario.

Commits
-------

32ea77f Throw exception if value is passed to VALUE_NONE input, long syntax
2013-06-13 09:48:34 +02:00
Tiago Garcia
bcbbb28f76 Throw exception if value is passed to VALUE_NONE input, long syntax 2013-06-13 09:47:06 +02:00
Fabien Potencier
fb0a0a708b merged branch bamarni/date-format-regex (PR #8198)
This PR was submitted for the 2.1 branch but it was merged into the 2.2 branch instead (closes #8198).

Discussion
----------

[Form] fixed date type format pattern regex

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| License       | MIT

I don't understand what is the rationale behind the current regex, why is there mandatory in-between characters?

The current regex passes with the format option set to ```dMyyyy``` while it doesn't with ```dMy```, on the linked icu documentation it is stated that ```y``` is equivalent to ```yyyy```.

So when setting this format option to dMy, fields are rendered in a wrong order because of the fallback (year, month, day).

Commits
-------

6a91bbb [Form] fixed date type format pattern regex
2013-06-13 09:35:18 +02:00