Commit Graph

18135 Commits

Author SHA1 Message Date
Fabien Potencier
55d17fad19 minor #11635 [Finder] Fix findertest readability (1emming)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11635).

Discussion
----------

[Finder] Fix findertest readability

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | part of #11631, #11588
| License       | MIT

When running on Ubuntu it is hard to setup an account that allows the `chmod` to downgrade the rights on a directory but is not allow to read from the downgraded directory.

Commits
-------

8a47b62 [Finder] Fix findertest readability
2014-08-31 06:03:33 +02:00
1emming
8a47b62bd3 [Finder] Fix findertest readability 2014-08-31 06:03:32 +02:00
Fabien Potencier
b5d0501860 minor #11574 [Security] Made optimization on constant-time algorithm removing modulus operator (yosmanyga)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Made optimization on constant-time algorithm removing modulus operator

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

This fix improves the constant-time algorithm used to compare strings, as it removes the `%` operator inside the loop.

Commits
-------

000bd0d Made optimization deprecating modulus operator
2014-08-31 05:48:56 +02:00
Fabien Potencier
94990a2769 minor #11707 [Validator] Test that validateProperty() works if no constraint is defined (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[Validator] Test that validateProperty() works if no constraint is defined

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes (2.3 has to be merged into 2.5 first)
| Fixed tickets | #11604, #11614
| License       | MIT
| Doc PR        |

Adds a test case for #11604 to avoid regressions. The actual issue has been fixed in Symfony 2.3 with the merge of #11615.

Commits
-------

a47a884 add test for #11604
2014-08-31 05:34:15 +02:00
Fabien Potencier
bdb01a68d2 bug #11772 [Filesystem] Add FTP stream wrapper context option to enable overwrite (Damian Sromek)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11772).

Discussion
----------

[Filesystem] Add FTP stream wrapper context option to enable overwrite

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

Without this change it's not possible to override a file on FTP by calling Filesystem::copy($originFile, $targetFile, true) as PHP/FTP server responds with error like:

fopen(ftp://...@ftp/file.txt): failed to open stream: Remote file already exists and overwrite context option not specified FTP server reports 213 166440 []

TODO: Write an integration tests? How? Use some real FTP server?

Commits
-------

c056a9c [Filesystem] Add FTP stream wrapper context option to enable overwrite (override)
2014-08-31 05:30:41 +02:00
Damian Sromek
c056a9c426 [Filesystem] Add FTP stream wrapper context option to enable overwrite (override) 2014-08-31 05:30:23 +02:00
Fabien Potencier
6ff62cc675 Merge branch '2.4' into 2.5
* 2.4:
  fix typos
  [HttpKernel] add use statement for phpdoc
  Disabled the PHPUnit self-update on Travis
  [ClassLoader] simplified phpdoc
  [ClassLoader] Add a __call() method to XcacheClassLoader
  fix some minor typos in tests
  [Yaml] fixed mapping keys containing a quoted #
  Added fixture to test parsing of hash keys ending with a space and #
  [Filesystem Component] mkdir race condition fix #11626
  [Validator] reverted permissions change on translation files
  Fixed Factory services not within the ServiceReferenceGraph.
  [CssSelector] Fix URL to SimonSapin/cssselect repo
  [Validator] Fixed wrong translation keys/messages for Collection constraint. The error messages for a missing field and an unexpected field did not match the Contraint class
  [YAML] resolve variables in inlined YAML
  Disallow abstract definitions from doctrine event listener registration

Conflicts:
	src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
	src/Symfony/Component/Yaml/Inline.php
2014-08-31 05:22:04 +02:00
Fabien Potencier
e99dfdf87a Merge branch '2.3' into 2.4
* 2.3:
  [HttpKernel] add use statement for phpdoc
  Disabled the PHPUnit self-update on Travis
  [ClassLoader] simplified phpdoc
  [ClassLoader] Add a __call() method to XcacheClassLoader
  fix some minor typos in tests
  [Yaml] fixed mapping keys containing a quoted #
  Added fixture to test parsing of hash keys ending with a space and #
  [Filesystem Component] mkdir race condition fix #11626
  [Validator] reverted permissions change on translation files
  Fixed Factory services not within the ServiceReferenceGraph.
  [CssSelector] Fix URL to SimonSapin/cssselect repo
  [Validator] Fixed wrong translation keys/messages for Collection constraint. The error messages for a missing field and an unexpected field did not match the Contraint class
  [YAML] resolve variables in inlined YAML
  Disallow abstract definitions from doctrine event listener registration

Conflicts:
	src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
	src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
	src/Symfony/Component/Filesystem/Filesystem.php
2014-08-31 05:18:18 +02:00
Fabien Potencier
fb3be10089 minor #11804 fix typos (Tobion)
This PR was merged into the 2.4 branch.

Discussion
----------

fix typos

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

Commits
-------

e91269b fix typos
2014-08-31 05:02:59 +02:00
Tobias Schultze
e91269bd7c fix typos 2014-08-30 22:47:12 +02:00
Fabien Potencier
06de353635 bug #11791 [Process] fix mustRun() in sigchild environments (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[Process] fix mustRun() in sigchild environments

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

When being run in sigchild environments, the sigchild compatibility mode needs to be enabled to be able to call `getExitCode()`. Since `mustRun()` uses `getExitCode()` to determine whether or not a process terminated successfully, it cannot be used in sigchild environments when the sigchild compatibility mode is disabled.

Commits
-------

b764f6c fix mustRun() in sigchild environments
2014-08-30 09:50:17 +02:00
Fabien Potencier
2c9496bc77 minor #11802 [HttpKernel] add use statement for phpdoc (Miliooo)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11802).

Discussion
----------

[HttpKernel] add use statement for phpdoc

| Q             | A
| ------------- | ---
| Fixed tickets | https://github.com/symfony/symfony/issues/11801
| License       | MIT

Added use statement for the Phpdoc

Commits
-------

0010fba [HttpKernel] add use statement for phpdoc
2014-08-30 09:46:13 +02:00
Miliooo
0010fba8b1 [HttpKernel] add use statement for phpdoc 2014-08-30 09:46:13 +02:00
Christian Flothmann
fc85435915 fix handling of empty sequence items
When a line contains only a dash it cannot safely be assumed that
it contains a nested list or an embedded mapping. If the next line
starts with a dash at the same indentation, the current line's item
is to be treated as `null`.
2014-08-29 15:58:19 +02:00
Fabien Potencier
c730fc6f77 bug #11788 [Yaml] fixed mapping keys containing a quoted # (hvt, fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fixed mapping keys containing a quoted #

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

Commits
-------

110f999 [Yaml] fixed mapping keys containing a quoted #
8ba3b28 Added fixture to test parsing of hash keys ending with a space and #
2014-08-29 11:22:54 +02:00
Fabien Potencier
c42302ef3b minor #11793 Disabled the PHPUnit self-update on Travis (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Disabled the PHPUnit self-update on Travis

The 4.2.2 release available on Travis currently ships with a broken self-update command. Given that it is new enough to contain the fixes for the other bugs affecting the build, it is fine to keep using the available phar without updating it.

This avoids making all builds except 5.3.3 fail before running tests.

FYI, the bug itself is already fixed in PHPUnit so 4.2.3 will have a working command.

Commits
-------

0fca352 Disabled the PHPUnit self-update on Travis
2014-08-29 11:20:55 +02:00
Fabien Potencier
b74acdb797 bug #11787 fixed DateComparator if file does not exist (avi123)
This PR was squashed before being merged into the 2.5 branch (closes #11787).

Discussion
----------

fixed DateComparator if file does not exist

Description:
When a file is deleted after the iterator is created, the accept function throws the following exception: SplFileInfo::getMTime(): stat failed.  This is because the function doesn't check first for the existence of the file.  In theory, a deletion between existence being checked and getMTime getting called would still result in this error, but the risk area for this race condition is much smaller than the current risk area.

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

Commits
-------

c6e9e06 fixed DateComparator if file does not exist
2014-08-29 11:14:46 +02:00
avi123
c6e9e06abb fixed DateComparator if file does not exist 2014-08-29 11:14:43 +02:00
Christophe Coevoet
0fca35276a Disabled the PHPUnit self-update on Travis
The 4.2.2 release available on Travis currently ships with a broken
self-update command. Given that it is new enough to contain the fixes for
the other bugs affecting the build, it is fine to keep using the available
phar without updating it.
2014-08-28 22:43:41 +02:00
Christophe Coevoet
37f2c3dabd bug #11160 [DoctrineBridge] Abstract Doctrine Subscribers with tags (merk)
This PR was merged into the 2.3 branch.

Discussion
----------

[DoctrineBridge] Abstract Doctrine Subscribers with tags

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

I've hit a problem with some doctrine listeners, built by decorating an abstract definition.

I want the abstract definition to hold the tag, however because the RegisterEventListenersAndSubscribersPass runs before abstract definitions are removed, they get added as method calls to the EventManager definition, which once the abstract service is removed, we end up with a method call that breaks the container.

I don't know if this is the best approach, it might be better not to return abstract services when calling `findTaggedServiceIds` instead?

Commits
-------

cbcf513 Disallow abstract definitions from doctrine event listener registration
2014-08-28 21:58:08 +02:00
Christian Flothmann
b764f6c61e fix mustRun() in sigchild environments
When being run in sigchild environments, the sigchild compatibility
mode needs to be enabled to be able to call `getExitCode()`. Since
`mustRun()` uses `getExitCode()` to determine whether or not a process
terminated successfully, it cannot be used in sigchild environments
when the sigchild compatibility mode is disabled.
2014-08-28 18:39:24 +02:00
Fabien Potencier
8605c42441 [ClassLoader] simplified phpdoc 2014-08-28 16:35:12 +02:00
Fabien Potencier
f7769b52f1 bug #11768 [ClassLoader] Add a __call() method to XcacheClassLoader (tstoeckler)
This PR was squashed before being merged into the 2.3 branch (closes #11768).

Discussion
----------

[ClassLoader] Add a __call() method to XcacheClassLoader

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

Commits
-------

dd0d6af [ClassLoader] Add a __call() method to XcacheClassLoader
2014-08-28 16:33:47 +02:00
Tobias Stöckler
dd0d6afc21 [ClassLoader] Add a __call() method to XcacheClassLoader 2014-08-28 16:33:42 +02:00
Fabien Potencier
224844a7d1 minor #11790 [Process] fix some minor typos in tests (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] fix some minor typos in tests

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

Commits
-------

24d2c9a fix some minor typos in tests
2014-08-28 16:31:01 +02:00
Christian Flothmann
24d2c9a5f0 fix some minor typos in tests 2014-08-28 11:02:24 +02:00
Fabien Potencier
110f999d05 [Yaml] fixed mapping keys containing a quoted # 2014-08-28 03:42:35 +02:00
Harm van Tilborg
8ba3b289fe Added fixture to test parsing of hash keys ending with a space and # 2014-08-28 03:41:39 +02:00
Fabien Potencier
cf02d5582b bug #11739 [Validator] Pass strict argument into the strict email validator (brianfreytag)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11739).

Discussion
----------

[Validator] Pass strict argument into the strict email validator

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

When strict = true is set in the Email constraint, it loads up the third
party library to do strict validation, but it doesn't pass strict into
the library. Unless strict is passed into the library, only major e-mail
errors will be validated and e-mails like user@gmail ,com or
user@gmail,com will pass validation because they are registered as
warnings by the library and not errors.

/cc @egulias @stof

Commits
-------

d2a634d [Validator] Pass strict argument into the strict email validator
2014-08-27 22:16:08 +02:00
Brian Freytag
d2a634d73d [Validator] Pass strict argument into the strict email validator 2014-08-27 22:16:07 +02:00
Fabien Potencier
f1611ab8fc bug #11749 [TwigBundle] Remove hard dependency of RequestContext in AssetsExtension (pgodel)
This PR was merged into the 2.5 branch.

Discussion
----------

[TwigBundle] Remove hard dependency of RequestContext in AssetsExtension

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

symfony/symfony#10451 introduced the requirement of RequestContext in AssetsExtension. This is only needed when generating absolute URLs for assets. When sending emails with Twig from the CLI, the router may not be present and most times is not required.

This PR attempts to remove the hard dependency and set RequestContext if the router is present according to issue #11466.

Commits
-------

5ad4d8a Remove hard dependency of RequestContext in AssetsExtension
2014-08-27 21:01:02 +02:00
Fabien Potencier
bb97903684 bug #11726 [Filesystem Component] mkdir race condition fix #11626 (kcassam)
This PR was squashed before being merged into the 2.3 branch (closes #11726).

Discussion
----------

[Filesystem Component] mkdir race condition fix #11626

[Filesystem Component] Fix mkdir race condition

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

Commits
-------

0483452 [Filesystem Component] mkdir race condition fix #11626
2014-08-27 14:38:41 +02:00
Ka
04834521f1 [Filesystem Component] mkdir race condition fix #11626 2014-08-27 14:38:33 +02:00
Fabien Potencier
8990ac691c bug #11677 [YAML] resolve variables in inlined YAML (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[YAML] resolve variables in inlined YAML

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

#11569 does not resolve variables in inline YAML.

Commits
-------

45a5863 [YAML] resolve variables in inlined YAML
2014-08-27 14:37:38 +02:00
Fabien Potencier
7510d0648e [Validator] reverted permissions change on translation files 2014-08-27 10:38:16 +02:00
Fabien Potencier
c59f1dde6b bug #11639 [DependencyInjection] Fixed factory service not within the ServiceReferenceGraph. (boekkooi)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11639).

Discussion
----------

[DependencyInjection] Fixed factory service not within the ServiceReferenceGraph.

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

Fixed a problem where Factory services are not added to the ServiceReferenceGraph.

Commits
-------

e992f8e Fixed Factory services not within the ServiceReferenceGraph.
2014-08-27 10:32:18 +02:00
Warnar Boekkooi
e992f8e3d1 Fixed Factory services not within the ServiceReferenceGraph. 2014-08-27 10:32:18 +02:00
Fabien Potencier
3cb9d7af35 bug #11778 [Validator] Fixed wrong translations for Collection constraints (samicemalone)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed wrong translations for Collection constraints

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

The error messages for a missing field and an unexpected field did not match the Constraint class.

Commits
-------

808de2b [Validator] Fixed wrong translation keys/messages for Collection constraint. The error messages for a missing field and an unexpected field did not match the Contraint class
2014-08-27 10:28:50 +02:00
Fabien Potencier
dfce21ce86 minor #11779 [CssSelector] Fix URL to SimonSapin/cssselect repo in README (jwpage)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11779).

Discussion
----------

[CssSelector] Fix URL to SimonSapin/cssselect repo in README

This fixes a broken link in the CssSelector README spotted by @philsturgeon in https://github.com/symfony/CssSelector/pull/2.

| Q             | A
| ------------- | ---
| Fixed tickets | none
| License       | MIT

Commits
-------

b9a237c [CssSelector] Fix URL to SimonSapin/cssselect repo
2014-08-27 10:24:06 +02:00
Johnson Page
b9a237c00b [CssSelector] Fix URL to SimonSapin/cssselect repo 2014-08-27 10:24:06 +02:00
Sam Malone
808de2b284 [Validator] Fixed wrong translation keys/messages for Collection constraint. The error messages for a missing field and an unexpected field did not match the Contraint class 2014-08-27 03:57:26 +01:00
Pablo Godel
5ad4d8a359 Remove hard dependency of RequestContext in AssetsExtension 2014-08-26 16:24:52 -04:00
Fabien Potencier
b03530b781 minor #11619 added useful reminder about form.vars.errors into UPGRADE-2.5 notes (Oleg Andreyev)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11619).

Discussion
----------

added useful reminder about form.vars.errors into UPGRADE-2.5 notes

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

PR is just about upgrading UPGRADE-2.5 notes.
We've been upgrading from 2.4 to 2.5.3 and missing this part (upgrading templates)

Commits
-------

aefb1ca added useful reminder about form.vars.errors into UPGRADE-2.5 notes
2014-08-26 16:39:01 +02:00
Oleg Andreyev
aefb1cab05 added useful reminder about form.vars.errors into UPGRADE-2.5 notes 2014-08-26 16:39:01 +02:00
Fabien Potencier
c4615bfc93 Merge branch '2.4' into 2.5
* 2.4:
  [DependencyInjection] fix @return anno created by PhpDumper
  Fixed the phpdoc of the VoterInterface
  [DoctrineBridge] Fix empty parameter logging in the dbal logger
  Fixed #11675 ValueToDuplicatesTransformer accept "0" value
  check for the correct field type
  fix handling of nullable XML attributes
  [DomCrawler] fix the axes handling in a bc way

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2014-08-26 16:16:33 +02:00
Fabien Potencier
16e3637ec1 Merge branch '2.3' into 2.4
* 2.3:
  [DependencyInjection] fix @return anno created by PhpDumper
  Fixed the phpdoc of the VoterInterface
  [DoctrineBridge] Fix empty parameter logging in the dbal logger
  Fixed #11675 ValueToDuplicatesTransformer accept "0" value
  check for the correct field type
  fix handling of nullable XML attributes
  [DomCrawler] fix the axes handling in a bc way

Conflicts:
	src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
2014-08-26 16:14:58 +02:00
Fabien Potencier
0c44306d34 bug #11756 [DependencyInjection] fix @return anno created by PhpDumper (jakubkulhan)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11756).

Discussion
----------

[DependencyInjection] fix @return anno created by PhpDumper

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

If a generated container is inside namespace, generated @return annos are not valid.

Commits
-------

39c4cc3 [DependencyInjection] fix @return anno created by PhpDumper
2014-08-26 15:05:17 +02:00
Jakub Kulhan
39c4cc387d [DependencyInjection] fix @return anno created by PhpDumper 2014-08-26 15:05:12 +02:00
Fabien Potencier
baf9796adb minor #11758 Fixed the phpdoc of the VoterInterface (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the phpdoc of the VoterInterface

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

``null`` is an accepted value for voters (it is passed when you are not voting on a specific object, for instance for roles.

Commits
-------

b591404 Fixed the phpdoc of the VoterInterface
2014-08-25 17:18:00 +02:00
Christophe Coevoet
b591404bee Fixed the phpdoc of the VoterInterface 2014-08-25 10:05:09 +02:00