fix gitlab-ci

- remove php 5.6;
- fix some namespace problem with PHPUnit in tests ;
- add phpunit to vendors
This commit is contained in:
Julien Fastré 2017-06-20 18:09:55 +02:00
parent 0e8c9bd565
commit 07aca6c4a3
5 changed files with 20 additions and 16 deletions

View File

@ -16,19 +16,18 @@ stages:
- build-doc - build-doc
- deploy-doc - deploy-doc
test:php-5.6:
stage: test
<<: *test_definition
image: chill/ci-image:php-5.6
script: phpunit
test:php-7: test:php-7:
stage: test stage: test
<<: *test_definition <<: *test_definition
image: chill/ci-image:php-7 image: chill/ci-image:php-7
script: phpunit script: vendor/bin/phpunit
test:php-7:
stage: test
<<: *test_definition
image: chill/ci-image:php-7.1
script: vendor/bin/phpunit
# deploy documentation # deploy documentation
api-doc-build: api-doc-build:

View File

@ -28,7 +28,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilderInterface;
* *
* @author Julien Fastré <julien.fastre@champs-libres.coop> * @author Julien Fastré <julien.fastre@champs-libres.coop>
*/ */
class ConfigConsistencyCompilerPassTest extends \PHPUnit_Framework_TestCase class ConfigConsistencyCompilerPassTest extends \PHPUnit\Framework\TestCase
{ {
/** /**

View File

@ -25,7 +25,7 @@ namespace Chill\MainBundle\Tests\Search;
* *
* @author Julien Fastré <julien.fastre@champs-libres.coop> * @author Julien Fastré <julien.fastre@champs-libres.coop>
*/ */
class AbstractSearchTest extends \PHPUnit_Framework_TestCase class AbstractSearchTest extends \PHPUnit\Framework\TestCase
{ {
/** /**
* @var \Chill\MainBundle\Search\AbstractSearch * @var \Chill\MainBundle\Search\AbstractSearch

View File

@ -23,7 +23,7 @@ use Chill\MainBundle\Search\SearchProvider;
use Chill\MainBundle\Search\SearchInterface; use Chill\MainBundle\Search\SearchInterface;
class SearchProviderTest extends \PHPUnit_Framework_TestCase class SearchProviderTest extends \PHPUnit\Framework\TestCase
{ {
/** /**

View File

@ -36,23 +36,28 @@
"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.1",
"doctrine/migrations": "~1.0", "doctrine/migrations": "~1.0",
"phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev" "phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev",
"sensio/distribution-bundle": "^5.0"
}, },
"require-dev": { "require-dev": {
"symfony/dom-crawler": "2.5", "symfony/dom-crawler": "2.5",
"doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/doctrine-fixtures-bundle": "~2.2",
"symfony/security": "~2.5", "symfony/security": "~2.5",
"symfony/phpunit-bridge": "^2.7" "symfony/phpunit-bridge": "^2.7",
"phpunit/phpunit": "~5.6"
}, },
"scripts": { "scripts": {
"post-install-cmd": [ "post-install-cmd": [
"ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations" "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
], ],
"post-update-cmd": [ "post-update-cmd": [
"ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations" "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
] ]
}, },
"extra": { "extra": {
"app-migrations-dir": "Tests/Fixtures/App/DoctrineMigrations" "app-migrations-dir": "Tests/Fixtures/App/DoctrineMigrations",
"symfony-app-dir": "Tests/Fixtures/App/"
} }
} }