Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2405d84

Browse filesBrowse files
maidmaidmaidmaid
authored
Merge branch 'master' into userprocessor
2 parents 76ac3fd + 3de0d9b commit 2405d84
Copy full SHA for 2405d84

File tree

2,922 files changed

+69543
-22627
lines changed
Filter options

Some content is hidden

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

2,922 files changed

+69543
-22627
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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
5-
| New feature? | yes/no
5+
| New feature? | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
66
| BC breaks? | yes/no
7-
| Deprecations? | yes/no
7+
| Deprecations? | yes/no <!-- don't forget updating UPGRADE-*.md files -->
88
| Tests pass? | yes/no
99
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
1010
| License | MIT

‎.github/build-packages.php

Copy file name to clipboardExpand all lines: .github/build-packages.php
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,20 @@
4343
echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
4444
exit(1);
4545
}
46-
$package->version = str_replace('-dev', '.999', $package->extra->{'branch-alias'}->{'dev-master'});
46+
$package->version = str_replace('-dev', '.x-dev', $package->extra->{'branch-alias'}->{'dev-master'});
4747
$package->dist['type'] = 'tar';
4848
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
4949

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

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

55-
foreach ($versions->package->versions as $v => $package) {
55+
if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
56+
unset($versions->{'dev-master'});
57+
}
58+
59+
foreach ($versions as $v => $package) {
5660
$packages[$package->name] += array($v => $package);
5761
}
5862
}

‎.php_cs.dist

Copy file name to clipboardExpand all lines: .php_cs.dist
+15-13Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,36 @@ return PhpCsFixer\Config::create()
66
'@Symfony:risky' => true,
77
'array_syntax' => array('syntax' => 'long'),
88
'no_unreachable_default_argument_value' => false,
9+
'braces' => array('allow_single_line_closure' => true),
910
'heredoc_to_nowdoc' => false,
11+
'phpdoc_annotation_without_dot' => false,
1012
))
1113
->setRiskyAllowed(true)
1214
->setFinder(
1315
PhpCsFixer\Finder::create()
14-
->in(__DIR__)
16+
->in(__DIR__.'/src')
1517
->exclude(array(
1618
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
17-
'src/Symfony/Component/DependencyInjection/Tests/Fixtures',
18-
'src/Symfony/Component/Routing/Tests/Fixtures/dumper',
19+
'Symfony/Component/DependencyInjection/Tests/Fixtures',
20+
'Symfony/Component/Routing/Tests/Fixtures/dumper',
1921
// fixture templates
20-
'src/Symfony/Component/Templating/Tests/Fixtures/templates',
21-
'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',
2224
// generated fixtures
23-
'src/Symfony/Component/VarDumper/Tests/Fixtures',
25+
'Symfony/Component/VarDumper/Tests/Fixtures',
2426
// resource templates
25-
'src/Symfony/Bundle/FrameworkBundle/Resources/views/Form',
27+
'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
2628
))
2729
// file content autogenerated by `var_export`
28-
->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
30+
->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
2931
// autogenerated xmls
30-
->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_1.xml')
31-
->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')
3234
// yml
33-
->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
35+
->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
3436
// test template
35-
->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')
3638
// explicit heredoc test
37-
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
39+
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
3840
)
3941
;

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+12-8Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
matrix:
2121
include:
2222
# Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
23-
- php: hhvm-3.15
23+
- php: hhvm-3.18
2424
sudo: required
2525
dist: trusty
2626
group: edge
@@ -38,6 +38,7 @@ cache:
3838
- php-$MIN_PHP
3939

4040
services:
41+
- memcached
4142
- mongodb
4243
- redis-server
4344

@@ -55,12 +56,13 @@ before_install:
5556
- if [[ ! $skip ]]; then echo memory_limit = -1 >> $INI_FILE; fi
5657
- if [[ ! $skip ]]; then echo session.gc_probability = 0 >> $INI_FILE; fi
5758
- if [[ ! $skip ]]; then echo opcache.enable_cli = 1 >> $INI_FILE; fi
59+
- if [[ ! $skip ]]; then echo hhvm.jit = 0 >> $INI_FILE; fi
5860
- if [[ ! $skip && $PHP = 5.* ]]; then echo extension = mongo.so >> $INI_FILE; fi
5961
- if [[ ! $skip && $PHP = 5.* ]]; then echo extension = memcache.so >> $INI_FILE; fi
6062
- if [[ ! $skip && $PHP = 5.* ]]; then (echo yes | pecl install -f apcu-4.0.11 && echo apc.enable_cli = 1 >> $INI_FILE); fi
6163
- if [[ ! $skip && $PHP = 7.* ]]; then (echo yes | pecl install -f apcu-5.1.6 && echo apc.enable_cli = 1 >> $INI_FILE); fi
6264
- if [[ ! $deps && $PHP = 5.* ]]; then (cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> $INI_FILE); fi
63-
- if [[ ! $skip && $PHP = 5.* ]]; then pecl install -f memcached-2.1.0; fi
65+
- if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = memcached.so >> $INI_FILE; fi
6466
- if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = ldap.so >> $INI_FILE; fi
6567
- if [[ ! $skip && ! $PHP = hhvm* ]]; then echo extension = redis.so >> $INI_FILE; fi;
6668
- if [[ ! $skip && ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
@@ -86,16 +88,18 @@ install:
8688
- if [[ ! $skip && $deps ]]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
8789
- if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
8890
- if [[ ! $skip ]]; then composer update; fi
89-
- if [[ ! $skip ]]; then COMPOSER_ROOT_VERSION= ./phpunit install; fi
91+
- if [[ ! $skip ]]; then ./phpunit install; fi
9092
- if [[ ! $skip && ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
9193

9294
script:
95+
- REPORT=' && echo -e "\\e[32mOK\\e[0m {}\\n\\n" || (echo -e "\\e[41mKO\\e[0m {}\\n\\n" && $(exit 1))'
9396
- if [[ $skip ]]; then echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"; fi
94-
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi
97+
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'"$REPORT"; fi
9598
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi
9699
- if [[ ! $deps && $PHP = hhvm* ]]; then $PHPUNIT --exclude-group benchmark,intl-data; fi
97-
- 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
98-
- if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi
99-
- 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'; fi
100+
- 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
101+
- 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
102+
- 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
100103
# Test the PhpUnit bridge using the original phpunit script
101-
- if [[ $deps = low ]]; then (cd src/Symfony/Bridge/PhpUnit && phpenv global 5.3 && php --version && composer update && phpunit); fi
104+
- if [[ $deps = low ]]; then (cd src/Symfony/Bridge/PhpUnit && wget https://phar.phpunit.de/phpunit-4.8.phar); fi
105+
- if [[ $deps = low ]]; then (cd src/Symfony/Bridge/PhpUnit && phpenv global 5.3 && php --version && composer update && php phpunit-4.8.phar); fi

‎CHANGELOG-3.1.md

Copy file name to clipboardExpand all lines: CHANGELOG-3.1.md
+46Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,52 @@ in 3.1 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
99

10+
* 3.1.9 (2017-01-12)
11+
12+
* bug #21218 [Form] DateTimeToLocalizedStringTransformer does not use timezone when using date only (magnetik)
13+
* bug #20605 [Ldap] Always have a valid connection when using the EntryManager (bobvandevijver)
14+
* bug #21104 [FrameworkBundle] fix IPv6 address handling in server commands (xabbuh)
15+
* bug #20793 [Validator] Fix caching of constraints derived from non-serializable parents (uwej711)
16+
* bug #19586 [TwigBundle] Fix bug where namespaced paths don't take parent bundles in account (wesleylancel)
17+
* bug #21237 [FrameworkBundle] Fix relative paths used as cache keys (nicolas-grekas)
18+
* bug #21183 [Validator] respect groups when merging constraints (xabbuh)
19+
* bug #21179 [TwigBundle] Fixing regression in TwigEngine exception handling (Bertalan Attila)
20+
* bug #21220 [DI] Fix missing new line after private alias (ogizanagi)
21+
* bug #21211 Classloader tmpname (lyrixx)
22+
* bug #21205 [TwigBundle] fixed usage when Templating is not installed (fabpot)
23+
* bug #21155 [Validator] Check cascasdedGroups for being countable (scaytrase)
24+
* bug #21200 [Filesystem] Check that directory is writable after created it in dumpFile() (chalasr)
25+
* bug #21165 [Serializer] int is valid when float is expected when deserializing JSON (dunglas)
26+
* bug #21166 [Cache] Fix order of writes in ChainAdapter (nicolas-grekas)
27+
* bug #21113 [FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure (chalasr)
28+
* bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)
29+
* bug #20925 [HttpFoundation] Validate/cast cookie expire time (ro0NL)
30+
* bug #21032 [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService (lyrixx)
31+
* bug #21078 [Console] Escape default value when dumping help (lyrixx)
32+
* bug #21076 [Console] OS X Can't call cli_set_process_title php without superuser (ogizanagi)
33+
* bug #20900 [Console] Descriptors should use Helper::strlen (ogizanagi)
34+
* bug #21025 [Cache] remove is_writable check on filesystem cache (4rthem)
35+
* bug #21064 [Debug] Wrap call to ->log in a try catch block (lyrixx)
36+
* bug #21010 [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes (SpacePossum)
37+
* bug #20991 [cache] Bump RedisAdapter default timeout to 5s (Nicofuma)
38+
* bug #20859 Avoid warning in PHP 7.2 because of non-countable data (wouterj)
39+
* bug #21053 [Validator] override property constraints in child class (xabbuh)
40+
* bug #21034 [FrameworkBundle] Make TemplateController working without the Templating component (dunglas)
41+
* bug #20970 [Console] Fix question formatting using SymfonyStyle::ask() (chalasr, ogizanagi)
42+
* bug #20999 [HttpKernel] Continuation of #20599 for 3.1 (ro0NL)
43+
* bug #20975 [Form] fix group sequence based validation (xabbuh)
44+
* bug #20599 [WebProfilerBundle] Display multiple HTTP headers in WDT (ro0NL)
45+
* bug #20799 [TwigBundle] do not try to register incomplete definitions (xabbuh)
46+
* bug #20961 [Validator] phpize default option values (xabbuh)
47+
* bug #20934 [FrameworkBundle] Fix PHP form templates on translatable attributes (ro0NL)
48+
* bug #20957 [FrameworkBundle] test for the Validator component to be present (xabbuh)
49+
* bug #20936 [DependencyInjection] Fix on-invalid attribute type in xsd (ogizanagi)
50+
* bug #20931 [VarDumper] Fix dumping by-ref variadics (nicolas-grekas)
51+
* bug #20734 [Security] AbstractVoter->supportsAttribute gives false positive if attribute is zero (0) (martynas-foodpanda)
52+
* bug #14082 [config] Fix issue when key removed and left value only (zerustech)
53+
* bug #20910 [HttpFoundation] Fix cookie to string conversion for raw cookies (ro0NL)
54+
* bug #20847 [Console] fixed BC issue with static closures (araines)
55+
1056
* 3.1.8 (2016-12-13)
1157

1258
* bug #20714 [FrameworkBundle] Fix unresolved parameters from default configs in debug:config (chalasr)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.