Skip to content

Commit b2422ed

Browse files
committed
Merge pull request #119 from symfony-cmf/remove_csrf_protection
no longer enable csrf protection
2 parents ff4df16 + 8833b97 commit b2422ed

File tree

3 files changed

+13
-28
lines changed

3 files changed

+13
-28
lines changed

.travis.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.3
54
- 5.4
65
- 5.5
76
- 5.6
@@ -12,33 +11,23 @@ sudo: false
1211

1312
cache:
1413
directories:
15-
- $HOME/.composer/cache
16-
17-
env:
18-
- SYMFONY_VERSION=2.7.*
14+
- $HOME/.composer/cache/files
1915

2016
matrix:
2117
include:
22-
- php: 5.6
23-
env: SYMFONY_VERSION=2.3.*
24-
- php: 5.6
25-
env: SYMFONY_VERSION=2.8.*
26-
- php: 5.6
27-
env: SYMFONY_VERSION=3.0.*
2818
- php: 5.3
2919
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
30-
allow_failures:
3120
- php: 7.0
32-
- env: SYMFONY_VERSION=2.8.*
33-
- env: SYMFONY_VERSION=3.0.*
21+
env: SYMFONY_VERSION=2.7.*
22+
- php: 7.0
23+
env: SYMFONY_VERSION=2.8.*
3424
fast_finish: true
3525

3626
before_install:
37-
- composer self-update
38-
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
39-
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
40-
41-
install: composer update --prefer-source $COMPOSER_FLAGS
27+
- composer self-update || true
28+
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
29+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi;
30+
- COMPOSER_ROOT_VERSION=dev-master composer update $COMPOSER_FLAGS --prefer-source --no-interaction
4231

4332
script: phpunit --coverage-text
4433

resources/config/dist/framework.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@
2323
),
2424
);
2525

26-
if (Symfony\Component\HttpKernel\Kernel::VERSION_ID >= 20800) {
27-
$config['form'] = array(
28-
'csrf_protection' => true
29-
);
30-
} else {
31-
$config['csrf_protection'] = true;
32-
}
33-
3426
$container->loadFromExtension('framework', $config);
3527

3628
$container->loadFromExtension('twig', array(

src/Phpunit/DatabaseTestListener.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
4848
public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
4949
{
5050
}
51-
51+
52+
public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time)
53+
{
54+
}
55+
5256
public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
5357
{
5458
}

0 commit comments

Comments
 (0)