Commit Graph

646 Commits

Author SHA1 Message Date
Nicolas Grekas 6d1f8c8c2b Merge branch '4.4' into 5.2
* 4.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with
2021-07-21 14:38:00 +02:00
Alexander M. Turek e585b26730 Leverage str_contains/str_starts_with
Signed-off-by: Alexander M. Turek <me@derrabus.de>
2021-07-21 14:19:41 +02:00
Alexander M. Turek 5ec14aa468 Merge branch '4.4' into 5.2
* 4.4:
  Indicate compatibility with psr/log 2 and 3

Signed-off-by: Alexander M. Turek <me@derrabus.de>
2021-07-18 17:21:43 +02:00
Alexander M. Turek d2209ec8dd Indicate compatibility with psr/log 2 and 3
Signed-off-by: Alexander M. Turek <me@derrabus.de>
2021-07-18 16:08:08 +02:00
Alexander M. Turek 174efe8b08 Merge branch '4.4' into 5.2
* 4.4:
  [Messenger] Fix merging PrototypedArrayNode associative values
2021-05-22 21:53:56 +02:00
Alexander M. Turek 53d9b105a0 bug #39847 [Messenger] Fix merging PrototypedArrayNode associative values (svityashchuk)
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

[Messenger] Fix merging PrototypedArrayNode associative values

Now keys will not be considered as irrelevant.

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #39846, fix #36874
| License       | MIT
| Doc PR        |

The problem was because in ConfigTree `options` are defined as `arrayNode` and has a `prototype('variable')`. So for combining config together `PrototypedArrayNode::mergeValues()` was called. And there was a trouble - for that `PrototypedArrayNode` `$rightSide` values were added without keys:

`\Symfony\Component\Config\Definition\PrototypedArrayNode::mergeValues`
```php
foreach ($rightSide as $k => $v) {
    // prototype, and key is irrelevant, append the element
    if (null === $this->keyAttribute) {
        $leftSide[] = $v;
        continue;
    }
```

Commits
-------

11128c9c0b [Messenger] Fix merging PrototypedArrayNode associative values
2021-05-22 21:45:48 +02:00
Oleksii Svitiashchuk 11128c9c0b [Messenger] Fix merging PrototypedArrayNode associative values 2021-05-22 21:45:39 +02:00
Alexander M. Turek 5b4a695ead Merge branch '4.4' into 5.2
* 4.4:
  doctrine/doctrine-bundle should not be a dep
2021-05-20 15:36:37 +02:00
Nicolas Grekas e006eaf26a doctrine/doctrine-bundle should not be a dep 2021-05-20 15:25:36 +02:00
Alexander M. Turek 0c8234b50c Merge branch '4.4' into 5.2
* 4.4:
  Fix deprecations from Doctrine Annotations+Cache
2021-05-17 21:35:40 +02:00
Alexander M. Turek ec51c21a9d Fix deprecations from Doctrine Annotations+Cache 2021-05-16 23:41:25 +02:00
Alexander M. Turek 16bacb1b27 Merge branch '4.4' into 5.2
* 4.4:
  Update translations for Norwegian Nynorsk (nn) #38756
  Fix eventListener initialization when eventSubscriber constructor dispatch an event
  clear unchecked choice radio boxes even if clear missing is set to false
  [ErrorHandler] Added missing type annotations to FlattenException
  [TwigBridge] Allow version 3 of the Twig extra packages
  Fix FrameworkBundle PropertyAccess definition when not in debug
2021-03-10 23:10:15 +01:00
Alexander M. Turek 61b0be9564 [TwigBridge] Allow version 3 of the Twig extra packages 2021-03-07 20:47:33 +01:00
Alexander M. Turek ce8be3c079 Merge branch '4.4' into 5.2
* 4.4:
  Allow egulias/email-validator 3.x
2021-03-07 17:08:20 +01:00
Alexander M. Turek 3beeadb0c3 Allow egulias/email-validator 3.x 2021-03-07 16:14:50 +01:00
Nicolas Grekas 839c7a1108 minor #40093 Always autoload string functions on symfony/symfony (chalasr)
This PR was merged into the 5.2 branch.

Discussion
----------

Always autoload string functions on symfony/symfony

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Autoloading these functions only in dev make them undefined for projects still using symfony/symfony, which causes troubles when upgrading to 5.2 (e.g. easyadmin uses `u()`).

Commits
-------

b3ca21c4ba Always autoload string functions on symfony/symfony
2021-02-06 09:57:39 +01:00
Nicolas Grekas 6f16e833bd Merge branch '4.4' into 5.2
* 4.4:
  Fix "provide" declarations
2021-02-06 09:56:29 +01:00
Nicolas Grekas 36e5051171 Fix "provide" declarations 2021-02-06 09:54:26 +01:00
Nicolas Grekas 6891550582 Merge branch '4.4' into 5.2
* 4.4:
  Provide implemented packages of replaced dependencies
2021-02-06 09:52:42 +01:00
Simon Berger 57d9a818bb Provide implemented packages of replaced dependencies 2021-02-06 09:48:04 +01:00
Nicolas Grekas a8fc934907 Merge branch '4.4' into 5.2
* 4.4:
  Allow psr/cache v2
  [DeprecationErrorHandler] Fix tests
2021-02-04 18:52:36 +01:00
Nicolas Grekas 00d3a0ffcb Allow psr/cache v2 2021-02-04 18:34:20 +01:00
Robin Chalas b3ca21c4ba Always autoload string functions on symfony/symfony 2021-02-04 15:23:18 +01:00
Nicolas Grekas 8449d8a328 fix merge 2021-01-27 17:33:13 +01:00
Nicolas Grekas 438a865be6 Merge branch '4.4' into 5.2
* 4.4:
  Replace "branch-version" by "versions" in composer.json
  Bump Symfony version to 4.4.20
  Update VERSION for 4.4.19
  Update CONTRIBUTORS for 4.4.19
  Update CHANGELOG for 4.4.19
2021-01-27 17:27:53 +01:00
Nicolas Grekas b40e71f096 Replace "branch-version" by "versions" in composer.json 2021-01-27 17:22:20 +01:00
Nicolas Grekas 106c693c48 Merge branch '5.1' into 5.2
* 5.1:
  µCS fix
  CS fix
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Add me as a Notifier code owner
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  Make EmailMessage & SmsMessage transport nullable
  remove unused argument
  [DI] fix param annotation
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param
2021-01-14 16:42:36 +01:00
Nicolas Grekas 41a7eaa654 Merge branch '4.4' into 5.1
* 4.4:
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  [DI] fix param annotation
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param
2021-01-14 16:25:38 +01:00
Nicolas Grekas 7f5ea78fb8 [travis] use PHP 8.0 to patch return types and run deps=low 2021-01-14 15:31:07 +01:00
Christian Flothmann 5b9e187631 Merge branch '5.1' into 5.2
* 5.1:
  harden test to not depend on the actual time
  [ProxyManager] fix tests
  actually compare the order of entries when any sorting is applied
  Dump abstract arguments
2021-01-04 13:41:39 +01:00
Christian Flothmann 74d8fb897a Merge branch '4.4' into 5.1
* 4.4:
  harden test to not depend on the actual time
  [ProxyManager] fix tests
  actually compare the order of entries when any sorting is applied
2021-01-04 13:34:36 +01:00
Nicolas Grekas 5ec2a252ee [ProxyManager] fix tests 2021-01-04 12:30:20 +01:00
Nicolas Grekas b53600d89b Merge branch '5.1' into 5.2
* 5.1:
  [Security] Fix event propagation for globally registered security events
  Add missing `@return` annotations to fix deprecations on PHP 8
  [ProxyManagerBridge] fix PHP notice, switch to "friendsofphp/proxy-manager-lts"
2020-12-23 16:38:30 +01:00
Nicolas Grekas c1cb43e2c2 Merge branch '4.4' into 5.1
* 4.4:
  Add missing `@return` annotations to fix deprecations on PHP 8
  [ProxyManagerBridge] fix PHP notice, switch to "friendsofphp/proxy-manager-lts"
2020-12-23 16:26:14 +01:00
Nicolas Grekas 389f5304c7 [ProxyManagerBridge] fix PHP notice, switch to "friendsofphp/proxy-manager-lts" 2020-12-22 17:08:05 +01:00
Grégoire Paris 574a184b9a
Require doctrine/persistence 2
This allows us to remove autoload calls that are necessary for the
persistence 1 backwards-compatibility layer to work.
The require-dev constraints on doctrine/orm are bumped to ^2.7.3 because
lower versions are not compatible with doctrine/persistence 2.
2020-11-20 09:22:35 +01:00
Nicolas Grekas c0d4ed0c3e Bump branch-version 2020-11-11 12:27:31 +01:00
Nicolas Grekas 5bf6bbe96c Merge branch '5.1' into 5.x
* 5.1:
  [Process] Dont test TTY if there is no TTY support
  Fixing some Mongolian
  translating the validators for european portuguese language
  Fix CI
  Update validators.he.xlf
  Update security.he.xlf
  Update validators.he.xlf
  Improve performances in CircualReference detection
  [PHPUnitBridge] Fixed crash on Windows with PHP 8
  Fix session called initized several time
2020-11-02 16:47:15 +01:00
Alexander M. Turek 0fee41a617 Merge branch '5.1' into 5.x 2020-10-28 22:46:03 +01:00
Alexander M. Turek 294cffea25 Merge branch '4.4' into 5.1 2020-10-28 22:31:18 +01:00
Grégoire Paris ed80bcc82c
Remove dependency on doctrine/reflection
That package is being phased out, and there are good chances that the
classes involved at runtime are completely different from the classes
involved in the test changed in that commit. That test was the only
piece of code I could find still referencing the
Doctrine\Common\Reflection namespace.
2020-10-28 19:09:12 +01:00
Nicolas Grekas c417fd700a Merge branch '5.1' into 5.x
* 5.1:
  Disable platform checks
  Put branch-version in the source for CI
  Bump default PHPUnit version for PHP 8 to 9.4.
2020-10-24 17:54:31 +02:00
Nicolas Grekas 50a61b5392 Merge branch '4.4' into 5.1
* 4.4:
  Disable platform checks
  Put branch-version in the source for CI
  Bump default PHPUnit version for PHP 8 to 9.4.
2020-10-24 17:53:55 +02:00
Nicolas Grekas 138f611f75 Merge branch '3.4' into 4.4
* 3.4:
  Put branch-version in the source for CI
2020-10-24 17:45:11 +02:00
Nicolas Grekas 008f2da031 Put branch-version in the source for CI 2020-10-24 17:39:57 +02:00
Nicolas Grekas 605a5674a8 Merge branch '5.1' into 5.x
* 5.1:
  fix merge
  fix merge
  Remove branch-version (keep them for contracts only)
  [HttpClient] relax auth bearer format requirements
  [PHPUnitBridge] Silence errors from mkdir()
  [DependencyInjection] Preload classes with union types correctly.
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  [TwigBridge] Remove "transchoice" from the code base
  Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait
  Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill
  [String] fix before/after[Last]() returning the empty string instead of the original one on non-match
  Add missing exporter function for PHPUnit 7
  [Validator] Add missing romanian translations
  [String] fix slicing in UnicodeString
  [Cache] Use correct expiry in ChainAdapter
  do not translate null placeholders or titles
2020-10-24 14:08:07 +02:00
Nicolas Grekas 65f2620bc4 Merge branch '4.4' into 5.1
* 4.4:
  fix merge
  Remove branch-version (keep them for contracts only)
  [HttpClient] relax auth bearer format requirements
  [PHPUnitBridge] Silence errors from mkdir()
  [DependencyInjection] Preload classes with union types correctly.
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait
  Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill
  Add missing exporter function for PHPUnit 7
  [Validator] Add missing romanian translations
  [Cache] Use correct expiry in ChainAdapter
  do not translate null placeholders or titles
2020-10-24 14:01:57 +02:00
Nicolas Grekas 77aa17401d Merge branch '3.4' into 4.4
* 3.4:
  Remove branch-version (keep them for contracts only)
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  [Validator] Add missing romanian translations
  do not translate null placeholders or titles
2020-10-24 13:50:19 +02:00
Nicolas Grekas f8fe4bf9f5 Remove branch-version (keep them for contracts only) 2020-10-24 12:57:07 +02:00
Nicolas Grekas 01b064d97a Merge branch '5.1' into 5.x
* 5.1:
  Fix branch-version
2020-10-13 15:22:54 +02:00