diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 017a366d4..033aa8573 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,17 +15,18 @@ stages: - build-doc - deploy-doc -test:php-5.6: - stage: test - image: chill/ci-image:php-5.6 - <<: *test_definition - script: phpunit test:php-7: image: chill/ci-image:php-7 stage: test <<: *test_definition script: phpunit +test:php-7.1: + image: chill/ci-image:php-7.1 + stage: test + <<: *test_definition + script: phpunit + deploy-packagist: stage: deploy image: chill/ci-image:php-7 diff --git a/Tests/Entity/AccompanyingPeriodTest.php b/Tests/Entity/AccompanyingPeriodTest.php index 7b5e95109..a31055a0d 100644 --- a/Tests/Entity/AccompanyingPeriodTest.php +++ b/Tests/Entity/AccompanyingPeriodTest.php @@ -25,7 +25,7 @@ namespace Chill\PersonBundle\Tests\Entity; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Person; -class AccompanyingPeriodTest extends \PHPUnit_Framework_TestCase +class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase { public function testClosingIsAfterOpeningConsistency() diff --git a/Tests/Entity/PersonTest.php b/Tests/Entity/PersonTest.php index 4e4ff19b8..139c2200b 100644 --- a/Tests/Entity/PersonTest.php +++ b/Tests/Entity/PersonTest.php @@ -28,7 +28,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod; /** * Unit tests for the person Entity */ -class PersonTest extends \PHPUnit_Framework_TestCase +class PersonTest extends \PHPUnit\Framework\TestCase { /** * Test the creation of an accompanying, its closure and the access to diff --git a/Tests/Validator/BirthdateValidatorTest.php b/Tests/Validator/BirthdateValidatorTest.php index 94f1347a5..57b4c2577 100644 --- a/Tests/Validator/BirthdateValidatorTest.php +++ b/Tests/Validator/BirthdateValidatorTest.php @@ -29,7 +29,7 @@ use Prophecy\Prophet; * * @author Julien Fastré */ -class BirthdateValidatorTest extends \PHPUnit_Framework_TestCase +class BirthdateValidatorTest extends \PHPUnit\Framework\TestCase { /** * A prophecy for \Symfony\Component\Validator\Context\ExecutionContextInterface diff --git a/composer.json b/composer.json index d6448804f..badc5ea18 100644 --- a/composer.json +++ b/composer.json @@ -1,4 +1,4 @@ -{ +{ "name": "chill-project/person", "license": "AGPL-3.0", "type": "symfony-bundle", @@ -31,21 +31,26 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "champs-libres/composer-bundle-migration": "~1.0", "doctrine/doctrine-migrations-bundle": "~1.1", - "doctrine/migrations": "~1.0@dev" + "doctrine/migrations": "~1.0", + "phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev" }, "require-dev": { "symfony/phpunit-bridge": "^2.7", - "fzaninotto/faker": "~1" + "fzaninotto/faker": "~1", + "phpunit/phpunit": "~5.0" }, "scripts": { "post-install-cmd": [ - "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations" + "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap" ], "post-update-cmd": [ - "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations" + "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap" ] }, "extra": { - "app-migrations-dir": "Tests/Fixtures/App/app/DoctrineMigrations" + "app-migrations-dir": "Tests/Fixtures/App/app/DoctrineMigrations", + "symfony-app-dir": "Tests/Fixtures/App/" } }