Commit55fe51a

committed

Run the phpunit-bridge from a PR

1 parent8173daf commit55fe51aCopy full SHA for 55fe51a

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,18 @@ before_install:`
`194`	`194`	`fi`
`195`	`195`
`196`	`196`	`install:`
	`197`	`+ -\|`
	`198`	`+ # Install the phpunit-bridge from a PR if required`
	`199`	`+ #`
	`200`	`+ # To run a PR with a patched phpunit-bridge, first submit the path for the`
	`201`	`+ # phpunit-bridge as a separate PR against the next feature branch then`
	`202`	`+ # uncomment and update the following line with the PR number and change the`
	`203`	`+ # required version of the bridge in the root composer.json to the version`
	`204`	`+ # of the next feature version (e.g "symfony/phpunit-bridge": "4.4.x@dev")`
	`205`	`+ git fetch origin refs/pull/32886/head`
	`206`	`+ git rm -rq src/Symfony/Bridge/PhpUnit`
	`207`	`+ git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit`
	`208`	`+`
`197`	`209`	`-\|`
`198`	`210`	`# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components`
`199`	`211`	`if [[ ! $deps ]]; then`
`@@ -206,6 +218,8 @@ install:`
`206`	`218`	`mv composer.json composer.json.phpunit &&`
`207`	`219`	`mv composer.json.orig composer.json`
`208`	`220`	`fi`
	`221`	`+ git rm -fq -- src/Symfony/Bridge/PhpUnit/composer.json`
	`222`	`+ git diff --staged -- src/Symfony/Bridge/PhpUnit/ \| git apply -R --index`
`209`	`223`
`210`	`224`	`-\|`
`211`	`225`	`# For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@`
`98`	`98`	`"ocramius/proxy-manager":"~0.4\|~1.0\|~2.0",`
`99`	`99`	`"predis/predis":"~1.0",`
`100`	`100`	`"egulias/email-validator":"~1.2,>=1.2.8\|~2.0",`
`101`		`-"symfony/phpunit-bridge":"^3.4.19\|^4.1.8\|~5.0",`
	`101`	`+"symfony/phpunit-bridge":"4.4.x@dev",`
`102`	`102`	`"symfony/security-acl":"~2.8\|~3.0",`
`103`	`103`	`"phpdocumentor/reflection-docblock":"^3.0\|^4.0"`
`104`	`104`	`},`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespaceSymfony\Component\Debug\Tests\Exception;`
`13`	`13`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
	`15`	`+useSymfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`useSymfony\Component\Debug\Exception\FlattenException;`
`16`	`17`	`useSymfony\Component\HttpFoundation\Exception\SuspiciousOperationException;`
`17`	`18`	`useSymfony\Component\HttpKernel\Exception\AccessDeniedHttpException;`
`@@ -31,6 +32,8 @@`
`31`	`32`
`32`	`33`	`class FlattenExceptionTestextends TestCase`
`33`	`34`	`{`
	`35`	`+use ForwardCompatTestTrait;`
	`36`	`+`
`34`	`37`	`publicfunctiontestStatusCode()`
`35`	`38`	`{`
`36`	`39`	`$flattened = FlattenException::create(new \RuntimeException(),403);`
`@@ -256,7 +259,7 @@ function () {},`
`256`	`259`
`257`	`260`	`// assertEquals() does not like NAN values.`
`258`	`261`	`$this->assertEquals($array[$i][0],'float');`
`259`		`-$this->assertTrue(is_nan($array[$i++][1]));`
	`262`	`+$this->assertNan($array[$i++][1]);`
`260`	`263`	`}`
`261`	`264`
`262`	`265`	`publicfunctiontestRecursionInArguments()`

Comments

(0)