Skip to content

Commit

Permalink
Replaced string with ::class constant (#440)
Browse files Browse the repository at this point in the history
  • Loading branch information
@connorhu
connorhu authored Mar 1, 2024
1 parent ad9da58 commit 12ee45e
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 39 deletions.
3 changes: 2 additions & 1 deletion tests/Query/Mysql/CastTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

namespace DoctrineExtensions\Tests\Query\Mysql;

use DoctrineExtensions\Tests\Entities\BlogPost;
use DoctrineExtensions\Tests\Query\MysqlTestCase;

class CastTest extends MysqlTestCase
{
private $entityLong = 'DoctrineExtensions\\Tests\\Entities\\BlogPost';
private $entityLong = BlogPost::class;

private $entityShort = 'BlogPost';

Expand Down
3 changes: 2 additions & 1 deletion tests/Query/Mysql/TrigTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace DoctrineExtensions\Tests\Query\Mysql;

use Doctrine\ORM\Query;
use DoctrineExtensions\Tests\Entities\BlogPost;
use DoctrineExtensions\Tests\Query\MysqlTestCase;

use function deg2rad;
Expand All @@ -15,7 +16,7 @@ public function setUp(): void
{
parent::setUp();

$this->entity = 'DoctrineExtensions\Tests\Entities\BlogPost';
$this->entity = BlogPost::class;
}

public function testSin(): void
Expand Down
7 changes: 4 additions & 3 deletions tests/Query/MysqlWalkerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
namespace DoctrineExtensions\Tests\Query;

use Doctrine\ORM\Query;
use DoctrineExtensions\Query\MysqlWalker;

class MysqlWalkerTest extends MysqlTestCase
{
public function testSelectSQLCalcFoundRows(): void
{
$dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p';
$q = $this->entityManager->createQuery($dql);
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'DoctrineExtensions\Query\MysqlWalker');
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, MysqlWalker::class);
$q->setHint('mysqlWalker.sqlCalcFoundRows', true);
$sql = 'SELECT SQL_CALC_FOUND_ROWS d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_';

Expand All @@ -21,7 +22,7 @@ public function testSelectSQLNoCache(): void
{
$dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p';
$q = $this->entityManager->createQuery($dql);
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'DoctrineExtensions\Query\MysqlWalker');
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, MysqlWalker::class);
$q->setHint('mysqlWalker.sqlNoCache', true);
$sql = 'SELECT SQL_NO_CACHE d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_';

Expand All @@ -32,7 +33,7 @@ public function testGroupByWithRollup(): void
{
$dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p GROUP BY p.id';
$q = $this->entityManager->createQuery($dql);
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'DoctrineExtensions\Query\MysqlWalker');
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, MysqlWalker::class);
$q->setHint('mysqlWalker.withRollup', true);
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ GROUP BY d0_.id WITH ROLLUP';

Expand Down
4 changes: 3 additions & 1 deletion tests/Query/SqliteTestCase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace DoctrineExtensions\Tests\Query;

use DoctrineExtensions\Tests\Entities\Date;

use function method_exists;

class SqliteTestCase extends DbTestCase
Expand All @@ -26,7 +28,7 @@ public function setUp(): void
'sclr',
0,
$this->entityManager->getConnection()->getDatabasePlatform(),
$this->entityManager->getClassMetadata('DoctrineExtensions\Tests\Entities\Date')
$this->entityManager->getClassMetadata(Date::class)
);
}
}
Expand Down
59 changes: 34 additions & 25 deletions tests/Types/CarbonDateTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\ORMSetup;
use Doctrine\ORM\Tools\SchemaTool;
use DoctrineExtensions\Tests\Entities\CarbonDate;
use DoctrineExtensions\Tests\Entities\CarbonDate as Entity;
use DoctrineExtensions\Types\CarbonDateTimeType;
use DoctrineExtensions\Types\CarbonDateTimeTzType;
use DoctrineExtensions\Types\CarbonDateType;
use DoctrineExtensions\Types\CarbonImmutableDateTimeType;
use DoctrineExtensions\Types\CarbonImmutableDateTimeTzType;
use DoctrineExtensions\Types\CarbonImmutableDateType;
use DoctrineExtensions\Types\CarbonImmutableTimeType;
use DoctrineExtensions\Types\CarbonTimeType;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\Adapter\ArrayAdapter;

Expand All @@ -28,14 +37,14 @@ class CarbonDateTest extends TestCase

public static function setUpBeforeClass(): void
{
Type::addType('CarbonDate', 'DoctrineExtensions\Types\CarbonDateType');
Type::addType('CarbonDateTime', 'DoctrineExtensions\Types\CarbonDateTimeType');
Type::addType('CarbonDateTimeTz', 'DoctrineExtensions\Types\CarbonDateTimeTzType');
Type::addType('CarbonTime', 'DoctrineExtensions\Types\CarbonTimeType');
Type::addType('CarbonImmutableDate', 'DoctrineExtensions\Types\CarbonImmutableDateType');
Type::addType('CarbonImmutableDateTime', 'DoctrineExtensions\Types\CarbonImmutableDateTimeType');
Type::addType('CarbonImmutableDateTimeTz', 'DoctrineExtensions\Types\CarbonImmutableDateTimeTzType');
Type::addType('CarbonImmutableTime', 'DoctrineExtensions\Types\CarbonImmutableTimeType');
Type::addType('CarbonDate', CarbonDateType::class);
Type::addType('CarbonDateTime', CarbonDateTimeType::class);
Type::addType('CarbonDateTimeTz', CarbonDateTimeTzType::class);
Type::addType('CarbonTime', CarbonTimeType::class);
Type::addType('CarbonImmutableDate', CarbonImmutableDateType::class);
Type::addType('CarbonImmutableDateTime', CarbonImmutableDateTimeType::class);
Type::addType('CarbonImmutableDateTimeTz', CarbonImmutableDateTimeTzType::class);
Type::addType('CarbonImmutableTime', CarbonImmutableTimeType::class);
}

public function setUp(): void
Expand Down Expand Up @@ -64,7 +73,7 @@ public function setUp(): void
$schemaTool = new SchemaTool($this->em);
$schemaTool->dropDatabase();
$schemaTool->createSchema([
$this->em->getClassMetadata('DoctrineExtensions\Tests\Entities\CarbonDate'),
$this->em->getClassMetadata(CarbonDate::class),
]);

$entity = new Entity();
Expand All @@ -83,9 +92,9 @@ public function setUp(): void

public function testDateGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\Carbon', $entity->date);
$this->assertInstanceOf(Carbon::class, $entity->date);
$this->assertEquals(
Carbon::createFromDate(2015, 1, 1, $entity->date->timezone)->format('Y-m-d'),
$entity->date->format('Y-m-d')
Expand All @@ -104,9 +113,9 @@ public function testDateSetter(): void

public function testDateTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\Carbon', $entity->datetime);
$this->assertInstanceOf(Carbon::class, $entity->datetime);
$this->assertEquals(Carbon::create(2015, 1, 1, 0, 0, 0), $entity->datetime);
}

Expand All @@ -122,9 +131,9 @@ public function testDateTimeSetter(): void

public function testDateTimeTzGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\Carbon', $entity->datetimeTz);
$this->assertInstanceOf(Carbon::class, $entity->datetimeTz);
$this->assertEquals(Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific'), $entity->datetimeTz);
}

Expand All @@ -140,9 +149,9 @@ public function testDateTimeTzSetter(): void

public function testTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\Carbon', $entity->time);
$this->assertInstanceOf(Carbon::class, $entity->time);
$this->assertEquals(Carbon::createFromTime(12, 0, 0, 'Europe/London'), $entity->time);
}

Expand All @@ -158,9 +167,9 @@ public function testTimeSetter(): void

public function testImmutableDateGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\CarbonImmutable', $entity->dateImmutable);
$this->assertInstanceOf(CarbonImmutable::class, $entity->dateImmutable);
$this->assertEquals(
CarbonImmutable::createFromDate(2015, 1, 1, $entity->date->timezone)->format('Y-m-d'),
$entity->date->format('Y-m-d')
Expand All @@ -179,9 +188,9 @@ public function testImmutableDateSetter(): void

public function testImmutableDateTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\CarbonImmutable', $entity->datetimeImmutable);
$this->assertInstanceOf(CarbonImmutable::class, $entity->datetimeImmutable);
$this->assertEquals(CarbonImmutable::create(2015, 1, 1, 0, 0, 0), $entity->datetime);
}

Expand All @@ -197,9 +206,9 @@ public function testImmutableDateTimeSetter(): void

public function testImmutableDateTimeTzGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\CarbonImmutable', $entity->datetimeTzImmutable);
$this->assertInstanceOf(CarbonImmutable::class, $entity->datetimeTzImmutable);
$this->assertEquals(CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific'), $entity->datetimeTz);
}

Expand All @@ -215,9 +224,9 @@ public function testImmutableDateTimeTzSetter(): void

public function testImmutableTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
$entity = $this->em->find(CarbonDate::class, 1);

$this->assertInstanceOf('Carbon\CarbonImmutable', $entity->timeImmutable);
$this->assertInstanceOf(CarbonImmutable::class, $entity->timeImmutable);
$this->assertEquals(CarbonImmutable::createFromTime(12, 0, 0, 'Europe/London'), $entity->time);
}

Expand Down
14 changes: 6 additions & 8 deletions tests/Types/ZendDateTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
use Doctrine\ORM\ORMSetup;
use Doctrine\ORM\Tools\SchemaTool;
use DoctrineExtensions\Tests\Entities\ZendDate;
use DoctrineExtensions\Types\ZendDateType;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Zend_Date;

use function assert;

use const PHP_VERSION_ID;

/**
Expand All @@ -31,7 +30,7 @@ public static function setUpBeforeClass(): void
{
Type::addType(
'ZendDate',
'DoctrineExtensions\Types\ZendDateType'
ZendDateType::class
);
}

Expand Down Expand Up @@ -61,7 +60,7 @@ public function setUp(): void
$schemaTool = new SchemaTool($this->em);
$schemaTool->dropDatabase();
$schemaTool->createSchema([
$this->em->getClassMetadata('DoctrineExtensions\Tests\Entities\ZendDate'),
$this->em->getClassMetadata(ZendDate::class),
]);

$this->em->persist(new ZendDate(1, new Zend_Date([
Expand All @@ -78,7 +77,7 @@ public function setUp(): void

public function testGetZendDate(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\ZendDate', 1);
$entity = $this->em->find(ZendDate::class, 1);

$this->assertInstanceOf('Zend_Date', $entity->date);
$this->assertTrue($entity->date->equals(new Zend_Date([
Expand Down Expand Up @@ -106,16 +105,15 @@ public function testSetZendDate(): void
$this->em->persist($entity);
$this->em->flush();

$entity = $this->em->find('DoctrineExtensions\Tests\Entities\ZendDate', 2);
$entity = $this->em->find(ZendDate::class, 2);

$this->assertInstanceOf('Zend_Date', $entity->date);
$this->assertTrue($entity->date->equals($zendDate));
}

public function testTypesThatMapToAlreadyMappedDatabaseTypesRequireCommentHint(): void
{
$platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform');
assert($platform instanceof AbstractPlatform);
$platform = $this->getMockForAbstractClass(AbstractPlatform::class);

$this->assertTrue(Type::getType('ZendDate')->requiresSQLCommentHint($platform));
}
Expand Down

0 comments on commit 12ee45e

Please sign in to comment.