Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit accd299

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: updated VENDORS for 2.3.34 Make sure tests are run with full error reporting Update phpunit configuration updated VENDORS for 2.3.33 Do strict check on environment name updated VENDORS for 2.3.32
2 parents 82d0523 + 3ed78a8 commit accd299

File tree

3 files changed

+122
-66
lines changed

3 files changed

+122
-66
lines changed

app/AppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function registerBundles()
1919
new AppBundle\AppBundle(),
2020
);
2121

22-
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
22+
if (in_array($this->getEnvironment(), array('dev', 'test'), true)) {
2323
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
2424
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
2525
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();

app/phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
colors="true"
88
bootstrap="bootstrap.php.cache"
99
>
10+
<php>
11+
<ini name="error_reporting" value="-1" />
12+
</php>
13+
1014
<testsuites>
1115
<testsuite name="Project Test Suite">
1216
<directory>../src/*/*Bundle/Tests</directory>

0 commit comments

Comments
 (0)