Skip to content

Commit

Permalink
Merge 955c77c into 9395527
Browse files Browse the repository at this point in the history
  • Loading branch information
mcg-web committed Nov 29, 2019
2 parents 9395527 + 955c77c commit 90f8fa7
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 38 deletions.
22 changes: 8 additions & 14 deletions .travis.yml
Expand Up @@ -14,22 +14,16 @@ branches:
matrix:
fast_finish: true
include:
- php: 5.5
env: SYMFONY_VERSION=2.7.*
- php: 5.5
env: SYMFONY_VERSION=2.8.*
- php: 5.6
env: SYMFONY_VERSION=3.1.*
- php: 7.0
env: PHP_CS_FIXER=true
- php: 7.1
env: SYMFONY_VERSION=3.4.*
- php: 7.2
env: SYMFONY_VERSION=3.2.* TEST_COVERAGE=true
- php: 7.3
env: SYMFONY_VERSION=4.1.*
env: SYMFONY_VERSION=4.1.* TEST_COVERAGE=true
- php: 7.3
env: SYMFONY_VERSION=4.2.*
- php: 7.3
env: SYMFONY_VERSION=4.3.*
- php: 7.3
env: SYMFONY_VERSION=4.4.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
- php: 7.4snapshot
env: SYMFONY_VERSION=5.0.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
- php: nightly
env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs
allow_failures:
Expand All @@ -43,7 +37,7 @@ before_install:
- if [ "${DEPENDENCIES}" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [[ "${TEST_COVERAGE}" != "true" ]]; then phpenv config-rm xdebug.ini || true; fi
- composer selfupdate
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --dev --no-update; fi;
- if [ "${SYMFONY_VERSION}" != "" ]; then perl -pi -e 's#"(symfony/.*)":\s*".*"#"$1":"'"${SYMFONY_VERSION}"'"#' composer.json; fi;
# disable default memory limit
- export INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- echo memory_limit = -1 >> $INI
Expand Down
17 changes: 1 addition & 16 deletions Tests/Functional/TestCase.php
Expand Up @@ -20,16 +20,9 @@
*/
abstract class TestCase extends WebTestCase
{
/**
* @var AppKernel[]
*/
private static $kernels = [];

protected static function getKernelClass()
{
require_once __DIR__.'/app/AppKernel.php';

return 'Overblog\DataLoaderBundle\Tests\Functional\app\AppKernel';
return AppKernel::class;
}

/**
Expand Down Expand Up @@ -58,14 +51,6 @@ public static function setUpBeforeClass()
$fs->remove(sys_get_temp_dir().'/OverblogDataLoaderBundle/');
}

/**
* {@inheritdoc}
*/
protected function tearDown()
{
static::$kernel = null;
}

protected static function getContainer()
{
return static::$kernel->getContainer();
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/app/config/config.yml
Expand Up @@ -2,7 +2,7 @@ framework:
test: ~
secret: test
router:
resource: "%kernel.root_dir%/config/routing.yml"
resource: "%kernel.project_dir%/config/routing.yml"
profiler:
enabled: false

Expand Down
13 changes: 7 additions & 6 deletions composer.json
Expand Up @@ -23,20 +23,21 @@
"sort-packages": true
},
"require": {
"php": ">=5.5",
"php": ">=7.2",
"overblog/dataloader-php": "^0.5.0",
"symfony/dependency-injection": "^2.7 || ^3.1 || ^4.0"
"symfony/dependency-injection": "^4.3 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^4.1 || ^5.5 || ^6.0",
"react/promise": "^2.5",
"sensio/framework-extra-bundle": "^3.0",
"symfony/phpunit-bridge": "^2.7 || ^3.1 || ^4.0",
"symfony/yaml": "^2.7 || ^3.1 || ^4.0"
"symfony/dependency-injection": "^4.3 || ^5.0",
"symfony/framework-bundle": "^4.3 || ^5.0",
"symfony/phpunit-bridge": "^4.3 || ^5.0",
"symfony/yaml": "^4.3 || ^5.0"
},
"extra": {
"branch-alias": {
"dev-master": "0.4-dev"
"dev-master": "0.5-dev"
}
}
}
3 changes: 2 additions & 1 deletion phpunit.xml.dist
Expand Up @@ -29,7 +29,8 @@
</filter>

<php>
<ini name="error_reporting" value="E_ALL"/>
<ini name="error_reporting" value="-1"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="999999" />
</php>

</phpunit>

0 comments on commit 90f8fa7

Please sign in to comment.