Skip to content

Add new methods #165

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Add new methods #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36bbd4d
[feat] add methods (getFirstDayOfQuarter, getEndDayOfWeek,getEndDayOf…
alissn Jan 4, 2024
fd4715a
[feat] add test for new methods
alissn Jan 4, 2024
1d48e38
[fix] bug fix of logic
alissn Jan 4, 2024
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
72 changes: 72 additions & 0 deletions src/Jalalian.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,73 @@ public function getFirstDayOfYear(): Jalalian
);
}

public function getFirstDayOfQuarter(): Jalalian
{
return new static(
$this->getYear(),
($this->getQuarter() - 1) * Carbon::MONTHS_PER_QUARTER + 1,
1,
$this->getHour(),
$this->getMinute(),
$this->getSecond(),
$this->getTimezone()
);
}

public function getEndDayOfWeek(): Jalalian
{
$endWeek = $this->addDays(6 - $this->getDayOfWeek());

return (new static(
$endWeek->getYear(),
$endWeek->getMonth(),
$endWeek->getDay(),
$endWeek->getHour(),
$endWeek->getMinute(),
$endWeek->getSecond(),
$endWeek->getTimezone()
));
}

public function getEndDayOfMonth(): Jalalian
{
return new static(
$this->getYear(),
$this->getMonth(),
$this->getDaysOf($this->getMonth()),
$this->getHour(),
$this->getMinute(),
$this->getSecond(),
$this->getTimezone()
);
}

public function getEndDayOfYear(): Jalalian
{
return new static(
$this->getYear(),
12,
$this->getDaysOf(12),
$this->getHour(),
$this->getMinute(),
$this->getSecond(),
$this->getTimezone()
);
}

public function getEndDayOfQuarter(): Jalalian
{
return new static(
$this->getYear(),
$this->getQuarter() * Carbon::MONTHS_PER_QUARTER,
$this->getDaysOf($this->getQuarter() * Carbon::MONTHS_PER_QUARTER),
$this->getHour(),
$this->getMinute(),
$this->getSecond(),
$this->getTimezone()
);
}

public function getMonthDays()
{
if ($this->getMonth() <= 6) {
Expand Down Expand Up @@ -199,6 +266,11 @@ public function getYear()
return $this->year;
}

public function getQuarter(): int
{
return (int) ceil($this->getMonth() / Carbon::MONTHS_PER_QUARTER);
}

public function subMonths(int $months = 1): Jalalian
{
Assertion::greaterOrEqualThan($months, 1);
Expand Down
143 changes: 142 additions & 1 deletion tests/JalalianTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function testGetWeekOfMonth()
$jDate = new Jalalian(1401, 3, 7);
$this->assertEquals($jDate->getWeekOfMonth(), 2);
}

public function testGetFirstDayOfWeek()
{
$jDate = new Jalalian(1401, 1, 23);
Expand Down Expand Up @@ -229,4 +229,145 @@ public function testGetLastMonth()
$jDate = new Jalalian(1401, 6, 8);
$this->assertEquals($jDate->getLastMonth()->format('Y-m-d'), '1401-05-08');
}

public function testGetFirstDayOfQuarter()
{
$jDate = new Jalalian(1402, 1, 25);
$this->assertEquals('1402-01-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 2, 25);
$this->assertEquals('1402-01-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 3, 25);
$this->assertEquals('1402-01-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 4, 25);
$this->assertEquals('1402-04-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 5, 25);
$this->assertEquals('1402-04-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 6, 25);
$this->assertEquals('1402-04-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 7, 25);
$this->assertEquals('1402-07-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 8, 25);
$this->assertEquals('1402-07-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 9, 25);
$this->assertEquals('1402-07-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 10, 25);
$this->assertEquals('1402-10-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 11, 19);
$this->assertEquals('1402-10-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 12, 25);
$this->assertEquals('1402-10-01', $jDate->getFirstDayOfQuarter()->format('Y-m-d'));

}

public function testGetEndDayOfWeek()
{
/*
* --------------------------------
* Day 1402 (March 2024)
* --------------------------------
* Sat Sun Mon Tue Wed Thu Fri
* --------------------------------
* 1
* 2 3 4 5 6 7 8
* 9 10 11 12 13 14 15
* 16 17 18 19 20 21 22
* 23 24 25 26 27 28 29
* 30
* -------------------------------
*/

$jDate = new Jalalian(1402, 10, 25);
$this->assertEquals('1402-10-29', $jDate->getEndDayOfWeek()->format('Y-m-d'));

$jDate = new Jalalian(1402, 10, 29);
$this->assertEquals('1402-10-29', $jDate->getEndDayOfWeek()->format('Y-m-d'));

$jDate = new Jalalian(1402, 10, 23);
$this->assertEquals('1402-10-29', $jDate->getEndDayOfWeek()->format('Y-m-d'));

$jDate = new Jalalian(1402, 12, 29);
$this->assertEquals('1403-01-03', $jDate->getEndDayOfWeek()->format('Y-m-d'));

}

public function testGetEndDayOfMonth()
{
/*
* --------------------------------
* Day 1402 (March 2024)
* --------------------------------
* Sat Sun Mon Tue Wed Thu Fri
* --------------------------------
* 1
* 2 3 4 5 6 7 8
* 9 10 11 12 13 14 15
* 16 17 18 19 20 21 22
* 23 24 25 26 27 28 29
* 30
* -------------------------------
*/

$jDate = new Jalalian(1402, 10, 25);
$this->assertEquals('1402-10-30', $jDate->getEndDayOfMonth()->format('Y-m-d'));

$jDate = new Jalalian(1402, 04, 12);
$this->assertEquals('1402-04-31', $jDate->getEndDayOfMonth()->format('Y-m-d'));

$jDate = new Jalalian(1402, 12, 25);
$this->assertEquals('1402-12-29', $jDate->getEndDayOfMonth()->format('Y-m-d'));
}

public function testGetEndDayOfYear()
{
$jDate = new Jalalian(1402, 10, 25);
$this->assertEquals('1402-12-29', $jDate->getEndDayOfYear()->format('Y-m-d'));

// LeapYear
$jDate = new Jalalian(1403, 10, 25);
$this->assertEquals('1403-12-30', $jDate->getEndDayOfYear()->format('Y-m-d'));
}

public function testGetEndDayOfQuarter()
{
$jDate = new Jalalian(1402, 10, 25);
$this->assertEquals('1402-12-29', $jDate->getEndDayOfQuarter()->format('Y-m-d'));

$jDate = new Jalalian(1402, 2, 25);
$this->assertEquals('1402-03-31', $jDate->getEndDayOfQuarter()->format('Y-m-d'));


$jDate = new Jalalian(1402, 6, 01);
$this->assertEquals('1402-06-31', $jDate->getEndDayOfQuarter()->format('Y-m-d'));


$jDate = new Jalalian(1402, 9, 01);
$this->assertEquals('1402-09-30', $jDate->getEndDayOfQuarter()->format('Y-m-d'));
}

public function testGetQuarter()
{
$jDate = new Jalalian(1402, 10, 25);
$this->assertEquals(4, $jDate->getQuarter());

$jDate = new Jalalian(1402, 1, 01);
$this->assertEquals(1, $jDate->getQuarter());


$jDate = new Jalalian(1402, 05, 24);
$this->assertEquals(2, $jDate->getQuarter());

$jDate = new Jalalian(1402, 7, 23);
$this->assertEquals(3, $jDate->getQuarter());
}
}