kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 10:16:49 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Support/Calendar/Calculator.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Calculator.php
* Copyright (c) 2023 Antonio Spinelli https://github.com/tonicospinelli
@@ -27,7 +26,6 @@ namespace FireflyIII\Support\Calendar;
use Carbon\Carbon;
use FireflyIII\Exceptions\IntervalException;
use SplObjectStorage;
/**
* Class Calculator
@@ -35,15 +33,10 @@ use SplObjectStorage;
class Calculator
{
public const int DEFAULT_INTERVAL = 1;
private static ?SplObjectStorage $intervalMap = null;
private static ?\SplObjectStorage $intervalMap = null;
private static array $intervals = [];
/**
* @param Carbon $epoch
* @param Periodicity $periodicity
* @param int $skipInterval
*
* @return Carbon
* @throws IntervalException
*/
public function nextDateByInterval(Carbon $epoch, Periodicity $periodicity, int $skipInterval = 0): Carbon
@@ -55,54 +48,37 @@ class Calculator
/** @var Periodicity\Interval $periodicity */
$periodicity = self::$intervalMap->offsetGet($periodicity);
$interval = $this->skipInterval($skipInterval);
return $periodicity->nextDate($epoch->clone(), $interval);
}
/**
* @param Periodicity $periodicity
*
* @return bool
*/
public function isAvailablePeriodicity(Periodicity $periodicity): bool
{
return self::containsInterval($periodicity);
}
/**
* @param Periodicity $periodicity
*
* @return bool
*/
private static function containsInterval(Periodicity $periodicity): bool
{
return self::loadIntervalMap()->contains($periodicity);
}
/**
* @return SplObjectStorage
*/
private static function loadIntervalMap(): SplObjectStorage
private static function loadIntervalMap(): \SplObjectStorage
{
if (self::$intervalMap !== null) {
if (null !== self::$intervalMap) {
return self::$intervalMap;
}
self::$intervalMap = new SplObjectStorage();
self::$intervalMap = new \SplObjectStorage();
foreach (Periodicity::cases() as $interval) {
$periodicityClass = __NAMESPACE__ . "\\Periodicity\\{$interval->name}";
$periodicityClass = __NAMESPACE__."\\Periodicity\\{$interval->name}";
self::$intervals[] = $interval->name;
self::$intervalMap->attach($interval, new $periodicityClass());
}
return self::$intervalMap;
}
/**
* @param int $skip
*
* @return int
*/
private function skipInterval(int $skip): int
{
return self::DEFAULT_INTERVAL + $skip;
}
}

1
app/Support/Calendar/Periodicity.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Periodicity.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>

1
app/Support/Calendar/Periodicity/Bimonthly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Bimonthly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>

9
app/Support/Calendar/Periodicity/Daily.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Daily.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
@@ -32,14 +31,8 @@ use Carbon\Carbon;
*/
final class Daily extends Interval
{
/**
* @param Carbon $date
* @param int $interval
*
* @return Carbon
*/
public function nextDate(Carbon $date, int $interval = 1): Carbon
{
return ($date->clone())->addDays($this->skip($interval));
return $date->clone()->addDays($this->skip($interval));
}
}

1
app/Support/Calendar/Periodicity/Fortnightly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Fortnightly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>

1
app/Support/Calendar/Periodicity/HalfYearly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* HalfYearly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>

7
app/Support/Calendar/Periodicity/Interspacable.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Interspacable.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
@@ -32,11 +31,5 @@ use Carbon\Carbon;
*/
interface Interspacable
{
/**
* @param Carbon $date
* @param int $interval
*
* @return Carbon
*/
public function nextDate(Carbon $date, int $interval = 1): Carbon;
}

6
app/Support/Calendar/Periodicity/Interval.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Interval.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
@@ -32,11 +31,6 @@ abstract class Interval implements Interspacable
{
public const int INTERVAL = 1;
/**
* @param int $skip
*
* @return int
*/
final public function skip(int $skip): int
{
return static::INTERVAL * $skip;

9
app/Support/Calendar/Periodicity/Monthly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Monthly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
@@ -32,14 +31,8 @@ use Carbon\Carbon;
*/
class Monthly extends Interval
{
/**
* @param Carbon $date
* @param int $interval
*
* @return Carbon
*/
public function nextDate(Carbon $date, int $interval = 1): Carbon
{
return ($date->clone())->addMonthsNoOverflow($this->skip($interval));
return $date->clone()->addMonthsNoOverflow($this->skip($interval));
}
}

1
app/Support/Calendar/Periodicity/Quarterly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Quarterly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>

9
app/Support/Calendar/Periodicity/Weekly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Weekly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
@@ -32,14 +31,8 @@ use Carbon\Carbon;
*/
class Weekly extends Interval
{
/**
* @param Carbon $date
* @param int $interval
*
* @return Carbon
*/
public function nextDate(Carbon $date, int $interval = 1): Carbon
{
return ($date->clone())->addWeeks($this->skip($interval));
return $date->clone()->addWeeks($this->skip($interval));
}
}

9
app/Support/Calendar/Periodicity/Yearly.php
View File

@@ -1,6 +1,5 @@
<?php
/*
* Yearly.php
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
@@ -32,14 +31,8 @@ use Carbon\Carbon;
*/
final class Yearly extends Interval
{
/**
* @param Carbon $date
* @param int $interval
*
* @return Carbon
*/
public function nextDate(Carbon $date, int $interval = 1): Carbon
{
return ($date->clone())->addYearsNoOverflow($this->skip($interval));
return $date->clone()->addYearsNoOverflow($this->skip($interval));
}
}