Commit36a8065

committed

Deprecate DiactorosFactory, use nyholm/psr7 for tests

1 parent5076934 commit36a8065Copy full SHA for 36a8065

File tree

+13

-18

lines changed

+13

-18

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Bridge\PsrHttpMessage\Factory;`
`13`	`13`
	`14`	`+@trigger_error(sprintf('The "%s" class is deprecated since symfony/psr-http-message-bridge 1.2, use PsrHttpFactory instea.', DiactorosFactory::class),E_USER_DEPRECATED);`
	`15`	`+`
`14`	`16`	`usePsr\Http\Message\UploadedFileInterface;`
`15`	`17`	`useSymfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;`
`16`	`18`	`useSymfony\Component\HttpFoundation\BinaryFileResponse;`
`@@ -28,6 +30,8 @@`
`28`	`30`	`* Builds Psr\HttpMessage instances using the Zend Diactoros implementation.`
`29`	`31`	`*`
`30`	`32`	`* @author Kévin Dunglas <dunglas@gmail.com>`
	`33`	`+ *`
	`34`	`+ * @deprecated since symfony/psr-http-message-bridge 1.2, use PsrHttpFactory instead`
`31`	`35`	`*/`
`32`	`36`	`class DiactorosFactoryimplements HttpMessageFactoryInterface`
`33`	`37`	`{`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`/**`
`17`	`17`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`18`	`18`	`* @author Antonio J. García Lagar <aj@garcialagar.es>`
	`19`	`+ *`
	`20`	`+ * @group legacy`
`19`	`21`	`*/`
`20`	`22`	`class DiactorosFactoryTestextends AbstractHttpMessageFactoryTest`
`21`	`23`	`{`

Lines changed: 3 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,7 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Bridge\PsrHttpMessage\Tests\Factory;`
`13`	`13`
`14`		`-useHttp\Factory\Diactoros\ResponseFactory;`
`15`		`-useHttp\Factory\Diactoros\ServerRequestFactory;`
`16`		`-useHttp\Factory\Diactoros\StreamFactory;`
`17`		`-useHttp\Factory\Diactoros\UploadedFileFactory;`
	`14`	`+useNyholm\Psr7\Factory\Psr17Factory;`
`18`	`15`	`useSymfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;`
`19`	`16`
`20`	`17`	`/**`
`@@ -25,15 +22,8 @@ class PsrHttpFactoryTest extends AbstractHttpMessageFactoryTest`
`25`	`22`	`{`
`26`	`23`	`protectedfunctionbuildHttpMessageFactory()`
`27`	`24`	`{`
`28`		`-if (!class_exists('Http\Factory\Diactoros\ServerRequestFactory')) {`
`29`		`-$this->markTestSkipped('HTTP Factory for Diactoros is not installed.');`
`30`		`- }`
	`25`	`+$factory =newPsr17Factory();`
`31`	`26`
`32`		`-returnnewPsrHttpFactory(`
`33`		`-newServerRequestFactory(),`
`34`		`-newStreamFactory(),`
`35`		`-newUploadedFileFactory(),`
`36`		`-newResponseFactory()`
`37`		`- );`
	`27`	`+returnnewPsrHttpFactory($factory,$factory,$factory,$factory);`
`38`	`28`	`}`
`39`	`29`	`}`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name":"symfony/psr-http-message-bridge",`
`3`	`3`	`"type":"symfony-bridge",`
`4`	`4`	`"description":"PSR HTTP message bridge",`
`5`		`-"keywords": ["http","psr-7","http-message"],`
	`5`	`+"keywords": ["http","psr-7","psr-17","http-message"],`
`6`	`6`	`"homepage":"http://symfony.com",`
`7`	`7`	`"license":"MIT",`
`8`	`8`	`"authors": [`
`@@ -21,12 +21,11 @@`
`21`	`21`	`"symfony/http-foundation":"^2.3.42 \|\| ^3.4 \|\| ^4.0"`
`22`	`22`	`},`
`23`	`23`	`"require-dev": {`
`24`		`-"symfony/phpunit-bridge":"^3.4 \|\| 4.0"`
	`24`	`+"symfony/phpunit-bridge":"^3.4 \|\| ^4.0",`
	`25`	`+"nyholm/psr7":"^1.1"`
`25`	`26`	`},`
`26`	`27`	`"suggest": {`
`27`		`-"psr/http-message-implementation":"To use the HttpFoundation factory",`
`28`		`-"zendframework/zend-diactoros":"To use the Zend Diactoros factory",`
`29`		`-"psr/http-factory-implementation":"To use the PSR-17 factory"`
	`28`	`+"nyholm/psr7":"For a super lightweight PSR-7/17 implementation"`
`30`	`29`	`},`
`31`	`30`	`"autoload": {`
`32`	`31`	`"psr-4": {"Symfony\\Bridge\\PsrHttpMessage\\":"" }`

Comments

(0)