Skip to content
This repository has been archived by the owner on Feb 24, 2023. It is now read-only.

Commit

Permalink
minor #489 Fix tests (fabpot)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 3.0 branch (closes #489).

Discussion
----------

Fix tests

Commits
-------

8278d16 fixed compat of tests
bdbcdc2 removed support for Symfony DIC 4.0 as DefinitionDecoration is used by deps not yet upgrdaed (Doctrine cache bundle fe)
743b593 fixed phpunit configuration
  • Loading branch information
fabpot committed Aug 25, 2017
2 parents 2651d2c + 8278d16 commit 1ac0a9f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
4 changes: 1 addition & 3 deletions SensioFrameworkExtraBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
*/

/**
* SensioFrameworkExtraBundle.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Fabien Potencier <fabien@symfony.com>
*/
class SensioFrameworkExtraBundle extends Bundle
{
Expand Down
17 changes: 11 additions & 6 deletions Tests/Fixtures/TestKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* This source file is subject to the MIT license that is bundled
* with this source code in the file LICENSE.
*/

namespace Tests\Fixtures;

use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel;

Expand All @@ -19,12 +22,12 @@ class TestKernel extends Kernel
public function registerBundles()
{
return array(
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Tests\Fixtures\FooBundle\FooBundle(),
new Tests\Fixtures\ActionArgumentsBundle\ActionArgumentsBundle(),
new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new \Symfony\Bundle\TwigBundle\TwigBundle(),
new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new \Tests\Fixtures\FooBundle\FooBundle(),
new \Tests\Fixtures\ActionArgumentsBundle\ActionArgumentsBundle(),
);
}

Expand All @@ -42,3 +45,5 @@ public function getCacheDir()
return $this->rootDir.'/cache/'.$this->environment;
}
}

class_alias('Tests\Fixtures\TestKernel', 'TestKernel');
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"require": {
"symfony/framework-bundle": "~2.3|~3.0|~4.0",
"symfony/dependency-injection": "~2.3|~3.0|~4.0",
"symfony/dependency-injection": "~2.3|~3.0",
"doctrine/common": "~2.2"
},
"require-dev": {
Expand Down
3 changes: 2 additions & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
</testsuite>
</testsuites>
<php>
<server name="KERNEL_DIR" value="Tests/Fixtures/"/>
<server name="KERNEL_CLASS" value="Tests\Fixtures\TestKernel" />
<server name="KERNEL_DIR" value="Tests/Fixtures/" />
</php>
<filter>
<whitelist>
Expand Down

0 comments on commit 1ac0a9f

Please sign in to comment.