Skip to content

Commit d1707ac

Browse files
MyDigitalLifeMyDigitalLife
authored
Merge branch '3.4' into UrlValidatorBug
2 parents eacf93d + f617882 commit d1707ac

File tree

3,201 files changed

+122963
-77747
lines changed

Some content is hidden

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

3,201 files changed

+122963
-77747
lines changed

‎.php_cs.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,7 @@ return PhpCsFixer\Config::create()
3939
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
4040
// explicit heredoc test
4141
->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')
4244
)
4345
;

‎.travis.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,24 @@ addons:
1010
apt_packages:
1111
- parallel
1212
- language-pack-fr-base
13+
- ldap-utils
14+
- slapd
1315

1416
env:
1517
global:
16-
- MIN_PHP=5.4.9
18+
- MIN_PHP=5.5.9
1719
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
1820

1921
matrix:
2022
include:
2123
- php: hhvm-3.18
2224
sudo: required
2325
group: edge
24-
- php: 5.4
2526
- php: 5.5
2627
- php: 5.6
27-
- php: 7.0
28-
env: deps=high
2928
- php: 7.1
29+
env: deps=high
30+
- php: 7.0
3031
env: deps=low
3132
fast_finish: true
3233

@@ -35,12 +36,17 @@ cache:
3536
- .phpunit
3637
- php-$MIN_PHP
3738

38-
services: mongodb
39+
services:
40+
- memcached
41+
- mongodb
42+
- redis-server
3943

4044
before_install:
4145
- |
4246
# General configuration
4347
stty cols 120
48+
mkdir /tmp/slapd
49+
slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 &
4450
PHP=$TRAVIS_PHP_VERSION
4551
[ -d ~/.composer ] || mkdir ~/.composer
4652
cp .composer/* ~/.composer/
@@ -96,6 +102,8 @@ before_install:
96102
echo opcache.enable_cli = 1 >> $INI
97103
echo hhvm.jit = 0 >> $INI
98104
echo apc.enable_cli = 1 >> $INI
105+
echo extension = redis.so >> $INI
106+
echo extension = memcached.so >> $INI
99107
[[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
100108
if [[ $PHP = 5.* ]]; then
101109
echo extension = mongo.so >> $INI
@@ -122,12 +130,18 @@ before_install:
122130
# Install extra PHP extensions
123131
if [[ ! $skip && $PHP = 5.* ]]; then
124132
([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
125-
tfold ext.memcached pecl install -f memcached-2.1.0 &&
126133
tfold ext.apcu4 'echo yes | pecl install -f apcu-4.0.11'
127134
elif [[ ! $skip && $PHP = 7.* ]]; then
128135
tfold ext.apcu5 'echo yes | pecl install -f apcu-5.1.6'
129136
fi
130137
138+
- |
139+
# Load fixtures
140+
if [[ ! $skip ]]; then
141+
ldapadd -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/base.ldif &&
142+
ldapadd -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/fixtures.ldif
143+
fi
144+
131145
install:
132146
- |
133147
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
@@ -185,7 +199,7 @@ install:
185199
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
186200
tfold tty-group $PHPUNIT --group tty
187201
if [[ $PHP = ${MIN_PHP%.*} ]]; then
188-
echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"
202+
echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"
189203
fi
190204
fi
191205
}

‎CHANGELOG-2.2.md

Lines changed: 0 additions & 352 deletions
This file was deleted.

‎CHANGELOG-2.3.md

Lines changed: 0 additions & 1056 deletions
This file was deleted.

‎CHANGELOG-2.4.md

Lines changed: 0 additions & 401 deletions
This file was deleted.

‎CHANGELOG-2.5.md

Lines changed: 0 additions & 362 deletions
This file was deleted.

‎CHANGELOG-2.6.md

Lines changed: 0 additions & 334 deletions
This file was deleted.

‎CHANGELOG-2.7.md

Lines changed: 0 additions & 1095 deletions
This file was deleted.

‎CHANGELOG-2.8.md

Lines changed: 0 additions & 1006 deletions
This file was deleted.

‎CHANGELOG-3.0.md

Lines changed: 566 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)