Skip to content

Commit

Permalink
Merge branch '3.2'
Browse files Browse the repository at this point in the history
* 3.2:
  Updated PHPUnit namespaces
  Add missing conflict rules for phpunit
  • Loading branch information
nicolas-grekas committed Feb 20, 2017
2 parents 7268b54 + 5712047 commit 52e97e0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Tests/Csp/ContentSecurityPolicyHandlerTest.php
Expand Up @@ -11,11 +11,12 @@

namespace Symfony\Bundle\WebProfilerBundle\Tests\Csp;

use PHPUnit\Framework\TestCase;
use Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;

class ContentSecurityPolicyHandlerTest extends \PHPUnit_Framework_TestCase
class ContentSecurityPolicyHandlerTest extends TestCase
{
/**
* @dataProvider provideRequestAndResponses
Expand Down

0 comments on commit 52e97e0

Please sign in to comment.