Skip to content

✨ DateTimeCollection #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

declare(strict_types=1);

namespace Steevanb\PhpCollection\ObjectCollection\DateTime;

trait ContainsDateTimeNullableValueTrait
{
public function containsDateTimeValue(\DateTimeInterface $dateTime): bool
{
foreach ($this->toArray() as $value) {
if (
$value === null
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je me demande à quel point on peut ne faire qu'un seul trait, qui gère tous les cas.

ici on pourrait faire un $value instanceof \DateTime, et ne plus se soucier du nullable ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C'est pour qu'une collection "stricte" n'ait pas besoin de faire une vérification complémentaire.

|| ($dateTime->getTimestamp() + $dateTime->getOffset())
!== ($value->getTimestamp() + $value->getOffset())
) {
continue;
}

return true;
}

return false;
}

/** @return array<?\DateTimeInterface> */
abstract protected function toArray(): array;
}
27 changes: 27 additions & 0 deletions src/ObjectCollection/DateTime/ContainsDateTimeValueTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

declare(strict_types=1);

namespace Steevanb\PhpCollection\ObjectCollection\DateTime;

trait ContainsDateTimeValueTrait
{
public function containsDateTimeValue(\DateTimeInterface $dateTime): bool
{
foreach ($this->toArray() as $value) {
if (
($dateTime->getTimestamp() + $dateTime->getOffset())
!== ($value->getTimestamp() + $value->getOffset())
) {
continue;
}

return true;
}

return false;
}

/** @return array<\DateTimeInterface> */
abstract protected function toArray(): array;
}
4 changes: 4 additions & 0 deletions src/ObjectCollection/DateTimeCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

namespace Steevanb\PhpCollection\ObjectCollection;

use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeValueTrait;

/** @extends AbstractObjectCollection<\DateTime> */
class DateTimeCollection extends AbstractObjectCollection
{
use ContainsDateTimeValueTrait;

public static function getValueFqcn(): string
{
return \DateTime::class;
Expand Down
4 changes: 4 additions & 0 deletions src/ObjectCollection/DateTimeImmutableCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

namespace Steevanb\PhpCollection\ObjectCollection;

use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeValueTrait;

/** @extends AbstractObjectCollection<\DateTimeImmutable> */
class DateTimeImmutableCollection extends AbstractObjectCollection
{
use ContainsDateTimeValueTrait;

public static function getValueFqcn(): string
{
return \DateTimeImmutable::class;
Expand Down
4 changes: 4 additions & 0 deletions src/ObjectCollection/DateTimeImmutableNullableCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

namespace Steevanb\PhpCollection\ObjectCollection;

use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeNullableValueTrait;

/** @extends AbstractObjectNullableCollection<\DateTimeImmutable|null> */
class DateTimeImmutableNullableCollection extends AbstractObjectNullableCollection
{
use ContainsDateTimeNullableValueTrait;

public static function getValueFqcn(): string
{
return \DateTimeImmutable::class;
Expand Down
4 changes: 4 additions & 0 deletions src/ObjectCollection/DateTimeInterfaceCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

namespace Steevanb\PhpCollection\ObjectCollection;

use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeValueTrait;

/** @extends AbstractObjectCollection<\DateTimeInterface> */
class DateTimeInterfaceCollection extends AbstractObjectCollection
{
use ContainsDateTimeValueTrait;

public static function getValueFqcn(): string
{
return \DateTimeInterface::class;
Expand Down
4 changes: 4 additions & 0 deletions src/ObjectCollection/DateTimeInterfaceNullableCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

namespace Steevanb\PhpCollection\ObjectCollection;

use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeNullableValueTrait;

/** @extends AbstractObjectNullableCollection<\DateTimeInterface|null> */
class DateTimeInterfaceNullableCollection extends AbstractObjectNullableCollection
{
use ContainsDateTimeNullableValueTrait;

public static function getValueFqcn(): string
{
return \DateTimeInterface::class;
Expand Down
4 changes: 4 additions & 0 deletions src/ObjectCollection/DateTimeNullableCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

namespace Steevanb\PhpCollection\ObjectCollection;

use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeNullableValueTrait;

/** @extends AbstractObjectNullableCollection<\DateTime|null> */
class DateTimeNullableCollection extends AbstractObjectNullableCollection
{
use ContainsDateTimeNullableValueTrait;

public static function getValueFqcn(): string
{
return \DateTime::class;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?php

declare(strict_types=1);

namespace Steevanb\PhpCollection\Tests\Unit\ObjectCollection\DateTime\ContainsDateTimeValue;

use PHPUnit\Framework\TestCase;
use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeNullableValueTrait;
use Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeValueTrait;
use Steevanb\PhpCollection\ObjectCollection\DateTimeCollection;
use Steevanb\PhpCollection\ObjectCollection\DateTimeImmutableCollection;
use Steevanb\PhpCollection\ObjectCollection\DateTimeImmutableNullableCollection;
use Steevanb\PhpCollection\ObjectCollection\DateTimeInterfaceCollection;
use Steevanb\PhpCollection\ObjectCollection\DateTimeInterfaceNullableCollection;
use Steevanb\PhpCollection\ObjectCollection\DateTimeNullableCollection;

/**
* @covers \Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeValueTrait
* @covers \Steevanb\PhpCollection\ObjectCollection\DateTime\ContainsDateTimeNullableValueTrait
* @internal
*/
final class TraitUsageTest extends TestCase
{
/**
* @dataProvider provideCollectionUsingTrait
* @param class-string $class
*/
public function testUsingTrait(string $class): void
{
$reflectionCollection = new \ReflectionClass($class);
static::assertContains(
needle: ContainsDateTimeValueTrait::class,
haystack: array_map(
static fn (\ReflectionClass $reflectionTrait): string => $reflectionTrait->getName(),
$reflectionCollection->getTraits()
)
);
}

/**
* @dataProvider provideCollectionUsingNullableTrait
* @param class-string $class
*/
public function testUsingNullableTrait(string $class): void
{
$reflectionCollection = new \ReflectionClass($class);
static::assertContains(
needle: ContainsDateTimeNullableValueTrait::class,
haystack: array_map(
static fn (\ReflectionClass $reflectionTrait): string => $reflectionTrait->getName(),
$reflectionCollection->getTraits()
)
);
}

/** @return iterable<string, array{class: class-string}> */
public static function provideCollectionUsingTrait(): iterable
{
yield 'ContainsDateTimeValueTrait_is_used_by_DateTimeCollection' => [
'class' => DateTimeCollection::class,
];
yield 'ContainsDateTimeValueTrait_is_used_by_DateTimeImmutableCollection' => [
'class' => DateTimeImmutableCollection::class,
];
yield 'ContainsDateTimeValueTrait_is_used_by_DateTimeInterfaceCollection' => [
'class' => DateTimeInterfaceCollection::class,
];
}

/** @return iterable<string, array{class: class-string}> */
public static function provideCollectionUsingNullableTrait(): iterable
{
yield 'ContainsDateTimeNullableValueTrait_is_used_by_DateTimeNullableCollection' => [
'class' => DateTimeNullableCollection::class,
];
yield 'ContainsDateTimeNullableValueTrait_is_used_by_DateTimeImmutableNullableCollection' => [
'class' => DateTimeImmutableNullableCollection::class,
];
yield 'ContainsDateTimeNullableValueTrait_is_used_by_DateTimeInterfaceNullableCollection' => [
'class' => DateTimeInterfaceNullableCollection::class,
];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?php

declare(strict_types=1);

namespace Steevanb\PhpCollection\Tests\Unit\ObjectCollection\DateTimeCollection;

use PHPUnit\Framework\TestCase;
use Steevanb\PhpCollection\ObjectCollection\DateTimeCollection;

/**
* @covers \Steevanb\PhpCollection\ObjectCollection\DateTimeCollection::containsDateTimeValue
* @internal
*/
final class ContainsDateTimeValueTest extends TestCase
{
public function testContainsDateTimeValue(): void
{
$dateTimeA = new \DateTime();
$dateTimeCopy = $dateTimeA;
// Asserting different timestamps
$dateTimeB = (new \DateTime())->add(new \DateInterval('PT1S'));
$dateTimeClone = clone $dateTimeA;
$dateTimeSameTime = (new \DateTime())->setTimestamp($dateTimeA->getTimestamp());

$dateTimeCollection = new DateTimeCollection([$dateTimeA]);

static::assertTrue($dateTimeCollection->containsDateTimeValue($dateTimeA));
static::assertTrue($dateTimeCollection->containsDateTimeValue($dateTimeCopy));
static::assertFalse($dateTimeCollection->containsDateTimeValue($dateTimeB));
static::assertTrue($dateTimeCollection->containsDateTimeValue($dateTimeClone));
static::assertTrue($dateTimeCollection->containsDateTimeValue($dateTimeSameTime));
}

public function testContainsDateTimeValueWithTimezone(): void
{
$dateTime = new \DateTime('2024-07-14 12:00:00');
$dateTimeB = clone $dateTime;
$dateTimeC = clone $dateTime;
$dateTimeD = clone $dateTime;

// Setting timezones
$dateTime->setTimezone(new \DateTimeZone('+0800'));
$dateTimeB->setTimezone(new \DateTimeZone('+0600'));
$dateTimeC->setTimezone(new \DateTimeZone('-0600'));
$dateTimeD->setTimezone($dateTime->getTimezone());

$dateTimeCollection = new DateTimeCollection([$dateTime]);

static::assertFalse($dateTimeCollection->containsDateTimeValue($dateTimeB));
static::assertFalse($dateTimeCollection->containsDateTimeValue($dateTimeC));
static::assertTrue($dateTimeCollection->containsDateTimeValue($dateTimeD));
}

public function testContainsDateTimeValueAfterClone(): void
{
$dateTime = new \DateTime();

$dateTimeCollection = (new DateTimeCollection([$dateTime]));
$dateTimeCollectionClone = clone ($dateTimeCollection);

static::assertTrue($dateTimeCollection->containsDateTimeValue($dateTime));
static::assertTrue($dateTimeCollectionClone->containsDateTimeValue($dateTime));
}

public function testContainsDateTimeValueAfterMerge(): void
{
$dateTime = new \DateTime();

static::assertTrue(
(new DateTimeCollection([$dateTime]))
->merge(new DateTimeCollection([new \DateTime()]))
->containsDateTimeValue($dateTime)
);
}
}
54 changes: 54 additions & 0 deletions tests/Unit/ObjectCollection/DateTimeCollection/ContainsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php

declare(strict_types=1);

namespace Steevanb\PhpCollection\Tests\Unit\ObjectCollection\DateTimeCollection;

use PHPUnit\Framework\TestCase;
use Steevanb\PhpCollection\ObjectCollection\DateTimeCollection;

/**
* @covers \Steevanb\PhpCollection\ObjectCollection\DateTimeCollection::contains
* @internal
*/
final class ContainsTest extends TestCase
{
public function testContains(): void
{
$dateTimeA = new \DateTime();
$dateTimeCopy = $dateTimeA;
$dateTimeB = new \DateTime();
$dateTimeClone = clone $dateTimeA;
$dateTimeSameTime = (new \DateTime())->setTimestamp($dateTimeA->getTimestamp());

$dateTimeCollection = new DateTimeCollection([$dateTimeA]);

static::assertTrue($dateTimeCollection->contains($dateTimeA));
static::assertTrue($dateTimeCollection->contains($dateTimeCopy));
static::assertFalse($dateTimeCollection->contains($dateTimeB));
static::assertFalse($dateTimeCollection->contains($dateTimeClone));
static::assertFalse($dateTimeCollection->contains($dateTimeSameTime));
}

public function testContainsAfterClone(): void
{
$dateTime = new \DateTime();

$dateTimeCollection = (new DateTimeCollection([$dateTime]));
$dateTimeCollectionClone = clone ($dateTimeCollection);

static::assertTrue($dateTimeCollection->contains($dateTime));
static::assertTrue($dateTimeCollectionClone->contains($dateTime));
}

public function testContainsAfterMerge(): void
{
$dateTime = new \DateTime();

static::assertTrue(
(new DateTimeCollection([$dateTime]))
->merge(new DateTimeCollection([new \DateTime()]))
->contains($dateTime)
);
}
}
Loading