From 29007e7d798f4eb92ff9332436e2ec64f5f6afee Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sun, 18 Jan 2015 00:03:49 +0100 Subject: [PATCH] #1252 DDC-3496 - minor test cleanups (avoiding private static method) --- .../Tests/ORM/Mapping/NamingStrategyTest.php | 33 ++++--------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php index 1d8233025..b6b87f626 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php @@ -20,14 +20,6 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase return new DefaultNamingStrategy(); } - /** - * @return JoinColumnClassNamingStrategy - */ - static private function joinColumnClassNaming() - { - return new JoinColumnClassNamingStrategy(); - } - /** * @return UnderscoreNamingStrategy */ @@ -171,28 +163,15 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase { return array( // DefaultNamingStrategy - array(self::defaultNaming(), 'someColumn_id', - 'someColumn', null, - ), - array(self::defaultNaming(), 'some_column_id', - 'some_column', null, - ), + array(self::defaultNaming(), 'someColumn_id', 'someColumn', null), + array(self::defaultNaming(), 'some_column_id', 'some_column', null), // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'some_column_id', - 'someColumn', null, - ), - array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID', - 'someColumn', null, - ), - + array(self::underscoreNamingLower(), 'some_column_id', 'someColumn', null), + array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null), // JoinColumnClassNamingStrategy - array(self::joinColumnClassNaming(), 'classname_someColumn_id', - 'someColumn', 'Some\ClassName', - ), - array(self::joinColumnClassNaming(), 'classname_some_column_id', - 'some_column', 'ClassName', - ), + array(new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'), + array(new JoinColumnClassNamingStrategy(), 'classname_some_column_id', 'some_column', 'ClassName'), ); }