Commit Graph

16243 Commits

Author SHA1 Message Date
Fabien Potencier
0af3ca39f5 Merge branch '2.4'
* 2.4:
  udpated LICENSE year
  update year on licenses
  rundown and typo fix
  [Process] Fix #9861 : Revert TTY mode
  [Form] Update minimal requirement in composer.json
  Fix Empty translations with Qt files
  [Console] Fixed command name guessing if an alternative is an alias.
  Update UPGRADE-2.3.md to account for #9388
  [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
  [BrowserKit] Throw exception on invalid cookie expiration timestamp
  [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
2014-01-07 14:29:57 +01:00
Fabien Potencier
795599911e udpated LICENSE year 2014-01-07 14:29:32 +01:00
Fabien Potencier
30e66fa773 Merge branch '2.3' into 2.4
* 2.3:
  update year on licenses
  rundown and typo fix
  [Process] Fix #9861 : Revert TTY mode
  [Form] Update minimal requirement in composer.json
  Fix Empty translations with Qt files
  Update UPGRADE-2.3.md to account for #9388

Conflicts:
	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
2014-01-07 14:28:54 +01:00
Fabien Potencier
2cc6bdaad1 minor #9965 [All] update license year to 2014 (cordoval)
This PR was merged into the 2.3 branch.

Discussion
----------

[All] update license year to 2014

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

 Sent using [Gush](https://github.com/cordoval/gush)

sorry about the previous PR now closed, forgot Gush had branched off of master and not 2.3

Commits
-------

8ace5f9 update year on licenses
2014-01-07 14:28:10 +01:00
Fabien Potencier
c0dcb7809b minor #9964 [Validator] rundown with some typo fixes and consistency (cordoval)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] rundown with some typo fixes and consistency

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

 Sent using [Gush](https://github.com/cordoval/gush)

Commits
-------

dcd23df rundown and typo fix
2014-01-07 14:26:01 +01:00
Fabien Potencier
ef12af9948 feature #9963 [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer (stloyd)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[HttpFoundation] JsonResponse::setEncodingOptions accepts also integer

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

Now you can also set encoding options like:
```php
$response->setEncodingOptions(JSON_UNESCAPED_UNICODE | $response->getEncodingOptions());

Commits
-------

f8bc3b2 [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer
2014-01-07 14:23:52 +01:00
Joseph Bielawski
f8bc3b276f [HttpFoundation] JsonResponse::setEncodingOptions accepts also integer
Now you can set encoding options like:
```
$response->setEncodingOptions(JSON_UNESCAPED_UNICODE | $response->getEncodingOptions());
2014-01-07 14:19:33 +01:00
Luis Cordova
8ace5f9f0d update year on licenses 2014-01-07 08:19:25 -05:00
Luis Cordova
dcd23df424 rundown and typo fix 2014-01-07 07:58:55 -05:00
Fabien Potencier
74fb207a24 feature #9915 [HttpFoundation] Add ability to change JSON encoding options (stloyd)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[HttpFoundation] Add ability to change JSON encoding options

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

Commits
-------

89f4784 [HttpFoundation] Add ability to change JSON encoding options
2014-01-07 13:41:34 +01:00
Joseph Bielawski
89f47841fe [HttpFoundation] Add ability to change JSON encoding options 2014-01-07 13:28:26 +01:00
Fabien Potencier
a596ba362b feature #8375 [OptionsResolver] Allow giving a callback as an allowedValue to OptionsResolver (marekkalnik)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[OptionsResolver] Allow giving a callback as an allowedValue to OptionsResolver

I recently had to use an option which was an array and could contain some one or multiple values from a list. As it could contain all possible combinations, it was not possible to validate it with a list of allowed values.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | --
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/3437

Commits
-------

07d1d30 Allow giving a callback as an allowedValue to OptionsResolver
2014-01-07 10:34:19 +01:00
Fabien Potencier
a0c5c6bcd3 bug #9962 [Process] Fix #9861 : Revert TTY mode (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix #9861 : Revert TTY mode

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

This revert the TTY mode support for the process component

Commits
-------

160b1cf [Process] Fix #9861 : Revert TTY mode
2014-01-07 10:32:57 +01:00
Romain Neutron
160b1cfae8 [Process] Fix #9861 : Revert TTY mode 2014-01-07 10:16:01 +01:00
Marek Kalnik
07d1d3074e Allow giving a callback as an allowedValue to OptionsResolver 2014-01-07 10:05:19 +01:00
Fabien Potencier
b208dcebb9 bug #9960 [Form] Update minimal requirement in composer.json (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Update minimal requirement in composer.json

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

Minimal requirement for PropertyAccess component needs to be `~2.3` as Form component depends on new method `PropertyAccess::createPropertyAccessor()`.

Commits
-------

88153b3 [Form] Update minimal requirement in composer.json
2014-01-07 09:49:58 +01:00
Joseph Bielawski
88153b3aa5 [Form] Update minimal requirement in composer.json
Minimal requirement for PropertyAccess component needs to be `~2.3` as Form component depends on new method `PropertyAccess::createPropertyAccessor()`
2014-01-07 09:39:31 +01:00
Fabien Potencier
b2d594daa0 bug #9952 [Translator] Fix Empty translations with Qt files (vlefort)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9952).

Discussion
----------

[Translator] Fix Empty translations with Qt files

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

When you use ts files, QtLinguist, generate empty string for all translations, even if there are not translated yet.

It could be a good idea to generate an entry in the MessageCatalogue only if translation value is not empty.

Commits
-------

1c220be [Translator] Fix Empty translations with Qt files
2014-01-07 09:33:09 +01:00
Vincent LEFORT
7eacc5adf5 Fix Empty translations with Qt files 2014-01-07 09:33:09 +01:00
Fabien Potencier
9b5017c8b6 bug #9957 [Console] Fixed command name guessing if an alternative is an alias (jakzal)
This PR was merged into the 2.4 branch.

Discussion
----------

[Console] Fixed command name guessing if an alternative is an alias

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

Commits
-------

ade448c [Console] Fixed command name guessing if an alternative is an alias.
2014-01-07 09:25:44 +01:00
Jakub Zalas
ade448cf10 [Console] Fixed command name guessing if an alternative is an alias. 2014-01-06 22:33:02 +00:00
Fabien Potencier
f3670b4bfa feature #9666 [FrameworkBundle] Added a yaml:lint command (lyrixx)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle] Added a yaml:lint command

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

Commits
-------

9c06b27 [FrameworkBundle] Added yaml:lint command
2014-01-06 17:42:30 +01:00
Grégoire Pineau
9c06b27283 [FrameworkBundle] Added yaml:lint command 2014-01-06 17:41:52 +01:00
Fabien Potencier
3ae496ee4d minor #9804 [Form] Update UPGRADE-2.3.md to account for #9388 (ureimers)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9804).

Discussion
----------

[Form] Update UPGRADE-2.3.md to account for #9388

Added documentation for how to correctly pre-fill a form using the form's `data` option.
The "old" and also wrong way of doing it broke with Symfony 2.3.7 (with https://github.com/symfony/symfony/pull/9388 to be precise) and this short documentation should help others to fix the problem and do it right.

Commits
-------

5e06535 [Form] Update UPGRADE-2.3.md to account for #9388
2014-01-06 17:31:17 +01:00
ureimers
8a7397425a Update UPGRADE-2.3.md to account for #9388 2014-01-06 17:31:17 +01:00
Fabien Potencier
73edae9a79 Merge branch '2.3' into 2.4
* 2.3:
  [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
  [BrowserKit] Throw exception on invalid cookie expiration timestamp
  [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
2014-01-06 17:19:55 +01:00
Fabien Potencier
6e0848dce2 bug #9948 [WebProfilerBundle] Fixed profiler toolbar icons for XHTML. (rafalwrzeszcz)
This PR was squashed before being merged into the 2.3 branch (closes #9948).

Discussion
----------

[WebProfilerBundle] Fixed profiler toolbar icons for XHTML.

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

Profiler page itself is entirely autonomic, but toolbar is not - unfortunately currently it doesn't work in XHTML documents :(.

#9877 backported to `2.3` branch.

Commits
-------

296c4d1 [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
2014-01-06 17:19:21 +01:00
Rafał Wrzeszcz
296c4d1def [WebProfilerBundle] Fixed profiler toolbar icons for XHTML. 2014-01-06 17:19:20 +01:00
Fabien Potencier
956fa58227 bug #9933 Propel1 exception message (jaugustin)
This PR was merged into the 2.3 branch.

Discussion
----------

Propel1 exception message

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

This add exception message for `ModelChoiceList` and `ModelType` when `class` parameter is not provided or invalid

Commits
-------

047492f [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
2014-01-06 17:10:21 +01:00
Fabien Potencier
34c0f1bb0f bug #9949 [BrowserKit] Throw exception on invalid cookie expiration timestamp (anlutro)
This PR was squashed before being merged into the 2.3 branch (closes #9949).

Discussion
----------

[BrowserKit] Throw exception on invalid cookie expiration timestamp

Currently, if an invalid timestamp is provided, a fatal error with no stack trace will occur, making it difficult to trace the problem.

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

Commits
-------

8df535d [BrowserKit] Throw exception on invalid cookie expiration timestamp
2014-01-06 17:03:23 +01:00
Andreas
8df535dbf9 [BrowserKit] Throw exception on invalid cookie expiration timestamp 2014-01-06 17:03:23 +01:00
Daniel Tschinder
8cd8ec001a Remove usage of deprecated _scheme in Routing Component
Instead correctly use the array of schemes from the Route.
Also adjusted the dumpers to dump the correct data.

I extended the tests to not only test the deprecated behavior, but also
the new schemes-requirement.
2014-01-06 08:32:07 +01:00
Fabien Potencier
6063b499e7 Merge branch '2.4'
* 2.4:
  Revert "bug #9601 [Routing] Remove usage of deprecated _scheme requirement (Danez)"
  bumped Symfony version to 2.4.2
  updated VERSION for 2.4.1
  updated CHANGELOG for 2.4.1
  bumped Symfony version to 2.3.10
  updated VERSION for 2.3.9
  update CONTRIBUTORS for 2.3.9
  updated CHANGELOG for 2.3.9
  Add support SAPI cli-server
  Fix hardcoded listenerTag name in error message
  [HttpFoundation] Documented public properties.
  [Routing] add missing unit tests for Route and RouteCollection classes

Conflicts:
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Kernel.php
2014-01-06 08:29:39 +01:00
Fabien Potencier
def4d7cb93 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #9601 [Routing] Remove usage of deprecated _scheme requirement (Danez)"
2014-01-06 08:27:58 +01:00
Fabien Potencier
146e6663ef Revert "bug #9601 [Routing] Remove usage of deprecated _scheme requirement (Danez)"
This reverts commit 0af3d19c38, reversing
changes made to d56cc4b2cb.
2014-01-06 08:27:41 +01:00
Fabien Potencier
d3b28dc017 minor #9944 [FrameworkBundle] Update composer.json to account for #9792 (realityking)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle] Update composer.json to account for #9792

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

In #9792 RegisterListenersPass was moved from HttpKernel to EventDispatcher. Since FrameworkBundle uses that class the dependency needs to be rises to 2.5.

Commits
-------

f1efd16 [FrameworkBundle] Update composer.json to account for #9792
2014-01-06 08:21:11 +01:00
Rouven Weßling
f1efd16ccc [FrameworkBundle] Update composer.json to account for #9792 2014-01-05 21:14:31 +01:00
Fabien Potencier
439664dabd bumped Symfony version to 2.4.2 2014-01-05 11:33:23 +01:00
Fabien Potencier
377a5fb23b updated VERSION for 2.4.1 2014-01-05 03:12:11 +01:00
Fabien Potencier
ae962797df updated CHANGELOG for 2.4.1 2014-01-05 03:12:05 +01:00
Fabien Potencier
8cc2414c96 Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.10
  updated VERSION for 2.3.9
  update CONTRIBUTORS for 2.3.9
  updated CHANGELOG for 2.3.9
  Add support SAPI cli-server
  Fix hardcoded listenerTag name in error message
  [HttpFoundation] Documented public properties.
  [Routing] add missing unit tests for Route and RouteCollection classes

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
2014-01-05 03:10:50 +01:00
Fabien Potencier
e7df0cfecd bumped Symfony version to 2.3.10 2014-01-05 03:02:33 +01:00
Fabien Potencier
ee1e0f2ef8 updated VERSION for 2.3.9 2014-01-05 02:24:54 +01:00
Fabien Potencier
e9356832fd update CONTRIBUTORS for 2.3.9 2014-01-05 02:24:39 +01:00
Fabien Potencier
08bd497e7d updated CHANGELOG for 2.3.9 2014-01-05 02:24:22 +01:00
Fabien Potencier
5a3a844fcc bug #9938 [Process] Add support SAPI cli-server (peter-gribanov)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9938).

Discussion
----------

[Process] Add support SAPI cli-server

As of PHP 5.4.0, the CLI SAPI provides a built-in web server.
```php
PHP_SAPI == 'cli-server'
```
PHP can be used portable without installation on PC. For example, the [assembly](http://windows.php.net/download/) does not require installation in the system on Windows. In this case `PHP_BINARY` contains the path to the PHP executor, and all the other search methods will not return result.

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

Commits
-------

92d8323 Add support SAPI cli-server
2014-01-05 02:14:12 +01:00
Peter Gribanov
3065f243ad Add support SAPI cli-server 2014-01-05 02:14:11 +01:00
Fabien Potencier
8fc0cfa442 bug #9940 [EventDispatcher] Fix hardcoded listenerTag name in error message (lemoinem)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9940).

Discussion
----------

[EventDispatcher] Fix hardcoded listenerTag name in error message

| Q             | A
| ------------- | ---
| Fixed tickets | N/A
| License       | MIT

Just as the title say, there was a kernel.event_listener string hardcoded in an error message although everywhere else in this class it is stored in the `$listenerTag` property.

Commits
-------

8c91537 [EventDispatcher] Fix hardcoded listenerTag name in error message
2014-01-05 02:11:19 +01:00
Mathieu Lemoine
11c8b8d46c Fix hardcoded listenerTag name in error message 2014-01-05 02:10:45 +01:00
Fabien Potencier
f499094227 minor #9880 test for class route annotation (ewgRa)
This PR was merged into the 2.5-dev branch.

Discussion
----------

test for class route annotation

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

I mention that AnnotationClassLoaderTest don't test class route annotation functional.

This patch add test for class route annotation

Commits
-------

ac94ddb test for class route annotation
2014-01-03 08:30:51 +01:00