Skip to content

Commit 96e194c

Browse files
peter-gribanovpeter-gribanov
authored
Merge pull request #1 from symfony/master
Update master
2 parents 7a9eb2c + 332ad0a commit 96e194c

File tree

2,846 files changed

+44958
-31442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,846 files changed

+44958
-31442
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 3.4 or master / 2.7, 2.8 or 3.3 <!-- see comment below -->
3+
| Branch? | master for features / 2.7 up to 4.0 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
5-
| New feature? | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
5+
| New feature? | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
66
| BC breaks? | yes/no
7-
| Deprecations? | yes/no <!-- don't forget updating UPGRADE-*.md files -->
7+
| Deprecations? | yes/no <!-- don't forget to update UPGRADE-*.md files -->
88
| Tests pass? | yes/no
99
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
1010
| License | MIT
@@ -13,8 +13,6 @@
1313
<!--
1414
- Bug fixes must be submitted against the lowest branch where they apply
1515
(lowest branches are regularly merged to upper ones so they get the fixes too).
16-
- Features and deprecations must be submitted against the 3.4,
17-
legacy code removals go to the master branch.
18-
- Please fill in this template according to the PR you're about to submit.
16+
- Features and deprecations must be submitted against the master branch.
1917
- Replace this comment by a description of what your PR is solving.
2018
-->

‎.github/build-packages.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949

5050
$packages[$package->name][$package->version] = $package;
5151

52-
$versions = file_get_contents('https://packagist.org/packages/'.$package->name.'.json');
53-
$versions = json_decode($versions)->package->versions;
52+
$versions = file_get_contents('https://packagist.org/p/'.$package->name.'.json');
53+
$versions = json_decode($versions)->packages->{$package->name};
5454

5555
if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
5656
unset($versions->{'dev-master'});

‎.php_cs.dist

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ return PhpCsFixer\Config::create()
88
->setRules(array(
99
'@Symfony' => true,
1010
'@Symfony:risky' => true,
11+
'@PHPUnit48Migration:risky' => true,
12+
'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
1113
'array_syntax' => array('syntax' => 'long'),
1214
'protected_to_private' => false,
1315
))
@@ -30,16 +32,13 @@ return PhpCsFixer\Config::create()
3032
))
3133
// file content autogenerated by `var_export`
3234
->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
33-
// autogenerated xmls
34-
->notPath('Symfony/Component/Console/Tests/Fixtures/application_1.xml')
35-
->notPath('Symfony/Component/Console/Tests/Fixtures/application_2.xml')
36-
// yml
37-
->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
3835
// test template
3936
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
4037
// explicit heredoc test
4138
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
42-
// purposefully invalid JSON
43-
->notPath('Symfony/Component/Asset/Tests/fixtures/manifest-invalid.json')
39+
// explicit trigger_error tests
40+
->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt')
41+
->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt')
42+
->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
4443
)
4544
;

‎.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ addons:
1616
env:
1717
global:
1818
- MIN_PHP=7.1.3
19-
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/7.1/bin/php
19+
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
2020

2121
matrix:
2222
include:
2323
- php: 7.1.3
2424
- php: 7.1
2525
env: deps=high
26-
- php: 7.1
26+
- php: 7.2
2727
env: deps=low
28+
2829
fast_finish: true
2930

3031
cache:

‎CHANGELOG-3.0.md

-566
This file was deleted.

‎CHANGELOG-3.1.md

-478
This file was deleted.

‎CHANGELOG-3.2.md

-643
This file was deleted.

‎CHANGELOG-3.3.md

-561
This file was deleted.

‎CHANGELOG-4.0.md

+570
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)