diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #33071 Fix deprecation test on master (jderusse)

Browse Source 
This PR was merged into the 5.0-dev branch.

Discussion
----------

Fix deprecation test on master

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #32844
| License       | MIT
| Doc PR        | NA

Fix PHPUnit 8 deprecations in master branch

nb: `master` should have been identical to `4.4` but a part of code have been migrated in #31899

Commits
-------

d2f7c6c19c Fix deprecation test on master
This commit is contained in:
Nicolas Grekas 2019-08-08 23:17:33 +02:00
commit 1b29bb4a91
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
View File

@ -246,8 +246,8 @@ class AbstractControllerTest extends TestCase
if ($response->headers->get('content-type')) { if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type')); $this->assertSame('text/x-php', $response->headers->get('content-type'));
} }
$this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition')); $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
$this->assertContains(basename(__FILE__), $response->headers->get('content-disposition')); $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
} }
public function testFileAsInline() public function testFileAsInline()
@ -262,8 +262,8 @@ class AbstractControllerTest extends TestCase
if ($response->headers->get('content-type')) { if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type')); $this->assertSame('text/x-php', $response->headers->get('content-type'));
} }
$this->assertContains(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition')); $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
$this->assertContains(basename(__FILE__), $response->headers->get('content-disposition')); $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
} }
public function testFileWithOwnFileName() public function testFileWithOwnFileName()
@ -279,8 +279,8 @@ class AbstractControllerTest extends TestCase
if ($response->headers->get('content-type')) { if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type')); $this->assertSame('text/x-php', $response->headers->get('content-type'));
} }
$this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition')); $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
$this->assertContains($fileName, $response->headers->get('content-disposition')); $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
} }
public function testFileWithOwnFileNameAsInline() public function testFileWithOwnFileNameAsInline()
@ -296,8 +296,8 @@ class AbstractControllerTest extends TestCase
if ($response->headers->get('content-type')) { if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type')); $this->assertSame('text/x-php', $response->headers->get('content-type'));
} }
$this->assertContains(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition')); $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
$this->assertContains($fileName, $response->headers->get('content-disposition')); $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
} }
public function testFileFromPath() public function testFileFromPath()
@ -312,8 +312,8 @@ class AbstractControllerTest extends TestCase
if ($response->headers->get('content-type')) { if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type')); $this->assertSame('text/x-php', $response->headers->get('content-type'));
} }
$this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition')); $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
$this->assertContains(basename(__FILE__), $response->headers->get('content-disposition')); $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
} }
public function testFileFromPathWithCustomizedFileName() public function testFileFromPathWithCustomizedFileName()
@ -328,8 +328,8 @@ class AbstractControllerTest extends TestCase
if ($response->headers->get('content-type')) { if ($response->headers->get('content-type')) {
$this->assertSame('text/x-php', $response->headers->get('content-type')); $this->assertSame('text/x-php', $response->headers->get('content-type'));
} }
$this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition')); $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
$this->assertContains('test.php', $response->headers->get('content-disposition')); $this->assertStringContainsString('test.php', $response->headers->get('content-disposition'));
} }
public function testFileWhichDoesNotExist() public function testFileWhichDoesNotExist()