Skip to content

Commit

Permalink
Update to SF 4.4, SF5 (#5)
Browse files Browse the repository at this point in the history
* up to sf 4.4, 5.0
  • Loading branch information
gilles-g authored Dec 18, 2019
1 parent f23a8eb commit 6946303
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 49 deletions.
47 changes: 14 additions & 33 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,32 @@
language: php
sudo: false

dist: trusty

cache:
directories:
- $HOME/.composer/cache/files
- $HOME/symfony-bridge/.phpunit

env:
global:
- PHPUNIT_FLAGS="-v"
- SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
- $HOME/.composer/cache

matrix:
fast_finish: true
include:
# Minimum supported dependencies with the latest and oldest PHP version
- php: 7.2
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
- php: 7.0
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"

# Test the latest stable release
- php: 7.0
- php: 7.1
- php: 7.2
env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"

# Latest commit to master
- php: 7.2
env: STABILITY="dev"

allow_failures:
# Dev-master is allowed to fail.
- env: STABILITY="dev"
- php: 7.3
env: SYMFONY_VERSION=3.4.*
- php: 7.3
env: SYMFONY_VERSION=4.3.*
- php: 7.3
env: SYMFONY_VERSION=4.4.*
- php: 7.3
env: SYMFONY_VERSION=5.0.*

before_install:
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
- if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;

install:
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
- if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
- composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
- ./vendor/bin/simple-phpunit install

script:
- composer validate --strict --no-check-lock
# simple-phpunit is the PHPUnit wrapper provided by the PHPUnit Bridge component and
# it helps with testing legacy code and deprecations (composer require symfony/phpunit-bridge)
- ./vendor/bin/simple-phpunit $PHPUNIT_FLAGS
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public function testLoadConfiguration()
],
'twig' => [
'strict_variables' => true,
'exception_controller' => null, // to be removed in 5.0
],
'lexik_cron_file_generator' => [
'env_available' => [
Expand Down Expand Up @@ -80,6 +81,7 @@ private function createContainer(array $configs = [])
'FrameworkBundle' => FrameworkBundle::class,
'LexikCronFileGeneratorBundle' => LexikCronFileGeneratorBundle::class,
],
'env(base64:default::SYMFONY_DECRYPTION_SECRET)' => 'dummy',
]));

$container->set(
Expand All @@ -104,6 +106,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$container->loadFromExtension($extension, $config);
}


return $container;
}

Expand Down
34 changes: 34 additions & 0 deletions Tests/Functional/ForwardCompatTestCaseTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

namespace Lexik\Bundle\CronFileGeneratorBundle\Tests\Functional;

use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

if (70000 <= \PHP_VERSION_ID && (new \ReflectionMethod(WebTestCase::class, 'tearDown'))->hasReturnType()) {
eval('
namespace Lexik\Bundle\CronFileGeneratorBundle\Tests\Functional;
/**
* @internal
*/
trait ForwardCompatTestCaseTrait
{
protected function tearDown(): void
{
static::ensureKernelShutdown();
static::$kernel = null;
}
}
');
} else {
/**
* @internal
*/
trait ForwardCompatTestCaseTrait
{
protected function tearDown()
{
static::ensureKernelShutdown();
static::$kernel = null;
}
}
}
10 changes: 2 additions & 8 deletions Tests/Functional/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

abstract class TestCase extends WebTestCase
{
use ForwardCompatTestCaseTrait;

protected static $client;

/**
Expand All @@ -27,12 +29,4 @@ protected function setUp()
$fs = new Filesystem();
$fs->remove(\sys_get_temp_dir().'/LexikCronFileGeneratorBundle/');
}

/**
* {@inheritdoc}
*/
protected function tearDown()
{
static::$kernel = null;
}
}
1 change: 1 addition & 0 deletions Tests/Functional/app/config/base_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ framework:
twig:
strict_variables: false
default_path: './Resources/views'
exception_controller: null

lexik_cron_file_generator:
env_available:
Expand Down
1 change: 1 addition & 0 deletions Tests/Functional/app/config/empty_cron_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ framework:
twig:
strict_variables: false
default_path: './Resources/views'
exception_controller: null

lexik_cron_file_generator:
env_available:
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
],
"require": {
"php": "^7.0",
"symfony/console": "^3.4|^4.0",
"symfony/framework-bundle": "^3.4|^4.0",
"symfony/twig-bundle": "^3.4|^4.0",
"twig/twig": "~1.34|~2.4"
"symfony/console": "^3.4|^4.0|^5.0",
"symfony/framework-bundle": "^3.4|^4.0|^5.0",
"symfony/twig-bundle": "^3.4|^4.0|^5.0",
"twig/twig": "~1.34|~2.4|^3.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^1.1|^2.8",
"symfony/phpunit-bridge": "^3.4|^4.0",
"symfony/yaml": "^3.4|^4.0",
"symfony/var-dumper": "^3.4|^4.0"
"symfony/phpunit-bridge": "^3.4|^4.0|^5.0",
"symfony/yaml": "^3.4|^4.0|^5.0",
"symfony/var-dumper": "^3.4|^4.0|^5.0"
},
"autoload": {
"psr-4": { "Lexik\\Bundle\\CronFileGeneratorBundle\\": "" },
Expand Down
10 changes: 9 additions & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,12 @@
</exclude>
</whitelist>
</filter>
</phpunit>

<php>
<server name="SYMFONY_PHPUNIT_VERSION" value="7.5"/>
</php>

<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
</phpunit>

0 comments on commit 6946303

Please sign in to comment.