switch composer.json to sf-3

This commit is contained in:
Julien Fastré 2018-04-24 14:14:53 +02:00
parent 8c4ddd8342
commit cda62553eb
4 changed files with 17 additions and 20 deletions

View File

@ -22,13 +22,13 @@ test:php-7.1:
stage: test stage: test
<<: *test_definition <<: *test_definition
image: chill/ci-image:php-7.1 image: chill/ci-image:php-7.1
script: vendor/bin/phpunit script: APP_ENV=test vendor/bin/phpunit
test:php-7.2: test:php-7.2:
stage: test stage: test
<<: *test_definition <<: *test_definition
image: chill/ci-image:php-7.2 image: chill/ci-image:php-7.2
script: vendor/bin/phpunit script: APP_ENV=test vendor/bin/phpunit
# deploy documentation # deploy documentation
api-doc-build: api-doc-build:

View File

@ -41,7 +41,6 @@ security:
form_login: form_login:
csrf_parameter: _csrf_token csrf_parameter: _csrf_token
csrf_token_id: authenticate csrf_token_id: authenticate
csrf_provider: form.csrf_provider
logout: ~ logout: ~

View File

@ -25,28 +25,25 @@
} }
], ],
"require": { "require": {
"php": "~5.5|~7.0", "php": "~7.2",
"twig/extensions": "~1.0", "twig/extensions": "~1.5",
"symfony/assetic-bundle": "~2.3", "symfony/assetic-bundle": "~2.8",
"symfony/monolog-bundle": "~2.4", "symfony/monolog-bundle": "~3.2",
"symfony/framework-bundle": "~2.8", "symfony/symfony": "~3.4",
"symfony/yaml": "~2.7", "doctrine/dbal": "~2.7",
"symfony/symfony": "~2.7", "doctrine/orm": "~2.6",
"doctrine/dbal": "~2.5", "doctrine/common": "~2.8",
"doctrine/orm": "~2.4", "doctrine/doctrine-bundle": "~1.9",
"doctrine/common": "~2.4",
"doctrine/doctrine-bundle": "~1.2",
"champs-libres/composer-bundle-migration": "~1.0", "champs-libres/composer-bundle-migration": "~1.0",
"doctrine/doctrine-migrations-bundle": "~1.1", "doctrine/doctrine-migrations-bundle": "~1.3",
"doctrine/migrations": "~1.0", "doctrine/migrations": "~1.0",
"phpoffice/phpspreadsheet": "~1.2", "phpoffice/phpspreadsheet": "~1.2",
"sensio/distribution-bundle": "^5.0" "sensio/distribution-bundle": "^5.0"
}, },
"require-dev": { "require-dev": {
"symfony/dom-crawler": "2.5", "symfony/dom-crawler": "~3.4",
"doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/doctrine-fixtures-bundle": "~3.0",
"symfony/security": "~2.5", "symfony/phpunit-bridge": "~3.4",
"symfony/phpunit-bridge": "^2.7",
"phpunit/phpunit": "~5.6" "phpunit/phpunit": "~5.6"
}, },
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true"> <phpunit bootstrap="./vendor/autoload.php" colors="true">
<testsuites> <testsuites>
<testsuite name="ChillMain test suite"> <testsuite name="ChillMain test suite">
<directory suffix="Test.php">./Tests</directory> <directory suffix="Test.php">./Tests</directory>
@ -19,5 +19,6 @@
<php> <php>
<server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app" /> <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app" />
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" /> <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
<env name="APP_ENV" value="test" />
</php> </php>
</phpunit> </phpunit>