Commit Graph

15651 Commits

Author SHA1 Message Date
Fabien Potencier
9ed5608abe minor #9293 [HttpFoundation] Docblock fix (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Docblock fix

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

`BinaryFileResponse::create()` has a different signature than `Response::create()` and cannot inherit its doc. I also fixed indentation in other blocks in this file.

Commits
-------

bb8930c Replaced the @inheritdoc with an actual list of params since the original method has a different signature.
2013-10-15 18:56:08 +02:00
Jakub Zalas
bb8930c4da Replaced the @inheritdoc with an actual list of params since the original method has a different signature.
Also, fixed indentation in other docblocks.
2013-10-15 11:16:18 +01:00
Fabien Potencier
90b483aa44 minor #9288 fix typo : StdClass should be stdClass with little "s" (samsonasik)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9288).

Discussion
----------

fix typo : StdClass should be stdClass with little "s"

Commits
-------

febd1d8 fix typo : StdClass should be stdClass with little "s"
2013-10-13 08:32:10 +02:00
Abdul Malik Ikhsan
6892779d0b fix typo : StdClass should be stdClass with little "s" 2013-10-13 08:32:10 +02:00
Fabien Potencier
e219481579 minor #9278 [HttpFoundation] Remove unnecessary continue from Request (tgabi333)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9278).

Discussion
----------

[HttpFoundation] Remove unnecessary continue from Request

Commits
-------

067f561 [HttpFoundation] Remove unnecessary continue from Request
2013-10-11 13:59:44 +02:00
Gábor Tóth
304c7b6f87 Remove unnecessary continue from Request 2013-10-11 13:59:44 +02:00
Tobias Schultze
5798029450 [Console] improve regex performance to validate name
using possesive quantifier
2013-10-11 13:57:48 +02:00
Tobias Schultze
22b09cea94 [Console] make parent constructor test more reliable
it also fixes the test since f2b60e9c68 and improves phpdoc
2013-10-11 13:57:47 +02:00
Fabien Potencier
b599598bb3 bug #9274 [Yaml] Fixed the escaping of strings starting with a dash when dumping (stof)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] Fixed the escaping of strings starting with a dash when dumping

Dashes need to be escaped in character sets in regexes as they are used to specify a range otherwise.
It fixes the dumper bug reported in #9039 (the parsing issue is not fix here)

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

Commits
-------

af369ae [Yaml] Fixed the escaping of strings starting with a dash when dumping
2013-10-11 06:56:07 +02:00
Christophe Coevoet
af369aee64 [Yaml] Fixed the escaping of strings starting with a dash when dumping
Dashes need to be escaped in character sets in regexes as they are used to
specify a range otherwise.
Refs #9039
2013-10-11 00:23:27 +02:00
Fabien Potencier
9f8867376f bug #9270 [Templating] Fix in ChainLoader.php (janschoenherr)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9270).

Discussion
----------

[Templating] Fix in ChainLoader.php

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

The LoaderInterface requires the _time_ parameter to be passed.

Commits
-------

2631eb3 [Templating] Fix in ChainLoader.php
2013-10-10 17:51:38 +02:00
janschoenherr
e2ecc0fd23 Fix in ChainLoader.php
The LoaderInterface requires the time to be passed.
2013-10-10 17:51:38 +02:00
Fabien Potencier
1028c219b7 bug #9246 [Session] fixed wrong started state (tecbot)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9246).

Discussion
----------

[Session] fixed wrong started state

Currently the session stays in the started mode after the call of  ```save()``` which will close the session. We found the issue in our custom SAPI which keeps the symfony stack initialized over multiple requests.

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

Commits
-------

d641cd6 [Session] fixed wrong started states
2013-10-10 17:50:53 +02:00
Thomas Adam
e8d3ab22b4 fixed wrong started states 2013-10-10 17:50:52 +02:00
Fabien Potencier
7b2fd0bdce Merge branch '2.3'
* 2.3:
  bumped Symfony version to 2.3.7
  updated VERSION for 2.3.6
  updated CHANGELOG for 2.3.6
  bumped Symfony version to 2.2.10
  updated VERSION for 2.2.9
  update CONTRIBUTORS for 2.2.9
  updated CHANGELOG for 2.2.9
  [Security] limited the password length passed to encoders
  [HttpKernel] Fixed a test (compiler pass class name has been changed).
  assets:install command should mirror .dotfiles (.htaccess)
  PoFileDumper - PO headers
  removed whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php
	src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
	src/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php
	src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
	src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
	src/Symfony/Component/Security/Core/Tests/Encoder/PlaintextPasswordEncoderTest.php
2013-10-10 16:19:44 +02:00
Fabien Potencier
f3bd125aed bumped Symfony version to 2.3.7 2013-10-10 16:16:40 +02:00
Fabien Potencier
d0597156c4 updated VERSION for 2.3.6 2013-10-10 15:24:22 +02:00
Fabien Potencier
003644ce35 updated CHANGELOG for 2.3.6 2013-10-10 15:23:56 +02:00
Fabien Potencier
e7df974ab8 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.10
  updated VERSION for 2.2.9
  update CONTRIBUTORS for 2.2.9
  updated CHANGELOG for 2.2.9
  [Security] limited the password length passed to encoders
  assets:install command should mirror .dotfiles (.htaccess)
  PoFileDumper - PO headers
  removed whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
2013-10-10 15:12:30 +02:00
Fabien Potencier
2996c6b4c6 bumped Symfony version to 2.2.10 2013-10-10 15:10:05 +02:00
Fabien Potencier
6a5c6c0d76 updated VERSION for 2.2.9 2013-10-10 14:15:43 +02:00
Fabien Potencier
cce717011e update CONTRIBUTORS for 2.2.9 2013-10-10 14:15:32 +02:00
Fabien Potencier
9488c489c3 updated CHANGELOG for 2.2.9 2013-10-10 14:07:53 +02:00
Fabien Potencier
67d4a8f8af [Security] limited the password length passed to encoders 2013-10-10 14:05:52 +02:00
Philipp Scheit
7b7a4c11a7 [Console] make InputArgument::setDefault() chainable 2013-10-10 13:29:02 +02:00
Jakub Zalas
e01461df62 [HttpKernel] Fixed a test (compiler pass class name has been changed). 2013-10-10 08:15:46 +02:00
Fabien Potencier
86f646fca6 fixed a test 2013-10-10 08:05:49 +02:00
Fabien Potencier
02791be0e6 Revert "fixed a test"
This reverts commit 8bee6883b6.
2013-10-10 08:05:16 +02:00
Fabien Potencier
94a9296341 bug #9234 [Debug] Fixed ClassNotFoundFatalErrorHandler (tPl0ch)
This PR was merged into the master branch.

Discussion
----------

[Debug] Fixed `ClassNotFoundFatalErrorHandler`

After running the test suite, this produced a Fatal Error. Having continue in a child method is not allowed.

| 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
-------

ecee5c2 [Debug] Fixed `ClassNotFoundFatalErrorHandler`
2013-10-10 07:59:07 +02:00
Fabien Potencier
71412d7998 minor #9260 [HttpKernel] Fixed a test (compiler pass class name has been changed) (jakzal)
This PR was merged into the master branch.

Discussion
----------

[HttpKernel] Fixed a test (compiler pass class name has been changed)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes, if #9259 also gets merged
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

**I've sent it against wrong branch. It should be merged in 2.3. Sorry.**

Commits
-------

fae01c1 [HttpKernel] Fixed a test (compiler pass class name has been changed).
2013-10-10 07:54:06 +02:00
Fabien Potencier
744fd0d5f5 Merge branch '2.3'
* 2.3:
  [Process] Fix latest merge from 2.2 in 2.3
2013-10-10 07:53:18 +02:00
Fabien Potencier
71b1baf3f4 bug #9259 [Process] Fix latest merge from 2.2 in 2.3 (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix latest merge from 2.2 in 2.3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes (Process tests are okay)
| License       | MIT

Fix latest merge from 2.2 in 2.3, see #9182

Process tests are okay, an error in HttpKernel seems to occur

Commits
-------

b5e3576 [Process] Fix latest merge from 2.2 in 2.3
2013-10-10 07:53:02 +02:00
Thomas Ploch
ecee5c2e92 [Debug] Fixed ClassNotFoundFatalErrorHandler 2013-10-10 01:10:59 +02:00
Jakub Zalas
fae01c10d0 [HttpKernel] Fixed a test (compiler pass class name has been changed). 2013-10-09 22:38:23 +01:00
Romain Neutron
b5e3576ea0 [Process] Fix latest merge from 2.2 in 2.3 2013-10-09 23:17:57 +02:00
Fabien Potencier
0375dc8f9f bug #9237 [FrameworkBundle] assets:install command should mirror .dotfiles (.htaccess) (FineWolf)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9237).

Discussion
----------

[FrameworkBundle] assets:install command should mirror .dotfiles (.htaccess)

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

The `assets:install` command currently ignores all *.dotfiles* when mirroring the `Resources\public` folders of bundles. This can lead to issues when *.htaccess* files are required for some public assets (ie.: CORS headers for font files to be served via Cloudfront).

Since the assets being installed are clearly in a folder called `public`, we can safely assume that those files are in fact supposed to be accessible and copy them over with the normal files.

Commits
-------

9c884a0 [FrameworkBundle] assets:install command should mirror .dotfiles (.htaccess)
2013-10-09 23:05:14 +02:00
Andrew Moore
6f48f8e231 assets:install command should mirror .dotfiles (.htaccess) 2013-10-09 23:05:14 +02:00
Fabien Potencier
2ae07b5fb1 bug #9223 [Translator] PoFileDumper - PO headers (Padam87)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9223).

Discussion
----------

[Translator] PoFileDumper - PO headers

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

Po files should not be dumped without a header. It causes a lot of problems, including charset issues.

See #6765 / 1 for more info

Commits
-------

e93bc50 [Translator] PoFileDumper - PO headers
2013-10-09 22:59:37 +02:00
Adam Prager
a8bc8fff74 PoFileDumper - PO headers 2013-10-09 22:59:37 +02:00
Fabien Potencier
773932b64b removed whitespaces 2013-10-09 22:52:58 +02:00
Fabien Potencier
ad7ac02ee4 Merge branch '2.3'
* 2.3:
  [Process] Fix #9182 : random failure on pipes tests
  Fixed propel guessed relations
  [FramworkBundle][HttpKernel] Check event listener services are not abstract
  fixed CS
  Check for lock existence before unlinking
  remove MinCount and MaxCount contraints. It has been replaced by Count constraints.
  [FrameworkBundle] fixed path replacement on Windows

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Form/PropelTypeGuesserTest.php
2013-10-09 22:52:22 +02:00
Fabien Potencier
77a961d040 Merge branch '2.2' into 2.3
* 2.2:
  [Process] Fix #9182 : random failure on pipes tests
  Fixed propel guessed relations
  [FramworkBundle][HttpKernel] Check event listener services are not abstract
  fixed CS
  Check for lock existence before unlinking
  [FrameworkBundle] fixed path replacement on Windows

Conflicts:
	src/Symfony/Component/Process/Process.php
2013-10-09 22:51:36 +02:00
Fabien Potencier
46e70ea6e8 bug #9257 [Process][2.2] Fix 9182 : random failure on pipes tests (romainneutron)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Fix 9182 : random failure on pipes tests

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

I'm not a big fan of this fix, but - at least - it works.

With this code, finally, Process does not behave the same at all on Windows and Linux.
This patch does not smells very good but it solves the random failing test issue (that produced at runtime too).

Actually, calling `proc_get_status` within the waiting loop introduced the bug.
So this PR reverts to the previous behavior (consider a process running as long as pipes give data). On Windows, this is not the same behavior as we're not using streams but file handles. Whereas the feof of a stream is detected when the other side closes, the feof of a file handle can be reached at any time. So, on Windows, `proc_get_status` is called (checking the feof of the file handle might be positive until the executable outputs something), and we consider a process running as long as the information returned says it's running.

We could think of decouple windows and linux logic in two separated objects, using the interfaces I introduced in #8753. This could bring much more readability and make the code more easy to understand.

Commits
-------

64a0b40 [Process] Fix #9182 : random failure on pipes tests
2013-10-09 22:48:03 +02:00
Romain Neutron
64a0b40e6f [Process] Fix #9182 : random failure on pipes tests 2013-10-09 18:53:02 +02:00
Fabien Potencier
8bee6883b6 fixed a test 2013-10-09 09:29:29 +02:00
Fabien Potencier
d221a697c7 minor #9245 fixed typo (inmarelibero)
This PR was merged into the master branch.

Discussion
----------

fixed typo

Commits
-------

780f463 fixed typo
2013-10-08 19:55:40 +02:00
Emanuele Gaspari
780f463b1b fixed typo 2013-10-08 19:38:18 +02:00
Fabien Potencier
b00289a6d0 bug #9236 [Form] fix missing use statement for exception UnexpectedTypeException (jaugustin)
This PR was merged into the master branch.

Discussion
----------

[Form] fix missing use statement for exception UnexpectedTypeException

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

fix missing use statement for exception `Symfony\Component\Form\Exception\UnexpectedTypeException`

cc @bschussek

Commits
-------

ea91533 [form] fix missing use statement for exception UnexpectedTypeException
2013-10-08 10:34:28 +02:00
Fabien Potencier
f2b60e9c68 [Console] changed an exception class 2013-10-08 08:39:58 +02:00
Fabien Potencier
5bed1cd6d2 bumped Symfony version to 2.4.0 2013-10-08 08:33:45 +02:00