♻️refactor: remove populate on create & run composer lint

ScuffedNewt · Feb 9, 2024 · 9aba841 · 9aba841
1 parent dddc7e6
commit 9aba841
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 26 deletions.
diff --git a/app/Http/Controllers/Admin/Data/CurrencyController.php b/app/Http/Controllers/Admin/Data/CurrencyController.php
@@ -54,7 +54,7 @@ public function getEditCurrency($id) {
         }
 
         return view('admin.currencies.create_edit_currency', [
-            'currency' => $currency,
+            'currency'   => $currency,
             'currencies' => Currency::where('id', '!=', $id)->get()->sortBy('name')->pluck('name', 'id'),
         ]);
     }

diff --git a/app/Http/Controllers/Users/BankController.php b/app/Http/Controllers/Users/BankController.php
@@ -56,22 +56,24 @@ public function postTransfer(Request $request, CurrencyManager $service) {
     /**
      * Gets the currency conversion form for the user.
      *
-     * @param App\Services\CurrencyManager $service
+     * @param mixed $id
      *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function getConvertCurrency($id) {
         $currency = Currency::where('is_user_owned', 1)->where('id', $id)->first();
         $convertOptions = Currency::whereIn('id', $currency->conversions->pluck('conversion_id')->toArray())->orderBy('sort_user', 'DESC')->pluck('name', 'id')->toArray();
+
         return view('home._bank_convert', [
-            'convertOptions' => $convertOptions, 
+            'convertOptions' => $convertOptions,
         ]);
     }
 
     /**
      * Gets the currency conversion rate for the user.
      *
-     * @param App\Services\CurrencyManager $service
+     * @param mixed $currency_id
+     * @param mixed $conversion_id
      *
      * @return \Illuminate\Http\RedirectResponse
      */

diff --git a/app/Models/Currency/Currency.php b/app/Models/Currency/Currency.php
@@ -3,7 +3,6 @@
 namespace App\Models\Currency;
 
 use App\Models\Model;
-use App\Models\Currency\CurrencyConversion;
 
 class Currency extends Model {
     /**

diff --git a/app/Models/Currency/CurrencyConversion.php b/app/Models/Currency/CurrencyConversion.php
@@ -3,10 +3,8 @@
 namespace App\Models\Currency;
 
 use App\Models\Model;
-use App\Models\Currency\Currency;
 
 class CurrencyConversion extends Model {
-
     /**
      * The attributes that are mass assignable.
      *
@@ -72,6 +70,8 @@ public function convert() {
 
     /**
      * Gets the ratio based on the decimal conversion rate.
+     *
+     * @param mixed $return
      */
     public function ratio($return = false) {
         $numerator = $this->rate * 100; // Convert rate to avoid floating point issues
@@ -85,11 +85,15 @@ public function ratio($return = false) {
         if ($return) {
             return [$numerator, $denominator];
         }
-        return $numerator . ":" . $denominator;
+
+        return $numerator.':'.$denominator;
     }
 
     /**
      * Gets the greatest common divisor of two numbers.
+     *
+     * @param mixed $a
+     * @param mixed $b
      */
     private function gcd($a, $b) {
         return $b ? $this->gcd($b, $a % $b) : $a;

diff --git a/app/Services/CurrencyManager.php b/app/Services/CurrencyManager.php
@@ -368,7 +368,7 @@ public function debitCurrency($sender, $recipient, $type, $data, $currency, $qua
      * @param Currency $conversion
      * @param int      $quantity
      * @param User     $user
-     * 
+     *
      * @return bool
      */
     public function convertCurrency($currency, $conversion, $quantity, $user) {
@@ -428,7 +428,6 @@ public function convertCurrency($currency, $conversion, $quantity, $user) {
         return $this->rollbackReturn(false);
     }
 
-
     /**
      * Creates a currency log.
      *

diff --git a/app/Services/CurrencyService.php b/app/Services/CurrencyService.php
@@ -56,8 +56,6 @@ public function createCurrency($data, $user) {
 
             $currency = Currency::create($data);
 
-            $this->populateConversions($currency, $data);
-
             if (!$this->logAdminAction($user, 'Created Currency', 'Created '.$currency->displayName)) {
                 throw new \Exception('Failed to log admin action.');
             }
@@ -282,14 +280,14 @@ private function populateData($data, $currency = null) {
 
     /**
      * Processes user input for creating/updating a currency's conversions.
-     * 
+     *
      * @param Currency $currency
      * @param array    $data
      */
     private function populateConversions($currency, $data) {
         $currency->conversions()->delete();
         if (isset($data['conversion_id']) && $data['conversion_id']) {
-            foreach($data['conversion_id'] as $key => $conversion_id) {
+            foreach ($data['conversion_id'] as $key => $conversion_id) {
                 $conversion = Currency::find($conversion_id);
                 if (!$conversion) {
                     continue;

diff --git a/app/Services/Service.php b/app/Services/Service.php
@@ -23,7 +23,7 @@ abstract class Service {
     /**
      * Errors.
      *
-     * @var Illuminate\Support\MessageBag
+     * @var App\Services\Illuminate\Support\MessageBag
      */
     protected $errors = null;
     protected $cache = [];
@@ -61,7 +61,7 @@ public function hasError($key) {
     /**
      * Return errors.
      *
-     * @return Illuminate\Support\MessageBag
+     * @return App\Services\Illuminate\Support\MessageBag
      */
     public function errors() {
         return $this->errors;
@@ -81,7 +81,7 @@ public function getAllErrors() {
      *
      * @param mixed $key
      *
-     * @return Illuminate\Support\MessageBag
+     * @return App\Services\Illuminate\Support\MessageBag
      */
     public function getError($key) {
         return $this->errors->get($key);
@@ -200,7 +200,7 @@ public function logAdminAction($user, $action, $action_details) {
                         // Check that the currency exists, first
                         $currency = Currency::find(config('lorekeeper.extensions.staff_rewards.currency_id'));
                         if ($currency) {
-                            if (!(new CurrencyManager)->creditCurrency(null, $user, 'Staff Reward', $action_details, $currency, $reward)) {
+                            if (!(new App\Services\CurrencyManager)->creditCurrency(null, $user, 'Staff Reward', $action_details, $currency, $reward)) {
                                 return false;
                             }
                         }
@@ -250,7 +250,7 @@ protected function setError($key, $value) {
     /**
      * Add multiple errors to the message bag.
      *
-     * @param Illuminate\Support\MessageBag $errors
+     * @param App\Services\Illuminate\Support\MessageBag $errors
      */
     protected function setErrors($errors) {
         $this->errors->merge($errors);

diff --git a/database/migrations/2024_02_09_104441_create_currency_conversion_tables.php b/database/migrations/2024_02_09_104441_create_currency_conversion_tables.php
@@ -4,13 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateCurrencyConversionTables extends Migration
-{
+class CreateCurrencyConversionTables extends Migration {
     /**
      * Run the migrations.
      */
-    public function up(): void
-    {
+    public function up(): void {
         Schema::create('currency_conversions', function (Blueprint $table) {
             $table->integer('currency_id')->unsigned();
             $table->integer('conversion_id')->unsigned();
@@ -21,8 +19,7 @@ public function up(): void
     /**
      * Reverse the migrations.
      */
-    public function down(): void
-    {
+    public function down(): void {
         Schema::dropIfExists('currency_conversions');
     }
-};
+}