Skip to content

Commit f55fd78

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [2.7] Fix tests pass triggerDeprecationError arg to parent class remove default null value for asset version remove duplicated value [Ldap] Remove unused private property Update UPGRADE-3.0 with correct Voter details Change few occurences of a public setUp() method to protected [DependencyInjection] simplify the BC layer Change couple of occurences of a public setUp() method to protected
2 parents 5d49a53 + c79a2b5 commit f55fd78

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DoctrineExtractorTest extends \PHPUnit_Framework_TestCase
2626
*/
2727
private $extractor;
2828

29-
public function setUp()
29+
protected function setUp()
3030
{
3131
$config = Setup::createAnnotationMetadataConfiguration(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'), true);
3232
$entityManager = EntityManager::create(array('driver' => 'pdo_sqlite'), $config);

0 commit comments

Comments
 (0)