Commit Graph

17520 Commits

Author SHA1 Message Date
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
Fabien Potencier
9766c72324 bug #10979 Make rootPath part of regex greedy (artursvonda)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10979).

Discussion
----------

Make rootPath part of regex greedy

- Fixes #10977
- Also replaced `isset() && true` with simple `!empty()` which is equivalent.

Commits
-------

31da839 Make rootPath part of regex greedy
2014-05-26 18:03:54 +02:00
Arturs Vonda
31da839447 Make rootPath part of regex greedy
- Fixes #10977
2014-05-26 18:03:48 +02:00
Fabien Potencier
b62d4592ad Merge branch '2.5'
* 2.5:
  [TwigBridge][Trans]set %count% only on transChoice
  [Debug] throw even in stacking mode to preserve code paths
  [Debug] preserve modified error level
  [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
2014-05-26 17:36: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
168174af08 bug #10995 [TwigBridge][Trans]set %count% only on transChoice from the current context. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge][Trans]set %count% only on transChoice from the current context.

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

Commits
-------

d176ffc [TwigBridge][Trans]set %count% only on transChoice
2014-05-26 16:50:09 +02:00
Abdellatif AitBoudad
d176ffca51 [TwigBridge][Trans]set %count% only on transChoice 2014-05-26 14:22:36 +01: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
Fabien Potencier
ea6886d804 bug #10989 [Debug] throw even in stacking mode to preserve code paths (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] throw even in stacking mode to preserve code paths

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no if throwing a parent class is accepted
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Throwing \ErrorException instead of ContextErrorException is a better work around for https://bugs.php.net/42098

Commits
-------

d06b206 [Debug] throw even in stacking mode to preserve code paths
2014-05-25 16:42:47 +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
Fabien Potencier
78649a804d bug #10987 [DomCrawler] Fixed a forgotten case of complex XPath queries (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fixed a forgotten case of complex XPath queries

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

This fixes the case I forgot when rewritting the XPath to avoid making it produce invalid queries. I ran the new tests against the old implementation first, to ensure they cover the BC properly.

I could have detected it by running the Mink 1.5 testsuite with the new code (which is the case for people reporting the bug), but I only ran it for Mink 1.6 which does not produce such XPath anymore.

Commits
-------

a9de61e [DomCrawler] Fixed a forgotten case of complex XPath queries
2014-05-25 03:09:37 +02:00
Christophe Coevoet
a9de61e86d [DomCrawler] Fixed a forgotten case of complex XPath queries 2014-05-24 19:16:55 +02:00
Fabien Potencier
a11645c637 updated version to 2.6 2014-05-23 16:36:49 +02:00
Fabien Potencier
bd68412a28 feature #10930 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput (romainneutron)
This PR was merged into the 2.4-dev branch.

Discussion
----------

[Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput

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

This deprecates passing a `Process` input any value that is not a strict string. This needs #10929 to be merged.
I don't know if the use of `trigger_error` is correct or should be removed.

Commits
-------

9887b83 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput
2014-05-23 16:34:38 +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
Fabien Potencier
939778b894 updated CHANGELOG for 2.4.5 2014-05-22 23:03:59 +02:00
Fabien Potencier
e7971e5af5 bug #10971 [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation (romainneutron)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation

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

As reported in https://github.com/symfony/symfony/pull/10932#issuecomment-43939786, it's been introduced when merging 2.3 in master

Commits
-------

3454d60 [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation
2014-05-22 22:57:44 +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
Fabien Potencier
7bd0873550 updated CHANGELOG for 2.3.15 2014-05-22 19:23:43 +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
5a66baf22c update CONTRIBUTORS for 2.3.14 2014-05-22 16:26:40 +02:00
Fabien Potencier
2ee1df31cd updated CHANGELOG for 2.3.14 2014-05-22 16:26:18 +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
Fabien Potencier
2723e44797 bug #10849 [WIP][Finder] Fix wrong implementation on sortable callback comparator (ProPheT777)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10849).

Discussion
----------

[WIP][Finder] Fix wrong implementation on sortable callback comparator

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

Working on this issue, i find SORT_BY_ACCESSED_TIME, SORT_BY_CHANGED_TIME, SORT_BY_MODIFIED_TIME was not tested.

- [x] Add test for SORT_BY_ACCESSED_TIME case
- [x] Add test for SORT_BY_CHANGED_TIME case
- [x] add test for SORT_BY_MODIFIED_TIME case

Commits
-------

b965fa2 [WIP][Finder] Fix wrong implementation on sortable callback comparator
2014-05-22 15:42:36 +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
Fabien Potencier
c505a639b2 minor #10956 [Validator] Fixed StaticMethodLoaderTest on systems that don't have E_STRICT enabled by default (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed StaticMethodLoaderTest on systems that don't have E_STRICT enabled by default

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

Commits
-------

a470ae2 [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
2014-05-22 15:29:31 +02:00
Fabien Potencier
be3b541608 minor #10964 ommited space in validation message (apodgorbunschih)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10964).

Discussion
----------

ommited space in validation message

Commits
-------

7d0811c ommited space
2014-05-22 14:40:41 +02:00
apodgorbunschih
7d0811cfba ommited space 2014-05-22 14:40:41 +02:00
Bernhard Schussek
e4c6da548b [Validator] Improved to-string conversion of the file size/size limit 2014-05-22 11:16:37 +02:00
Yannick
bbe1045989 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB") 2014-05-22 10:54:24 +02:00