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

Some cleaning up courtesy of PHPStorm.

Browse Source
This commit is contained in:
James Cole
2016-01-15 23:12:52 +01:00
parent 3857e8d49f
commit 7bf75128a8
56 changed files with 193 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Converter/CategoryName.php
View File

@@ -24,7 +24,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
$category = Category::firstOrCreateEncrypted(
[
'name' => $this->value,
'user_id' => Auth::user()->id
'user_id' => Auth::user()->id,
]
);
}

42
app/Helpers/Csv/Data.php
View File

@@ -64,7 +64,7 @@ class Data
protected function sessionHasHeaders()
{
if (Session::has('csv-has-headers')) {
$this->hasHeaders = (bool) Session::get('csv-has-headers');
$this->hasHeaders = (bool)Session::get('csv-has-headers');
}
}
@@ -78,42 +78,42 @@ class Data
protected function sessionDateFormat()
{
if (Session::has('csv-date-format')) {
$this->dateFormat = (string) Session::get('csv-date-format');
$this->dateFormat = (string)Session::get('csv-date-format');
}
}
protected function sessionCsvFileLocation()
{
if (Session::has('csv-file')) {
$this->csvFileLocation = (string) Session::get('csv-file');
$this->csvFileLocation = (string)Session::get('csv-file');
}
}
protected function sessionMap()
{
if (Session::has('csv-map')) {
$this->map = (array) Session::get('csv-map');
$this->map = (array)Session::get('csv-map');
}
}
protected function sessionRoles()
{
if (Session::has('csv-roles')) {
$this->roles = (array) Session::get('csv-roles');
$this->roles = (array)Session::get('csv-roles');
}
}
protected function sessionMapped()
{
if (Session::has('csv-mapped')) {
$this->mapped = (array) Session::get('csv-mapped');
$this->mapped = (array)Session::get('csv-mapped');
}
}
protected function sessionSpecifix()
{
if (Session::has('csv-specifix')) {
$this->specifix = (array) Session::get('csv-specifix');
$this->specifix = (array)Session::get('csv-specifix');
}
}
@@ -135,7 +135,7 @@ class Data
/**
*
* @param mixed $dateFormat
* @param mixed $dateFormat
*/
public function setDateFormat($dateFormat)
{
@@ -145,7 +145,7 @@ class Data
/**
*
* @param int $importAccount
* @param int $importAccount
*/
public function setImportAccount($importAccount)
{
@@ -164,7 +164,7 @@ class Data
/**
*
* @param bool $hasHeaders
* @param bool $hasHeaders
*/
public function setHasHeaders($hasHeaders)
{
@@ -183,7 +183,7 @@ class Data
/**
*
* @param array $map
* @param array $map
*/
public function setMap(array $map)
{
@@ -202,7 +202,7 @@ class Data
/**
*
* @param array $mapped
* @param array $mapped
*/
public function setMapped(array $mapped)
{
@@ -219,19 +219,19 @@ class Data
if (strlen($this->csvFileContent) === 0) {
$this->loadCsvFile();
}
if (is_null($this->reader)) {
$this->reader = Reader::createFromString($this->getCsvFileContent());
$this->reader->setDelimiter($this->delimiter);
}
return $this->reader;
}
protected function loadCsvFile()
{
$file = $this->getCsvFileLocation();
$content = file_get_contents($file);
$file = $this->getCsvFileLocation();
$content = file_get_contents($file);
$contentDecrypted = Crypt::decrypt($content);
$this->setCsvFileContent($contentDecrypted);
}
@@ -247,7 +247,7 @@ class Data
/**
*
* @param string $csvFileLocation
* @param string $csvFileLocation
*/
public function setCsvFileLocation($csvFileLocation)
{
@@ -266,7 +266,7 @@ class Data
/**
*
* @param string $csvFileContent
* @param string $csvFileContent
*/
public function setCsvFileContent($csvFileContent)
{
@@ -284,7 +284,7 @@ class Data
/**
*
* @param array $roles
* @param array $roles
*/
public function setRoles(array $roles)
{
@@ -303,7 +303,7 @@ class Data
/**
*
* @param array $specifix
* @param array $specifix
*/
public function setSpecifix($specifix)
{
@@ -322,7 +322,7 @@ class Data
/**
*
* @param string $delimiter
* @param string $delimiter
*/
public function setDelimiter($delimiter)
{

2
app/Helpers/Report/ReportHelper.php
View File

@@ -18,8 +18,8 @@ use FireflyIII\Helpers\Collection\Expense;
use FireflyIII\Helpers\Collection\Income;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Budget as BudgetModel;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal;

4
app/Helpers/Report/ReportQuery.php
View File

@@ -50,7 +50,7 @@ class ReportQuery implements ReportQueryInterface
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_from`.`amount`) AS `sum`')
DB::Raw('SUM(`t_from`.`amount`) AS `sum`'),
]
);
$array = [];
@@ -95,7 +95,7 @@ class ReportQuery implements ReportQueryInterface
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_to`.`amount`) AS `sum`')
DB::Raw('SUM(`t_to`.`amount`) AS `sum`'),
]
);
$array = [];