Commit Graph

24714 Commits

Author SHA1 Message Date
Fabien Potencier
27de563236 bug #17596 [Translation] Add resources from fallback locale to parent catalogue (c960657)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation] Add resources from fallback locale to parent catalogue

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

The resources representing a locale includes those of the fallback locale. However, `getCatalogue()->getResources()` only returns the resources belonging specifically to the selected locale.

Example: The locale `en_GB` falls back to `en`. I use the locale `en_GB`. During development, when I modify the `en_GB` translation file, the changes appear instantly when reloading the page. If I modify the `en` translation file, I need to manually clear the cache in order for the new translation to appear.

I believe this is a regression that was introduced in #15527.

This patch is for the 2.3 branch. For 2.6 and later, the test can be updated to use the getCatalogue() method instead of using ReflectionProperty.

Commits
-------

f7f82fa [Translation] Add resources from fallback locale
2016-01-31 08:53:09 +01:00
Fabien Potencier
9cdb2074ce minor #17620 [FrameworkBundle] fix container cache key generation (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] fix container cache key generation

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

If the actual class name were not taken into, we would not be able to
detect inconsistencies between the different configuration formats (PHP,
YAML, and XML) as the container built based on the first evaluated
configuration format would be cached and reused by tests for the other
formats too.

Commits
-------

29750e5 fix container cache key generation
2016-01-31 08:38:33 +01:00
Fabien Potencier
6232b23591 minor #17617 [Form] fix option name in upgrade file (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] fix option name in upgrade file

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

Commits
-------

0efb137 [Form] fix option name in upgrade file
2016-01-31 08:33:49 +01:00
Fabien Potencier
aadd4b6ed4 minor #17616 [Form] fix option name in changelog (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fix option name in changelog

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

Commits
-------

0c4b636 [Form] fix option name in changelog
2016-01-31 08:33:25 +01:00
Christian Flothmann
29750e51ad fix container cache key generation
If the actual class name were not taken into, we would not be able to
detect inconsistencies between the different configuration formats (PHP,
YAML, and XML) as the container built based on the first evaluated
configuration format would be cached and reused by tests for the other
formats too.
2016-01-30 22:24:39 +01:00
Christian Flothmann
0efb137492 [Form] fix option name in upgrade file 2016-01-30 21:06:33 +01:00
Christian Flothmann
0c4b636c24 [Form] fix option name in changelog 2016-01-30 21:05:11 +01:00
Fabien Potencier
b6767c23dd Merge branch '2.8' into 3.0
* 2.8:
  [2.7] Fix tests
  pass triggerDeprecationError arg to parent class
  remove default null value for asset version
  remove duplicated value
  [Ldap] Remove unused private property
  Update UPGRADE-3.0 with correct Voter details
  Change few occurences of a public setUp() method to protected
  [DependencyInjection] simplify the BC layer
  Change couple of occurences of a public setUp() method to protected
2016-01-30 17:03:33 +01:00
Fabien Potencier
8a95ec5303 Merge branch '2.7' into 2.8
* 2.7:
  [2.7] Fix tests
  pass triggerDeprecationError arg to parent class
  remove default null value for asset version
  remove duplicated value
  [DependencyInjection] simplify the BC layer
  Change couple of occurences of a public setUp() method to protected
2016-01-30 16:58:35 +01:00
Fabien Potencier
8c0b48f6ca bug #17605 [FrameworkBundle] remove default null value for asset version (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] remove default null value for asset version

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

Setting `null` as the version of a package means that it uses the empty
version strategy. However, omitting the `version` option entirely was
meant to fall back to the default version strategy. This is not possible
when the default version value is `null` as there is no way to remove
it.

Commits
-------

25f735f remove default null value for asset version
2016-01-30 16:54:06 +01:00
Fabien Potencier
bd7f4d6b22 minor #17582 [2.7] Fix tests (paradajozsef)
This PR was squashed before being merged into the 2.7 branch (closes #17582).

Discussion
----------

[2.7] Fix tests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Let's see Travis results
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

c8e1384 [2.7] Fix tests
2016-01-30 16:53:21 +01:00
Paráda József
c8e1384b84 [2.7] Fix tests 2016-01-30 16:53:18 +01:00
Fabien Potencier
12bee17ffc bug #17606 [DependencyInjection] pass triggerDeprecationError arg to parent class (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] pass triggerDeprecationError arg to parent class

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17565#discussion_r51100525
| License       | MIT
| Doc PR        |

Commits
-------

350625d pass triggerDeprecationError arg to parent class
2016-01-30 09:55:49 +01:00
Christian Flothmann
350625dd21 pass triggerDeprecationError arg to parent class 2016-01-30 09:46:07 +01:00
Christian Flothmann
25f735f78a remove default null value for asset version
Setting `null` as the version of a package means that it uses the empty
version strategy. However, omitting the `version` option entirely was
meant to fall back to the default version strategy. This is not possible
when the default version value is `null` as there is no way to remove
it.
2016-01-30 09:02:28 +01:00
Fabien Potencier
b6a8ed6bb6 minor #17604 [2.7] [2.8] [3.0] [minor fix] remove duplicated value (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [2.8] [3.0] [minor fix] remove duplicated value

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

Commits
-------

d15c34a remove duplicated value
2016-01-29 18:33:07 +01:00
Jules Pietri
d15c34a51f remove duplicated value 2016-01-29 17:58:49 +01:00
Javier Eguiluz
cb1a921bb9 Fixed the Bootstrap form theme for inlined checkbox/radio 2016-01-29 13:24:08 +01:00
Christian Schmidt
f7f82fa4f2 [Translation] Add resources from fallback locale 2016-01-28 23:38:57 +01:00
Fabien Potencier
5dd453fa26 minor #17581 [Ldap] Remove unused private property (paradajozsef)
This PR was merged into the 2.8 branch.

Discussion
----------

[Ldap] Remove unused private property

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

Commits
-------

e685305 [Ldap] Remove unused private property
2016-01-28 09:49:36 +01:00
Fabien Potencier
2c43532376 bug #16956 [DependencyInjection] XmlFileLoader: enforce tags to have a name (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] XmlFileLoader: enforce tags to have a name

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

Commits
-------

d86a3a7 [DependencyInjection] enforce tags to have a name
2016-01-28 08:04:25 +01:00
Paráda József
e685305292 [Ldap] Remove unused private property 2016-01-27 23:49:30 +01:00
Christian Flothmann
d86a3a7ba3 [DependencyInjection] enforce tags to have a name 2016-01-27 23:29:55 +01:00
Fabien Potencier
0005c560ec minor #17576 [YAML] Refine the return value of Yaml::parse() (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[YAML] Refine the return value of Yaml::parse()

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

Commits
-------

6a806e3 [YAML] Refine the return value of Yaml::parse()
2016-01-27 17:58:40 +01:00
Jakub Zalas
6a806e32b7 [YAML] Refine the return value of Yaml::parse() 2016-01-27 16:53:33 +00:00
Fabien Potencier
5f5f4aa4cf minor #17507 Update UPGRADE-3.0 with correct Voter details (jbafford)
This PR was merged into the 2.8 branch.

Discussion
----------

Update UPGRADE-3.0 with correct Voter details

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

AbstractVoter was removed, but the upgrade instructions to use Voter were not complete and continued to reference AbstractVoter.

Commits
-------

7b2a538 Update UPGRADE-3.0 with correct Voter details
2016-01-27 17:22:37 +01:00
John Bafford
7b2a538236 Update UPGRADE-3.0 with correct Voter details
AbstractVoter was removed, but the upgrade instructions to use Voter were not complete and continued to reference AbstractVoter.
2016-01-27 11:13:44 -05:00
Fabien Potencier
5d3d913404 minor #17567 Change few occurences of a public setUp() method to protected (jakzal)
This PR was merged into the 2.8 branch.

Discussion
----------

Change few occurences of a public setUp() method to protected

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

#17566 for the 2.8 branch. Occurrences fixed in #17566 are not included here.

Commits
-------

0a883a9 Change few occurences of a public setUp() method to protected
2016-01-27 16:33:51 +01:00
Fabien Potencier
528572b764 minor #17565 [DependencyInjection] simplify the BC layer (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] simplify the BC layer

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

The change to the `setFactoryService()` method is consistent with what
we did with the `getFactoryService()` before (and how we handle the
deprecation of strict references in Symfony 2.8).

Commits
-------

6cd5ee3 [DependencyInjection] simplify the BC layer
2016-01-27 16:32:31 +01:00
Fabien Potencier
2ef46b311b minor #17566 Change couple of occurences of a public setUp() method to protected (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

Change couple of occurences of a public setUp() method to protected

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

`setUp()` is a protected method. There's no occurrences on the 2.3 branch.

Commits
-------

5fe7359 Change couple of occurences of a public setUp() method to protected
2016-01-27 16:22:58 +01:00
Jakub Zalas
0a883a94f1 Change few occurences of a public setUp() method to protected 2016-01-27 11:49:43 +00:00
Christian Flothmann
6cd5ee3b26 [DependencyInjection] simplify the BC layer
The change to the `setFactoryService()` method is consistent with what
we did with the `getFactoryService()` before (and how we handle the
deprecation of strict references in Symfony 2.8).
2016-01-27 12:47:27 +01:00
Jakub Zalas
5fe7359659 Change couple of occurences of a public setUp() method to protected 2016-01-27 11:47:13 +00:00
Christian Flothmann
5b30cb7371 [DependencyInjection] fix merge
Remove code from bugfix that deals with features removed in Symfony 3.0.
2016-01-27 12:37:34 +01:00
Christian Flothmann
f204104c3b Merge branch '2.8' into 3.0
* 2.8:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  Fixed HTTP Digest auth not being passed user checker
  resolve aliases in factories
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
  [Form] ArrayChoiceList can now deal with a null in choices
2016-01-27 12:34:55 +01:00
Christian Flothmann
c8d28b1fa6 Merge branch '2.7' into 2.8
* 2.7:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factories
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
  [Form] ArrayChoiceList can now deal with a null in choices
2016-01-27 12:34:40 +01:00
Christian Flothmann
3a027badb7 Merge branch '2.3' into 2.7
* 2.3:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
2016-01-27 12:27:15 +01:00
Fabien Potencier
828fba4e1d fixed CS 2016-01-27 11:46:45 +01:00
Fabien Potencier
7365bc0e84 bug #16265 [BrowserKit] Corrected HTTP_HOST logic (Naktibalda)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16265).

Discussion
----------

[BrowserKit] Corrected HTTP_HOST logic

HTTP_HOST is just a header - it does not override URI,
uri does not override HTTP_HOST header.
If HTTP_HOST is not set then and only then hostname is extracted from uri.

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

Commits
-------

b5f524d [BrowserKit] Corrected HTTP_HOST logic #15398
2016-01-27 11:45:57 +01:00
Gintautas Miselis
b5f524d40b [BrowserKit] Corrected HTTP_HOST logic #15398 2016-01-27 11:45:57 +01:00
Fabien Potencier
786c485883 bug #17559 [SecurityBundle] Fix HTTP Digest auth not being passed user checker (SamFleming)
This PR was merged into the 2.8 branch.

Discussion
----------

[SecurityBundle] Fix HTTP Digest auth not being passed user checker

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

Wasn't sure if this was a bug so posted here http://stackoverflow.com/q/35022776/727236. However, after comparing the 2.3 branch and 2.8 branch I think it was a bug.

When trying to use `http_digest` on Symfony 2.8 you're greeted with the error `Argument 2 passed to Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider::__construct() must be an instance of Symfony\Component\Security\Core\User\UserCheckerInterface`.

The exact same `security.yml` works fine on v2.3.37.

Comparing the branches for the SecurityBundle I found that commit 05be5da1710ab681a04334d58126f8c3d431e3cb added the ability to configure a user checker on a per firewall basis. It seems that this commit seems to have missed updating the HttpDigestFactory (although it did update the other factories such as the [HttpBasicFactory](05be5da171 (diff-5f3e10fcc9de40dd09a8f3df3bdc9316))).

Testing this in my Symfony 2.8 app now works. However, I haven't been able to figure out what unit tests to write confirming this, does anyone with more experience on the SecurityBundle have any pointers?

Commits
-------

517a9a2 Fixed HTTP Digest auth not being passed user checker
2016-01-27 11:43:22 +01:00
Fabien Potencier
72fa3bdda9 minor #17552 Remove invalid CSS white-space value (Triiistan)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove invalid CSS white-space value

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

Commits
-------

03d3182 Remove invalid CSS white-space value
2016-01-27 11:20:13 +01:00
Fabien Potencier
da16d15f13 bug #17554 [DependencyInjection] resolve aliases in factories (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] resolve aliases in factories

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

Commits
-------

fde10e7 resolve aliases in factories
2016-01-27 11:13:36 +01:00
Fabien Potencier
7743eefe18 bug #17555 [DependencyInjection] resolve aliases in factory services (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] resolve aliases in factory services

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

Commits
-------

7702189 resolve aliases in factory services
2016-01-27 11:10:53 +01:00
Sam Fleming
517a9a2aa5 Fixed HTTP Digest auth not being passed user checker
Commit 05be5da1710ab681a04334d58126f8c3d431e3cb added the ability to
configure a user checker on a per firewall basis. However, that commit seems to
have missed updating the HttpDigestFactory.
2016-01-27 10:06:30 +00:00
Christian Flothmann
fde10e799a resolve aliases in factories 2016-01-27 10:00:40 +01:00
Fabien Potencier
8967076e50 bug #17511 [Form] ArrayChoiceList can now deal with a null in choices (issei-m)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] ArrayChoiceList can now deal with a null in choices

re-create for mistaken #17502

---

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

Documentation says, since 2.7, choice value is treated as corresponding item value (if `choices_as_values` option is true). Null as well.

```php
$builder->add('attending', 'choice', array(
    'choices' => array(
        'yes' => true,
        'no' => false,
        'maybe' => null,
    ),
    'choices_as_values' => true,
));
```

But actually null doesn't work as expected since `ArrayChoiceList::getChoicesForValues()` uses `isset` to check whether given value exists in its choices.

It should use `array_key_exists` instead to do so here.

Commits
-------

68292bb [Form] ArrayChoiceList can now deal with a null in choices
2016-01-27 08:59:57 +01:00
Christian Flothmann
7702189cb4 resolve aliases in factory services 2016-01-27 08:57:17 +01:00
Fabien Potencier
025f761798 minor #16986 Fix Filesystem tests on Windows (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix Filesystem tests on Windows

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

PHP's symlink function doesn't support relative symlinks on Windows. Running the filesystem tests in Windows resulted in 2 erroring tests because of this. After this PR, these tests are skipped on Windows.

The error wasn't catched by appveyor, as appveyor doesn't support symlinks at all.

Commits
-------

c376cf3 Fix FileSystem tests on Windows
2016-01-27 08:39:45 +01:00
Fabien Potencier
893fecbe69 Merge branch '2.8' into 3.0
* 2.8:
  [WebProfilerBundle] Don't inherit CSS text-transform property for the toolbar.
  Remove duplicate cursor property
  Increase the inlining YAML level for config:debug
  [Serializer] Minor: fix CS and PHPDoc
  [Form] fix tests
  [Serializer] Ensure that groups are strings
  [Debug] Tell that the extension is for PHP 5 only
  Static code analysis
  Update AnnotationDirectoryLoader.php
  added a test
  Escape the delimiter in Glob::toRegex
  [FrameworkBundle] Fix template location for PHP templates
  [FrameworkBundle] Add path verification to the template parsing test cases
2016-01-27 06:14:46 +01:00