merge master in prod

2020-09-08 12:00:45 +02:00
parent b925edaa9e
commit 3e5e731c2c
226 changed files with 8516 additions and 4149 deletions
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 Fabien Potencier
+Copyright (c) 2015-2019 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,7 +16,7 @@ Moved to core since 7.2 (was in the optional XML extension earlier):
 - [`utf8_decode`](https://php.net/utf8_decode)

 Also, it provides a constant added to PHP 7.2:
- [`PHP_OS_FAMILY`](http://php.net/manual/en/reserved.constants.php#constant.php-os-family)
+- [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family)

 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
@@ -25,7 +25,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.9-dev"
+            "dev-master": "1.15-dev"
        }
    }
 }