Commit Graph

12186 Commits

Author SHA1 Message Date
WouterJ
8bb4e4d332 [DI] Fixed bug requesting non existing service from dumped frozen container 2013-07-07 17:47:47 +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
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
Christophe Coevoet
0cc8872cab Added missing French validator translations 2013-06-27 13:04:11 +02:00
Luis Cordova
1b0f69373c typo first->second 2013-06-27 08:12:14 +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
Michael Squires
a2e440a52c Fix grammar 2013-06-23 08:56:04 +02: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
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
Jean-François Simon
0cb95e07ac added a node about HTML extension in readme 2013-06-17 09:13:34 +02:00
Jakub Zalas
ab1439eb32 [Console] Fixed the table rendering with multi-byte strings. 2013-06-15 18:55:04 +01: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
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
Tiago Garcia
bcbbb28f76 Throw exception if value is passed to VALUE_NONE input, long syntax 2013-06-13 09:47:06 +02:00
Bilal Amarni
6b715136c8 fixed date type format pattern regex 2013-06-13 09:35:18 +02:00
Fabien Potencier
b5ded812fe [Security] fixed usage of the salt for the bcrypt encoder (refs #8210) 2013-06-13 09:21:46 +02:00
Fabien Potencier
24a07fbab8 [FrameworkBundle] tweaked previous merge (refs #8242) 2013-06-13 09:07:59 +02:00
Tom Maguire
842f3fa3d2 do not re-register commands each time a Console\Application is run 2013-06-13 09:04:38 +02:00
Fabien Potencier
0991cd0b9d [Process] moved env check to the Process class (refs #8227) 2013-06-13 08:52:49 +02:00
Matthew J Mucklo
8764944c69 fix issue where $_ENV contains array vals
There are cases where $env or $_ENV can contain a value that is an array
This will cause Process to throw an Array to String conversion exception
Initially I submitted a patch of Process.php, however Fabien indicated
that it shouldn't be fixed there (see below pull request).

Before recently, a simple work around would be in php.ini to set:

  register_argc_argv = On

However with recent changes, this seems to no longer work.

Original pull request: https://github.com/symfony/symfony/pull/7354

See ticket https://github.com/symfony/symfony/issues/7196
2013-06-13 08:44:22 +02:00
Dmitrii Chekaliuk
41399360e8 [DomCrawler] Fix handling file:// without a host 2013-06-13 02:54:36 +03:00
Antonio Angelino
e65723c000 fix-progressbar-start
lastMessagesLength and barCharOriginal should be reset if you want to use 2 or more Progress Bars in the same command flow.
2013-06-12 16:52:32 +02:00
Lukas Kahwe Smith
aa79393054 also consider alias in Container::has() 2013-06-12 12:05:56 +02:00
Fabien Potencier
839047bafa merged branch alquerci/ticket_8219 (PR #8243)
This PR was merged into the 2.2 branch.

Discussion
----------

[Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol

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

Commits
-------

849f3ed [Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol
2013-06-11 22:19:40 +02:00
Fabien Potencier
8d29c64dcc bumped Symfony version to 2.3.2-DEV-DEV 2013-06-11 15:34:17 +02:00
Fabien Potencier
0902c606b4 updated VERSION for 2.3.1 2013-06-11 13:46:38 +02:00
Douglas Greenshields
de289d2cfd [Form] corrected interface bind() method defined against in deprecation notice 2013-06-11 12:21:03 +01:00
Fabien Potencier
2f915f72f6 Merge branch '2.2' into 2.3
* 2.2:
  Revert "[Console] ensure exit code between 0-254"
  fix many-to-many Propel1 ModelChoiceList
  [Console] ensure exit code between 0-254
  [DomCrawler] Fixed a fatal error when setting a value in a malformed field name.
  [Console] fix status code when Exception::getCode returns something like 0.1
  Fixed exit code for exceptions with error code 0
  instantiate valid commands only

Conflicts:
	src/Symfony/Component/Console/Application.php
2013-06-11 09:15:14 +02:00
Fabien Potencier
d85ce5e5ad Merge branch '2.1' into 2.2
* 2.1:
  Revert "[Console] ensure exit code between 0-254"
  [Console] ensure exit code between 0-254
  [Console] fix status code when Exception::getCode returns something like 0.1
  Fixed exit code for exceptions with error code 0
2013-06-11 09:14:33 +02:00
Fabien Potencier
84867b78f8 Revert "[Console] ensure exit code between 0-254"
This reverts commit 6b9180a23d.
2013-06-11 09:13:58 +02:00
alquerci
849f3ed7e9 [Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol 2013-06-10 20:35:46 +02:00
rubenrua
b8c13b670f Added missing galician (gl) translations 2013-06-10 18:23:25 +02:00
Toni Uebernickel
25e3abd683 fix many-to-many Propel1 ModelChoiceList 2013-06-10 12:43:24 +02:00
Tobias Schultze
6b9180a23d [Console] ensure exit code between 0-254
255 is reserved by PHP and should not be used

also put this code inside the codeCoverageIgnore block because it cannot be tested with phpunit
2013-06-09 14:59:14 +02:00
lancergr
68b33604e5 Added Greek translation 2013-06-08 16:57:40 +02:00