Skip to content
This repository was archived by the owner on Jan 11, 2021. It is now read-only.

Commit 6d6526f

Browse files
authored
Merge pull request #55 from blankse/fix_tests
[Composer] Fix conflict with Symfony version > 2.7.29
2 parents b7f1b1a + 5755fa0 commit 6d6526f

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

bootstrap.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
use eZ\Publish\Core\MVC\Legacy\Kernel as LegacyKernel;
1313
use eZ\Publish\Core\MVC\Legacy\Kernel\CLIHandler as LegacyKernelCLI;
1414

15+
if (!class_exists('PHPUnit\Framework\TestCase')) {
16+
class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\Framework\TestCase');
17+
}
18+
1519
// Get global config.php settings
1620
if ( !file_exists( __DIR__ . '/config.php' ) )
1721
{

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"oneup/flysystem-bundle": "~0.4",
3535
"friendsofsymfony/http-cache-bundle": ">=1.2, <=1.3.6",
3636
"sensio/framework-extra-bundle": "~3.0",
37-
"twig/twig": "^1.0, <1.34"
37+
"twig/twig": "^1.0"
3838
},
3939
"require-dev": {
4040
"ezsystems/ezpublish-legacy": "@dev",

0 commit comments

Comments
 (0)