Merge pull request #49 from mikemand/feature/other-dates

Allow all kinds of dates to be used for expiresOn

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 /.idea
 coverage.xml
+.phpunit.result.cache

src/Generator.php

@@ -72,11 +72,11 @@ public function for(string $email)
  }
 
  /**
- * @param \Carbon\Carbon $date
+ * @param \DateTimeInterface $date
  *
  * @return $this
  */
- public function expiresOn(Carbon $date)
+ public function expiresOn(\DateTimeInterface $date)
  {
  $this->expiry = $date;
 

tests/Feature/GenerateInvitesTest.php

@@ -3,6 +3,7 @@
 namespace Clarkeash\Doorman\Test\Feature;
 
 use Carbon\Carbon;
+use Carbon\CarbonImmutable;
 use Clarkeash\Doorman\Exceptions\DuplicateException;
 use Clarkeash\Doorman\Models\Invite;
 use Doorman;
@@ -63,7 +64,7 @@ public function it_can_have_multiple_uses()
  */
  public function it_can_have_an_expiry_date()
  {
- $date = Carbon::now( 'UTC')->endOfDay();
+ $date = Carbon::now('UTC')->endOfDay();
 
  Doorman::generate()->expiresOn($date)->make();
 
@@ -72,6 +73,48 @@ public function it_can_have_an_expiry_date()
  Assert::assertLessThan(1, $date->floatDiffInSeconds($invite->valid_until));
  }
 
+ /**
+ * @test
+ */
+ public function it_can_accept_immutable_date()
+ {
+ $date = CarbonImmutable::now('UTC')->endOfDay();
+
+ Doorman::generate()->expiresOn($date)->make();
+
+ $invite = Invite::first();
+
+ Assert::assertLessThan(1, $date->floatDiffInSeconds($invite->valid_until));
+ }
+
+ /**
+ * @test
+ */
+ public function it_can_accept_vanilla_date()
+ {
+ $date = (new \DateTime)->setTime(23, 59, 59);
+
+ Doorman::generate()->expiresOn($date)->make();
+
+ $invite = Invite::first();
+
+ Assert::assertLessThan(1, $date->diff($invite->valid_until)->format('%s'));
+ }
+
+ /**
+ * @test
+ */
+ public function it_can_accept_vanilla_immutable_date()
+ {
+ $date = (new \DateTimeImmutable)->setTime(23, 59, 59);
+
+ Doorman::generate()->expiresOn($date)->make();
+
+ $invite = Invite::first();
+
+ Assert::assertLessThan(1, $date->diff($invite->valid_until)->format('%s'));
+ }
+
  /**
  * @test
  */
@@ -120,8 +163,8 @@ public function only_one_invite_per_email_can_be_generated_2()
  }
 
  /**
- * @test
- */
+  * @test
+  */
  public function generated_codes_should_always_be_uppercase()
  {
  Doorman::generate()->make();

tests/Unit/CleanupCommandTest.php

@@ -2,6 +2,7 @@
 
 namespace Clarkeash\Doorman\Test\Unit;
 
+use Carbon\Carbon;
 use Clarkeash\Doorman\Test\TestCase;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Foundation\Testing\DatabaseMigrations;