Optimize imports.

This commit is contained in:
James Cole
2018-03-10 20:30:09 +01:00
parent da1dc67e1c
commit dd2f3c861b
35 changed files with 125 additions and 163 deletions

View File

@@ -29,7 +29,6 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class AutoCompleteController.
@@ -52,7 +51,7 @@ class AutoCompleteController extends Controller
);
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -66,7 +65,7 @@ class AutoCompleteController extends Controller
$return = array_unique($collector->getJournals()->pluck('description')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -92,7 +91,7 @@ class AutoCompleteController extends Controller
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -125,7 +124,7 @@ class AutoCompleteController extends Controller
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -148,7 +147,7 @@ class AutoCompleteController extends Controller
$return = array_unique($filtered->pluck('name')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -166,6 +165,6 @@ class AutoCompleteController extends Controller
$return = array_unique($collector->getJournals()->pluck('description')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
}

View File

@@ -35,7 +35,6 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class BoxController.
@@ -58,7 +57,7 @@ class BoxController extends Controller
$cache->addProperty($today);
$cache->addProperty('box-available');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// get available amount
$currency = app('amount')->getDefaultCurrency();
@@ -86,7 +85,7 @@ class BoxController extends Controller
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -104,7 +103,7 @@ class BoxController extends Controller
$cache->addProperty($end);
$cache->addProperty('box-balance');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// prep some arrays:
$incomes = [];
@@ -160,7 +159,7 @@ class BoxController extends Controller
$cache->store($response);
return Response::json($response);
return response()->json($response);
}
/**
@@ -178,7 +177,7 @@ class BoxController extends Controller
$cache->addProperty($end);
$cache->addProperty('box-bills');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/*
@@ -195,7 +194,7 @@ class BoxController extends Controller
];
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -224,7 +223,7 @@ class BoxController extends Controller
$cache->addProperty($date);
$cache->addProperty('box-net-worth');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$netWorth = [];
$accounts = $repository->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
@@ -256,6 +255,6 @@ class BoxController extends Controller
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
}

View File

@@ -29,7 +29,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Services\Currency\ExchangeRateInterface;
use Illuminate\Http\Request;
use Log;
use Response;
/**
* Class ExchangeController.
@@ -67,6 +66,6 @@ class ExchangeController extends Controller
$return['amount'] = round($return['amount'], $toCurrency->decimal_places);
}
return Response::json($return);
return response()->json($return);
}
}

View File

@@ -25,7 +25,6 @@ namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Response;
/**
* Class FrontpageController.
@@ -66,6 +65,6 @@ class FrontpageController extends Controller
$html = view('json.piggy-banks', compact('info'))->render();
}
return Response::json(['html' => $html]);
return response()->json(['html' => $html]);
}
}

View File

@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Support\Facades\Preferences;
use Log;
use Response;
/**
* Class IntroController.
@@ -47,7 +46,7 @@ class IntroController
if (0 === count($specificSteps)) {
Log::debug(sprintf('No specific steps for route "%s" and page "%s"', $route, $specificPage));
return Response::json($steps);
return response()->json($steps);
}
if ($this->hasOutroStep($route)) {
// @codeCoverageIgnoreStart
@@ -64,7 +63,7 @@ class IntroController
$steps = array_merge($steps, $specificSteps);
}
return Response::json($steps);
return response()->json($steps);
}
/**
@@ -103,7 +102,7 @@ class IntroController
Log::debug(sprintf('Going to mark the following route as NOT done: %s with special "%s" (%s)', $route, $specialPage, $key));
Preferences::set($key, false);
return Response::json(['message' => trans('firefly.intro_boxes_after_refresh')]);
return response()->json(['message' => trans('firefly.intro_boxes_after_refresh')]);
}
/**
@@ -121,7 +120,7 @@ class IntroController
Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key));
Preferences::set($key, true);
return Response::json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
return response()->json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
}
/**