Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 167d6b7

Browse files
GuilhemNGuilhemN
authored
Merge branch 'master' into TAGS2
2 parents 67c4ee3 + 554b1a7 commit 167d6b7

File tree

419 files changed

+11598
-3373
lines changed

Some content is hidden

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

419 files changed

+11598
-3373
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | master / 2.7, 2.8, 3.1 or 3.2 <!--see comment below-->
3+
| Branch? | master / 2.7, 2.8 or 3.2 <!--see comment below-->
44
| Bug fix? | yes/no
55
| New feature? | yes/no
66
| BC breaks? | yes/no

‎.php_cs.dist

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,34 @@ return PhpCsFixer\Config::create()
88
'no_unreachable_default_argument_value' => false,
99
'braces' => array('allow_single_line_closure' => true),
1010
'heredoc_to_nowdoc' => false,
11+
'phpdoc_annotation_without_dot' => false,
1112
))
1213
->setRiskyAllowed(true)
1314
->setFinder(
1415
PhpCsFixer\Finder::create()
15-
->in(__DIR__)
16+
->in(__DIR__.'/src')
1617
->exclude(array(
1718
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
18-
'src/Symfony/Component/DependencyInjection/Tests/Fixtures',
19-
'src/Symfony/Component/Routing/Tests/Fixtures/dumper',
19+
'Symfony/Component/DependencyInjection/Tests/Fixtures',
20+
'Symfony/Component/Routing/Tests/Fixtures/dumper',
2021
// fixture templates
21-
'src/Symfony/Component/Templating/Tests/Fixtures/templates',
22-
'src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
22+
'Symfony/Component/Templating/Tests/Fixtures/templates',
23+
'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
2324
// generated fixtures
24-
'src/Symfony/Component/VarDumper/Tests/Fixtures',
25+
'Symfony/Component/VarDumper/Tests/Fixtures',
2526
// resource templates
26-
'src/Symfony/Bundle/FrameworkBundle/Resources/views/Form',
27+
'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
2728
))
2829
// file content autogenerated by `var_export`
29-
->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
30+
->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
3031
// autogenerated xmls
31-
->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_1.xml')
32-
->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_2.xml')
32+
->notPath('Symfony/Component/Console/Tests/Fixtures/application_1.xml')
33+
->notPath('Symfony/Component/Console/Tests/Fixtures/application_2.xml')
3334
// yml
34-
->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
35+
->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
3536
// test template
36-
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
37+
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
3738
// explicit heredoc test
38-
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
39+
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
3940
)
4041
;

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ script:
9696
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'"$REPORT"; fi
9797
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi
9898
- if [[ ! $deps && $PHP = hhvm* ]]; then $PHPUNIT --exclude-group benchmark,intl-data; fi
99-
- if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
99+
- if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
100100
- if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY"$REPORT"; fi
101101
- if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'"$REPORT"; fi
102102
# Test the PhpUnit bridge using the original phpunit script

0 commit comments

Comments
 (0)