Skip to content

Commit

Permalink
Merge pull request #53 from stof/symfony_4
Browse files Browse the repository at this point in the history
Add support for Symfony 4
  • Loading branch information
jmleroux authored Dec 9, 2018
2 parents 92b87cb + 7a1a414 commit 4be5fda
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,30 @@ php:
- 5.5
- 5.6
- 7.0
- hhvm
- 7.1
- 7.2
- 7.3

env:
- COMPOSER_FLAGS='--prefer-dist'

matrix:
fast_finish: true
allow_failures:
- php: hhvm
include:
- php: 5.4
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable' SYMFONY_DEPRECATIONS_HELPER=weak
- php: 5.6
env: COMPOSER_FLAGS='--prefer-dist' DEPENDENCIES=dev

before_install:
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.3" ]; then phpenv config-rm xdebug.ini; fi
- composer self-update
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi;

install:
- composer update $COMPOSER_FLAGS
- bin/simple-phpunit install

script:
- bin/phpspec run -f dot
- phpunit -v
- bin/simple-phpunit -v
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
],
"require": {
"php": ">=5.4.0",
"symfony/options-resolver": "~2.6 || ~3.0"
"symfony/options-resolver": "~2.6 || ~3.0 || ^4.0"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
"phpspec/phpspec": "~2.0",
"symfony/phpunit-bridge": "^4.2"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion tests/CsvTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use Akeneo\Component\SpreadsheetParser\Csv\CsvParser;
use Akeneo\Component\SpreadsheetParser\SpreadsheetParser;
use PHPUnit\Framework\TestCase;

/**
* Functional tests for CSV files
Expand All @@ -10,7 +11,7 @@
* @copyright 2014 Akeneo SAS (http://www.akeneo.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class CsvTest extends PHPUnit_Framework_TestCase
class CsvTest extends TestCase
{
public function testReadFile()
{
Expand Down
3 changes: 2 additions & 1 deletion tests/XlsxTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use Akeneo\Component\SpreadsheetParser\SpreadsheetParser;
use Akeneo\Component\SpreadsheetParser\Xlsx\XlsxParser;
use PHPUnit\Framework\TestCase;

/**
* Functional tests for XLSX files
Expand All @@ -10,7 +11,7 @@
* @copyright 2014 Akeneo SAS (http://www.akeneo.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class XlsxTest extends PHPUnit_Framework_TestCase
class XlsxTest extends TestCase
{
public function testLibreOfficeFile()
{
Expand Down

0 comments on commit 4be5fda

Please sign in to comment.