🔨 fix: codestyle with pint | remove config and support for php < 8.1.

anuzpandey · Oct 24, 2023 · fd692cb · fd692cb
1 parent 41cc40e
commit fd692cb
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 113 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "spatie/laravel-package-tools": "^1.14.0",
         "illuminate/contracts": "^10.0"
     },

diff --git a/config/nepali-date.php b/config/nepali-date.php
diff --git a/src/DataTransferObject/NepaliDateArrayData.php b/src/DataTransferObject/NepaliDateArrayData.php
@@ -4,7 +4,6 @@
 
 class NepaliDateArrayData
 {
-
     public function __construct(
         public readonly string $year,
         public readonly string $month,
@@ -16,11 +15,9 @@ public function __construct(
         public readonly string $monthName,
         public readonly string $npDayName,
         public readonly string $npMonthName,
-    )
-    {
+    ) {
     }
 
-
     public static function from(array $data): self
     {
         return new self(
@@ -37,7 +34,6 @@ public static function from(array $data): self
         );
     }
 
-
     public function toArray(): array
     {
         return [
@@ -53,5 +49,4 @@ public function toArray(): array
             'npMonthName' => $this->npMonthName,
         ];
     }
-
 }
diff --git a/src/LaravelNepaliDate.php b/src/LaravelNepaliDate.php
@@ -2,33 +2,28 @@
 
 namespace Anuzpandey\LaravelNepaliDate;
 
-use Anuzpandey\LaravelNepaliDate\DataTransferObject\NepaliDateArrayData;
 use Anuzpandey\LaravelNepaliDate\Traits\CalendarDateDataTrait;
 use Anuzpandey\LaravelNepaliDate\Traits\DiffForHumsTrait;
 use Anuzpandey\LaravelNepaliDate\Traits\EnglishDateTrait;
 use Anuzpandey\LaravelNepaliDate\Traits\HelperTrait;
 use Anuzpandey\LaravelNepaliDate\Traits\IsLeapYearTrait;
 use Anuzpandey\LaravelNepaliDate\Traits\NepaliDateTrait;
 use Carbon\Carbon;
-use RuntimeException;
 
 class LaravelNepaliDate
 {
     use CalendarDateDataTrait;
-    use NepaliDateTrait;
-    use EnglishDateTrait;
-    use IsLeapYearTrait;
     use DiffForHumsTrait;
+    use EnglishDateTrait;
     use HelperTrait;
-
+    use IsLeapYearTrait;
+    use NepaliDateTrait;
 
     public function __construct(
         public string|Carbon $date,
-    )
-    {
+    ) {
     }
 
-
     public static function from(string|Carbon $date): LaravelNepaliDate
     {
         $parsedDate = ($date instanceof Carbon)
@@ -37,5 +32,4 @@ public static function from(string|Carbon $date): LaravelNepaliDate
 
         return new static($parsedDate);
     }
-
 }
diff --git a/src/LaravelNepaliDateServiceProvider.php b/src/LaravelNepaliDateServiceProvider.php
@@ -2,19 +2,15 @@
 
 namespace Anuzpandey\LaravelNepaliDate;
 
+use Anuzpandey\LaravelNepaliDate\Commands\LaravelNepaliDateCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Anuzpandey\LaravelNepaliDate\Commands\LaravelNepaliDateCommand;
 
 class LaravelNepaliDateServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
         $package
             ->name('laravel-nepali-date');
-            // ->hasConfigFile()
-            // ->hasViews()
-            // ->hasMigration('create_laravel-nepali-date_table')
-            // ->hasCommand(LaravelNepaliDateCommand::class);
     }
 }
diff --git a/src/Traits/CalendarDateDataTrait.php b/src/Traits/CalendarDateDataTrait.php
@@ -4,7 +4,6 @@
 
 trait CalendarDateDataTrait
 {
-
     private array $calendarData = [
         0 => [2000, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31],
         1 => [2001, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30],
@@ -100,20 +99,25 @@ trait CalendarDateDataTrait
     ];
 
     private array $normalMonths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
     private array $leapMonths = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
     private array $englishNormalMonths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-    private array $englishLeapMonths = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
+    private array $englishLeapMonths = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
     /* These are initial values for nepali date. */
     private string|int $nepaliYear = 2000;
+
     private string|int $nepaliMonth = 9;
+
     private string|int $nepaliDay = 16;     // 17 - 1
+
     private string|int $dayOfWeek = 6;      // 7 - 1, 0 for sunday, 6 for saturday
 
     private string|int $englishYear = 1943;
+
     private string|int $englishMonth = 4;
-    private string|int $englishDay = 13;    // 14 - 1
 
+    private string|int $englishDay = 13;    // 14 - 1
 }
diff --git a/src/Traits/DiffForHumsTrait.php b/src/Traits/DiffForHumsTrait.php
@@ -2,8 +2,8 @@
 
 namespace Anuzpandey\LaravelNepaliDate\Traits;
 
-trait DiffForHumsTrait {
-
+trait DiffForHumsTrait
+{
     public function nepaliDiffForHumans($diffInHuman): string
     {
         $expData = explode(' ', $diffInHuman);
@@ -13,7 +13,6 @@ public function nepaliDiffForHumans($diffInHuman): string
         $index = strpos($diffInHuman, $expData[0]) + strlen($expData[0]);
         $remainingData = substr($diffInHuman, $index);
 
-        return $this->convertEnToNpNumber($numberData) . $this->convertEnToNpWord($remainingData);
+        return $this->convertEnToNpNumber($numberData).$this->convertEnToNpWord($remainingData);
     }
-
 }
diff --git a/src/Traits/EnglishDateTrait.php b/src/Traits/EnglishDateTrait.php
@@ -61,23 +61,21 @@ trait EnglishDateTrait
         9 => '9',
     ];
 
-
     public function toEnglishDate(): string
     {
         $checkIfIsInRange = $this->isInNepaliDateRange($this->date);
 
-        if (!$checkIfIsInRange) {
+        if (! $checkIfIsInRange) {
             throw new RuntimeException($checkIfIsInRange);
         }
 
         $totalNepaliDays = $this->calculateTotalNepaliDays();
 
         $this->performCalculationBasedonNepaliDays($totalNepaliDays);
 
-        return $this->englishYear . '-' . $this->englishMonth . '-' . $this->englishDay;
+        return $this->englishYear.'-'.$this->englishMonth.'-'.$this->englishDay;
     }
 
-
     public function toEnglishDateArray(): NepaliDateArrayData
     {
         $this->toEnglishDate();
@@ -96,7 +94,6 @@ public function toEnglishDateArray(): NepaliDateArrayData
         ]);
     }
 
-
     public function isInNepaliDateRange(Carbon $date): string|bool
     {
         if ($date->year < 2000 || $date->year > 2089) {
@@ -111,10 +108,9 @@ public function isInNepaliDateRange(Carbon $date): string|bool
             return 'Day is out of range. Please provide day between 1-32';
         }
 
-        return TRUE;
+        return true;
     }
 
-
     public function calculateTotalNepaliDays()
     {
         $totalNepaliDays = 0;
@@ -138,7 +134,6 @@ public function calculateTotalNepaliDays()
         return $totalNepaliDays;
     }
 
-
     public function performCalculationBasedOnNepaliDays(string|int $totalNepaliDays)
     {
         $_day = 4 - 1;
@@ -173,17 +168,15 @@ public function performCalculationBasedOnNepaliDays(string|int $totalNepaliDays)
         }
 
         $this->englishYear = $_year;
-        $this->englishMonth = $_month > 9 ? $_month : '0' . $_month;
-        $this->englishDay = $totalEnglishDays > 9 ? $totalEnglishDays : '0' . $totalEnglishDays;
+        $this->englishMonth = $_month > 9 ? $_month : '0'.$_month;
+        $this->englishDay = $totalEnglishDays > 9 ? $totalEnglishDays : '0'.$totalEnglishDays;
         $this->dayOfWeek = $_day;
     }
 
-
     public function toFormattedEnglishDate(
         string $format = 'd F Y, l',
         string $locale = 'en'
-    ): string
-    {
+    ): string {
         $englishDateArray = $this->toEnglishDateArray();
 
         $formattedArray = ($locale === 'en')
@@ -201,5 +194,4 @@ public function toFormattedEnglishDate(
             default => $this->invalidDateFormatException(),
         };
     }
-
 }
diff --git a/src/Traits/HelperTrait.php b/src/Traits/HelperTrait.php
@@ -7,35 +7,34 @@ trait HelperTrait
     public function convertEnToNpNumber($number): array|string
     {
         $en_number = [
-            "0",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
+            '0',
+            '1',
+            '2',
+            '3',
+            '4',
+            '5',
+            '6',
+            '7',
+            '8',
+            '9',
         ];
 
         $np_number = [
-            "०",
-            "१",
-            "२",
-            "३",
-            "४",
-            "५",
-            "६",
-            "७",
-            "८",
-            "९",
+            '०',
+            '१',
+            '२',
+            '३',
+            '४',
+            '५',
+            '६',
+            '७',
+            '८',
+            '९',
         ];
 
         return str_replace($en_number, $np_number, $number);
     }
 
-
     public function convertEnToNpWord($word): array|string
     {
         $en_word = [
@@ -73,13 +72,12 @@ public function convertEnToNpWord($word): array|string
             'घण्टा',
             'घण्टा',
             'मिनेट',
-            'मिनेट'
+            'मिनेट',
         ];
 
         return str_replace($en_word, $np_word, $word);
     }
 
-
     private function invalidDateFormatException(): void
     {
         throw new \RuntimeException('Invalid date format provided. Valid formats are: "d F Y, l" - "l, d F Y" - "d F Y" - "d-m-Y" - "Y-m-d" - "d/m/Y" - "Y/m/d"');

diff --git a/src/Traits/IsLeapYearTrait.php b/src/Traits/IsLeapYearTrait.php
@@ -2,13 +2,12 @@
 
 namespace Anuzpandey\LaravelNepaliDate\Traits;
 
-trait IsLeapYearTrait {
-
+trait IsLeapYearTrait
+{
     public function isLeapYear($year): bool
     {
         return ($year % 100 == 0)
             ? ($year % 400 == 0)
             : ($year % 4 == 0);
     }
-
 }