Commit Graph

23200 Commits

Author SHA1 Message Date
Nicolas Grekas c7686a3624 Merge branch '2.3' into 2.7
* 2.3:
  Improved the PHPdoc of FileSystem::copy()
  [Validator] Test DNS Email constraints using checkdnsrr() mock
  [travis] Run real php subprocesses on hhvm for Process component tests
  bug #18161 [Translation] Add support for fuzzy tags in PoFileLoader
  [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers
  [Form] Fix INT64 cast to float in IntegerType.
  [SecurityBundle][PHPDoc] Added method doumentation for SecurityFactoryInterface
  FrameworkBundle: Client: getContainer(): fixed phpdoc
  [Validator] Updating inaccurate docblock comment

Conflicts:
	.travis.yml
	src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
2016-03-16 17:00:15 +01:00
Nicolas Grekas 56624e6a9d minor #18195 Improved the PHPdoc of FileSystem::copy() (javiereguiluz)
This PR was squashed before being merged into the 2.3 branch (closes #18195).

Discussion
----------

Improved the PHPdoc of FileSystem::copy()

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

Commits
-------

9ad67ca Improved the PHPdoc of FileSystem::copy()
2016-03-16 16:52:39 +01:00
Javier Eguiluz 9ad67caea5 Improved the PHPdoc of FileSystem::copy() 2016-03-16 16:52:36 +01:00
Nicolas Grekas 092a42b22c minor #18196 [Validator] Test DNS Email constraints using checkdnsrr() mock (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Test DNS Email constraints using checkdnsrr() mock

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

Commits
-------

165755a [Validator] Test DNS Email constraints using checkdnsrr() mock
2016-03-16 16:51:17 +01:00
Nicolas Grekas 165755a01f [Validator] Test DNS Email constraints using checkdnsrr() mock 2016-03-16 16:47:01 +01:00
Nicolas Grekas 67e9ba0f5b minor #18198 [PhpUnitBridge] Revert 7f62133939 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PhpUnitBridge] Revert 7f62133939

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

Commits
-------

b229351 [PhpUnitBridge] Revert 7f62133939
2016-03-16 16:29:24 +01:00
Nicolas Grekas b2293515a4 [PhpUnitBridge] Revert 7f62133939 2016-03-16 16:22:42 +01:00
Fabien Potencier 54f4f88fa4 minor #18194 [travis] Run real php subprocesses on hhvm for Process component tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Run real php subprocesses on hhvm for Process component tests

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

Let's see if this speeds up hhvm test matrix line.

Commits
-------

c722e35 [travis] Run real php subprocesses on hhvm for Process component tests
2016-03-16 16:03:55 +01:00
Nicolas Grekas c722e35fb3 [travis] Run real php subprocesses on hhvm for Process component tests 2016-03-16 14:40:51 +01:00
Fabien Potencier 4fece28773 bug #18175 [Translation] Add support for fuzzy tags in PoFileLoader (nud)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #18175).

Discussion
----------

[Translation] Add support for fuzzy tags in PoFileLoader

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

The traditional gettext tools usually try to find similar strings when
updating translations. This results in some strings having a translation
but being marked as "fuzzy", even if the translation is not correct.

The expected result when a string is marked as fuzzy is that it should
not be used by the translation system. Using symfony, though, the
translations were used, which could result in "funny" messages being
displayed in the interface despite being often completely out of
context.

This commit discards messages in .po files that have a '#, fuzzy' flag.

This commit can (and imo should) be back-ported as-is to the 2.x branch.

Commits
-------

970b956 bug #18161 [Translation] Add support for fuzzy tags in PoFileLoader
2016-03-15 17:57:16 +01:00
Steve Frécinaux 970b9568b1 bug #18161 [Translation] Add support for fuzzy tags in PoFileLoader
The traditional gettext tools usually try to find similar strings when
updating translations. This results in some strings having a translation
but being marked as "fuzzy", even if the translation is not correct.

The expected result when a string is marked as fuzzy is that it should
not be used by the translation system. Using symfony, though, the
translations were used, which could result in "funny" messages being
displayed in the interface despite being often completely out of
context.

This commit discards messages in .po files that have a '#, fuzzy' flag.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | 18161
| License       | MIT
| Doc PR        | -
2016-03-15 17:57:15 +01:00
Fabien Potencier 67fba7dc1e minor #18139 [FrameworkBundle] Replace kernel.debug with member variable (patrick-mcdougle)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Replace kernel.debug with member variable

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

While digging around I noticed that someone added debug to the constructor, but didn't replace all the `%kernel.debug%` strings. This PR is just to improve consistency.

Technically this could cause a BC break if someone was using a compiler pass to alter the argument of the constructor while the other config was relying on `%kernel.debug%`, but the likelihood of that is probably very low.

Commits
-------

181f256 Use debug member variable
2016-03-15 17:13:25 +01:00
Nicolas Grekas 18615fccf0 bug #18179 [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers (ovrflo, nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers

| Q             | A
| ------------- | ---
| Branch        | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18077, #18067
| License       | MIT
| Doc PR        | -

Commits
-------

03c008c [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers
6b6073f [Form] Fix INT64 cast to float in IntegerType.
2016-03-15 16:48:36 +01:00
Nicolas Grekas 03c008cdbf [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers 2016-03-15 16:37:19 +01:00
Catalin Dan 6b6073f685 [Form] Fix INT64 cast to float in IntegerType. 2016-03-15 16:37:19 +01:00
Nicolas Grekas afd31dae5e minor #18114 [SecurityBundle][PHPDoc] Added method doumentation for SecurityFactor… (aminemat)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #18114).

Discussion
----------

[SecurityBundle][PHPDoc] Added method doumentation for SecurityFactor…

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

Commits
-------

cfb3ea1 [SecurityBundle][PHPDoc] Added method doumentation for SecurityFactoryInterface
2016-03-15 14:44:54 +01:00
Amine Matmati cfb3ea1a5f [SecurityBundle][PHPDoc] Added method doumentation for SecurityFactoryInterface 2016-03-15 14:44:54 +01:00
Nicolas Grekas 668a5f7f1d minor #18168 FrameworkBundle: Client: getContainer(): fixed phpdoc (MacDada)
This PR was merged into the 2.3 branch.

Discussion
----------

FrameworkBundle: Client: getContainer(): fixed phpdoc

| Q             | A
| ------------- | ---
| Branch        | lowest applicable and maintained version
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

The kernel [might be shut down](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/HttpKernel/Kernel.php#L164) and then the method will return null instead of a ContainerInterface object.

---

I've stumbled upon when I was trying to do this in my [test](https://github.com/symfony/framework-bundle/blob/master/Test/WebTestCase.php):

```php
	/**
	 * @var Client|null
	 */
	private static $client;

	public static function tearDownAfterClass()
	{
		$entityManager = $client->getContainer()
			->get('doctrine')
			->getManager();
		// remove entities created by tests
	}

	public function testWhatever()
	{
		self::$client = self::createClient();
		// entities are created
	}
```

`$client->getContainer()` has given me `null` while I was expecting the container, as the PHPDoc say I would. Unpleasant debugging and WTFing.

Commits
-------

7462fa5 FrameworkBundle: Client: getContainer(): fixed phpdoc
2016-03-15 13:57:17 +01:00
Nicolas Grekas a90818546b minor #18113 [Validator] Updating inaccurate docblock comment (natechicago)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Updating inaccurate docblock comment

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

The formatValue() docblock refers to a $prettyDateTime argument, which does not exist.  Instead, it should refer to the $format argument.

I'm also adding parentheses around the `$format & self::OBJECT_TO_STRING` expression on line 102 so it is formatted similarly to the `($format & self::PRETTY_DATE)` expression a few lines above it.

Commits
-------

a784743 [Validator] Updating inaccurate docblock comment
2016-03-15 13:41:46 +01:00
Dawid Nowak 7462fa59b1 FrameworkBundle: Client: getContainer(): fixed phpdoc
The kernel might be shut down and then the method will return null instead of a ContainerInterface object
2016-03-15 11:30:50 +01:00
Fabien Potencier fef2474d4e Merge branch '2.3' into 2.7
* 2.3:
  bumped Symfony version to 2.3.40
  set s-maxage only if all responses are cacheable
  updated VERSION for 2.3.39
  update CONTRIBUTORS for 2.3.39
  updated CHANGELOG for 2.3.39
  Improved the "branch" row of the PR table
  Fix typos #18090 1. PHPs session design to PHP's session design 2. Symfony HttpKernel offers to Symfony's HttpKernel offers 3. in which case it it should to in which case it should
  Fix for Isssue #18091
  replace perfom by perform
  minor #18088 Fix typo for profiler
2016-03-15 07:08:00 +01:00
Fabien Potencier 0f35599858 bug #18164 [HttpKernel] set s-maxage only if all responses are cacheable (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] set s-maxage only if all responses are cacheable

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

Commits
-------

b7d9338 set s-maxage only if all responses are cacheable
2016-03-15 07:00:34 +01:00
Fabien Potencier 8aece06d48 bumped Symfony version to 2.3.40 2016-03-14 22:34:48 +01:00
Christian Flothmann b7d93381a2 set s-maxage only if all responses are cacheable 2016-03-14 17:13:08 +01:00
Fabien Potencier 0451003397 Merge pull request #18153 from fabpot/release-2.3.39
released v2.3.39
2016-03-13 17:38:17 +01:00
Fabien Potencier 1d4f366be0 updated VERSION for 2.3.39 2016-03-13 17:38:02 +01:00
Fabien Potencier a5149ed96a update CONTRIBUTORS for 2.3.39 2016-03-13 17:37:49 +01:00
Fabien Potencier dd3b333924 updated CHANGELOG for 2.3.39 2016-03-13 17:37:42 +01:00
Fabien Potencier 49fc796e3a minor #18151 Improved the "branch" row of the PR table (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Improved the "branch" row of the PR table

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

Commits
-------

6af23cc Improved the "branch" row of the PR table
2016-03-13 12:09:21 +01:00
Javier Eguiluz 6af23ccaaa Improved the "branch" row of the PR table 2016-03-13 12:02:32 +01:00
Nicolas Grekas 8feb12184c bug #18150 [Process] Wait a bit less on Windows (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Wait a bit less on Windows

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

By using `stream_select` instead of `usleep` when the input is at wait, and by not blocking when the process has halted, we can enhance a bit the performance on Windows.

Commits
-------

380a54f [Process] Wait a bit less on Windows
2016-03-13 11:16:27 +01:00
Nicolas Grekas 1da85a2b2d bug #18130 [Debug] Replaced logic for detecting filesystem case sensitivity (Dan Blows)
This PR was squashed before being merged into the 2.7 branch (closes #18130).

Discussion
----------

[Debug] Replaced logic for detecting filesystem case sensitivity

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

When I cloned the master branch onto a Virtualbox Vagrant OSX El Capitan host, Ubuntu Wily guest, the `Symfony\Component\Debug\Tests\DebugClassLoaderTest::testFileCaseMismatch` failed because 'Failed asserting that exception of type "\RuntimeException" is thrown'.

@WouterJ confirmed he got the same problem, and it's because Virtualbox shared folders aren't case sensitive, even when the guest is using a case sensitive filesystem. So I've replaced the logic that looked at the name of the operating system.

I ran the tests in the following environments:
* Virtualbox/Vagrant - OSX Host, Ubuntu guest
* Virtualbox/Vagrant - OSX Host, Windows guest
* OSX native
* Ubuntu native

NB - I _didn't_ run it on native Windows (because I don't have easy access to one).

Commits
-------

2e81b0a [Debug] Replaced logic for detecting filesystem case sensitivity
2016-03-13 11:12:58 +01:00
Dan Blows 2e81b0a944 [Debug] Replaced logic for detecting filesystem case sensitivity 2016-03-13 11:12:56 +01:00
Nicolas Grekas 380a54f987 [Process] Wait a bit less on Windows 2016-03-13 11:06:10 +01:00
Patrick McDougle 181f256949 Use debug member variable 2016-03-12 10:48:57 -08:00
Fabien Potencier 2a2aefa4b7 minor #18119 [Hack Day] Issue for newcomers (2). Replace perfom by perform (JuanLuisGarciaBorrego)
This PR was merged into the 2.3 branch.

Discussion
----------

[Hack Day] Issue for newcomers (2). Replace perfom by perform

| Q             | A
| ------------- | ---
| Branch        | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | #18089
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Commits
-------

f33f192 replace perfom by perform
2016-03-12 18:53:09 +01:00
Fabien Potencier 1dee322033 minor #18121 Rename Choosen to Chosen in ModelChoiceListTest (Koalabaerchen)
This PR was merged into the 2.3 branch.

Discussion
----------

Rename Choosen to Chosen in ModelChoiceListTest

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

Commits
-------

5e4b515 Fix for Isssue #18091
2016-03-12 18:51:32 +01:00
Fabien Potencier 8ab25a3d1d minor #18131 Fix typos #18090 (taiiiraaa)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix typos #18090

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

1. PHPs session design to PHP's session design
2. Symfony HttpKernel offers to Symfony's HttpKernel offers
3. in which case it it should to in which case it should

Commits
-------

6276452 Fix typos #18090 1. PHPs session design to PHP's session design 2. Symfony HttpKernel offers to Symfony's HttpKernel offers 3. in which case it it should to in which case it should
2016-03-12 18:48:28 +01:00
Fabien Potencier 97f2321697 minor #18117 Profiler typo fix (Enleur)
This PR was merged into the 2.3 branch.

Discussion
----------

Profiler typo fix

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

Commits
-------

44398fc minor #18088 Fix typo for profiler
2016-03-12 18:42:35 +01:00
taiiiraaa 6276452592 Fix typos #18090
1. PHPs session design to PHP's session design
2. Symfony HttpKernel offers to Symfony's HttpKernel offers
3. in which case it it should to in which case it should
2016-03-12 16:03:08 +00:00
Koalabaerchen 5e4b515f1b Fix for Isssue #18091 2016-03-12 15:51:44 +01:00
juanluisgarciaborrego f33f1929a2 replace perfom by perform 2016-03-12 15:44:43 +01:00
Enleur 44398fc696 minor #18088 Fix typo for profiler 2016-03-12 21:15:46 +07:00
Nate a784743609 [Validator] Updating inaccurate docblock comment
The formatValue() docblock refers to a $prettyDateTime argument, which does not exist.  Instead, it should refer to the $format argument.
2016-03-11 18:42:00 -06:00
Nicolas Grekas b228378d1f Merge branch '2.3' into 2.7
* 2.3:
  [ci] remove token for composer now that rate limiting is off
2016-03-11 12:18:02 +01:00
Nicolas Grekas fcac5dd87e minor #18104 [ci] remove token for composer now that rate limiting is off (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] remove token for composer now that rate limiting is off

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

As of https://github.com/composer/composer/issues/4884#issuecomment-195229989

Commits
-------

218ff14 [ci] remove token for composer now that rate limiting is off
2016-03-11 12:17:32 +01:00
Nicolas Grekas 218ff14a9b [ci] remove token for composer now that rate limiting is off 2016-03-11 10:22:29 +01:00
Nicolas Grekas def0176e1b Merge branch '2.3' into 2.7
* 2.3:
  [ci] use hirak/prestissimo
  [Filesystem] Fix transient tests
  [HttpFoundation] Avoid warnings when checking malicious IPs
  [HttpFoundation] Set the Content-Range header if the requested Range is unsatisfied

Conflicts:
	appveyor.yml
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
2016-03-10 20:23:56 +01:00
Fabien Potencier db9bb4e003 minor #18100 [ci] use hirak/prestissimo (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] use hirak/prestissimo

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

Commits
-------

adf1ca8 [ci] use hirak/prestissimo
2016-03-10 19:18:23 +01:00
Nicolas Grekas adf1ca8e90 [ci] use hirak/prestissimo 2016-03-10 17:50:02 +01:00