Commit Graph

9531 Commits

Author SHA1 Message Date
Fabien Potencier
f2721ddace bug #11042 [Debug] fix debug handlers config (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fix debug handlers config

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

Commits
-------

e1ba70e [Debug] fix debug handlers config
2014-06-03 22:37:38 +02:00
Denis Zunke
724bb50942 [Console] OutputFormatter Unset Bold has wrong id 2014-06-03 22:33:46 +02:00
Nicolas Grekas
e1ba70ecb9 [Debug] fix debug handlers config 2014-06-03 17:24:49 +02:00
Fabien Potencier
315c3e50d8 bug #11033 [Debug] fix wrong case mismatch exception (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fix wrong case mismatch exception

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

Commits
-------

8e9cc35 [Debug] fix wrong case mismatch exception
2014-06-03 17:09:24 +02:00
fieg
48d9f36ea0 [Serializer] fixed bc-break with cdata-section nodes 2014-06-03 14:01:38 +02:00
Nicolas Grekas
8e9cc350c2 [Debug] fix wrong case mismatch exception 2014-06-02 09:03:03 +02:00
Fabien Potencier
9c60a8582e bumped Symfony version to 2.5.1 2014-06-01 17:15:34 +02:00
Fabien Potencier
59365832a0 updated VERSION for 2.5.0 2014-05-31 20:45:50 +02:00
Fabien Potencier
af10b106b4 Merge branch '2.4' into 2.5
* 2.4:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:56 +02:00
Fabien Potencier
f1970a76ae Merge branch '2.3' into 2.4
* 2.3:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:48 +02:00
Jakub Zalas
9c2616e788 [Validator] Remove property and method targets from the optional and required constraints.
At the moment both constraints can only be defined on other annotations (specifically, the Collection annotation). Defining the required or optional annotation directly on a field or method throws a ClassNotFoundException, since the constraint validator factory tries to load the validator (which does not exist).
2014-05-29 08:58:28 +01:00
Fabien Potencier
082006278c bumped Symfony version to 2.5.0 2014-05-29 01:33:40 +02:00
Fabien Potencier
515fbe9d95 updated VERSION for 2.5.0-RC1 2014-05-28 03:21:58 +02:00
Fabien Potencier
cff410507f bug #10983 [DomCrawler] Fixed charset detection in html5 meta charset tag (77web)
This PR was squashed before being merged into the 2.3 branch (closes #10983).

Discussion
----------

[DomCrawler] Fixed charset detection in html5 meta charset tag

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

It may be minor to folks with ascii-charactered language, but is critical for us Japanese.
Many Japanese websites with SJIS encoding have "Shift_JIS" as their encoding declaration.

Commits
-------

172e752 [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-27 00:15:18 +02:00
77web
172e75208a [DomCrawler] Fixed charset detection in html5 meta charset tag 2014-05-27 00:15:16 +02:00
Fabien Potencier
682f0a34fe Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-26 21:02:40 +02:00
Fabien Potencier
6cee250b55 Merge branch '2.4' into 2.5
* 2.4:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy
2014-05-26 18:43:24 +02:00
Fabien Potencier
53d5ecaa00 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
2014-05-26 18:43:09 +02:00
Fabien Potencier
5d13be7c71 Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
This reverts commit 735e9a4768, reversing
changes made to 5c91dc1a3a.
2014-05-26 18:42:04 +02:00
Fabien Potencier
55888299be Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
This reverts commit 7dc8931969, reversing
changes made to 309046a207.
2014-05-26 18:42:01 +02:00
Fabien Potencier
d1f77c6d0d Revert "fixed CS"
This reverts commit 11816c5e51.
2014-05-26 18:41:58 +02:00
Fabien Potencier
af1c41c2fc Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
This reverts commit 9766c72324, reversing
changes made to 168174af08.
2014-05-26 18:41:54 +02:00
Fabien Potencier
8d29ca160d Revert "[HttpKernel] simplified some tests"
This reverts commit ccacd8d2af.
2014-05-26 18:41:51 +02:00
Fabien Potencier
ccacd8d2af [HttpKernel] simplified some tests 2014-05-26 18:12:56 +02:00
Arturs Vonda
31da839447 Make rootPath part of regex greedy
- Fixes #10977
2014-05-26 18:03:48 +02:00
Fabien Potencier
487e6ed466 Merge branch '2.4' into 2.5
* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:38 +02:00
Fabien Potencier
4ba44a786c Merge branch '2.3' into 2.4
* 2.3:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:05 +02:00
Fabien Potencier
0572674ac0 minor #10988 [Debug] preserve modified error level (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] preserve modified error level

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

Minor edge case, but still a bug fix.
Replaces https://github.com/symfony/symfony/pull/10978

Commits
-------

e40b717 [Debug] preserve modified error level
2014-05-25 16:44:21 +02:00
Nicolas Grekas
d06b206762 [Debug] throw even in stacking mode to preserve code paths 2014-05-25 12:15:31 +02:00
Nicolas Grekas
e40b717b17 [Debug] preserve modified error level 2014-05-25 11:36:54 +02:00
Christophe Coevoet
a9de61e86d [DomCrawler] Fixed a forgotten case of complex XPath queries 2014-05-24 19:16:55 +02:00
Fabien Potencier
e705499f34 bumped Symfony version to 2.4.6 2014-05-23 16:00:26 +02:00
Romain Neutron
9887b831d2 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput 2014-05-23 11:02:52 +02:00
Fabien Potencier
885b6d1744 updated VERSION for 2.4.5 2014-05-22 23:04:05 +02:00
Romain Neutron
3454d6084f [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation 2014-05-22 22:37:04 +02:00
Fabien Potencier
29341fab1b bumped Symfony version to 2.3.16 2014-05-22 22:22:30 +02:00
Fabien Potencier
424a567d2c updated VERSION for 2.3.15 2014-05-22 19:23:49 +02:00
Tobias Schultze
ad348a9b07 [HttpFoundation] implement session locking for PDO 2014-05-22 18:22:20 +02:00
Fabien Potencier
26bc81e5a0 Merge branch '2.4'
* 2.4:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14
2014-05-22 18:21:05 +02:00
Fabien Potencier
513483fb49 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-22 18:21:00 +02:00
Fabien Potencier
57a64a0fa6 Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-22 18:20:26 +02:00
Fabien Potencier
08bc4d9203 bumped Symfony version to 2.3.15 2014-05-22 18:18:05 +02:00
Fabien Potencier
a037f31de8 updated VERSION for 2.3.14 2014-05-22 16:27:03 +02:00
Fabien Potencier
c296c9ca19 Merge branch '2.4'
* 2.4:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
	src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
2014-05-22 15:47:45 +02:00
Fabien Potencier
6ceb6556fe Merge branch '2.3' into 2.4
* 2.3:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input
2014-05-22 15:46:01 +02:00
Fabien Potencier
059042ef92 feature #10932 [Process] Deprecate Process::setStdin in favor of Process::setInput (romainneutron)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[Process] Deprecate Process::setStdin in favor of Process::setInput

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

From the `Process` point of view, what we pass is an *input*, as well as we retrieve *output* and *error output*.
As we use `getOutput` and `getErrorOutput` we should use `setInput` and let the underlying `ProcessPipes` deal with the actual `STDIN`.

By the way, `ProcessBuilder` already has `setInput` method and no `setStdin` method

Commits
-------

53b9d73 [Process] Deprecate Process::setStdin in favor of Process::setInput
2014-05-22 15:44:17 +02:00
Romain Neutron
53b9d737f1 [Process] Deprecate Process::setStdin in favor of Process::setInput 2014-05-22 15:42:53 +02:00
prophet777
b965fa23a6 [WIP][Finder] Fix wrong implementation on sortable callback comparator 2014-05-22 15:42:36 +02:00
Fabien Potencier
c8476ee744 bug #10929 [2.3][Process] Add validation on Process input (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Add validation on Process input

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

This adds validation on Process input. For the moment, passing a stream would result in a PHP error.
I propose to deprecate values that are not strictly string in 2.6 (see upcoming PR)

Commits
-------

583092b [Process] Add validation on Process input
2014-05-22 15:40:43 +02:00
Fabien Potencier
3c9d8837cf minor #10951 Made use of "kB" vs. "KiB" consistent (Yannick, webmozart)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Made use of "kB" vs. "KiB" consistent

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

Continuation of #10661.

This PR makes the usage of "kB" and "KiB" consistent across the project. The notations equal the internationally recognized ones:

Short form | Long form | Value in Bytes
--- | --- | ---
B | bytes | 1
kB | kilobytes | 1000
KiB | kibibytes | 1024
MB | megabytes | 1000000
MiB | mebibytes | 1048576
GB | gigabytes | 1000000000
GiB | gibibytes | 1073741824

The reason for differentiating between the two is that several users got confused with the current mix (see #10648, #10917, #10661).

FileValidator, UploadedFile and the ProgressBar helper were changed accordingly.

Follow-up feature request: #10962

Commits
-------

e4c6da5 [Validator] Improved to-string conversion of the file size/size limit
bbe1045 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB")
2014-05-22 15:36:06 +02:00