kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Various code clean up.

Browse Source
This commit is contained in:
James Cole
2017-08-12 10:27:45 +02:00
parent a3a416b5e2
commit 9803932324
99 changed files with 322 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Support/Import/Configuration/Csv/Initial.php
View File

@@ -134,7 +134,8 @@ class Initial implements ConfigurationInterface
{
// loop specifics.
if (isset($data['specifics']) && is_array($data['specifics'])) {
foreach ($data['specifics'] as $name => $enabled) {
$names = array_keys($data['specifics']);
foreach ($names as $name) {
// verify their content.
$className = sprintf('FireflyIII\Import\Specifics\%s', $name);
if (class_exists($className)) {

8
app/Support/Import/Configuration/Csv/Map.php
View File

@@ -90,10 +90,12 @@ class Map implements ConfigurationInterface
}
}
}
foreach ($this->data as $index => $entry) {
$setIndexes = array_keys($this->data);
foreach ($setIndexes as $index) {
$this->data[$index]['values'] = array_unique($this->data[$index]['values']);
asort($this->data[$index]['values']);
}
unset($setIndexes);
// save number of rows, thus number of steps, in job:
$steps = $rowIndex * 5;
@@ -233,8 +235,8 @@ class Map implements ConfigurationInterface
{
// run specifics here:
// and this is the point where the specifix go to work.
foreach ($this->configuration['specifics'] as $name => $enabled) {
$names = array_keys($this->configuration['specifics']);
foreach ($names as $name) {
if (!in_array($name, $this->validSpecifics)) {
throw new FireflyException(sprintf('"%s" is not a valid class name', $name));
}

3
app/Support/Import/Configuration/Csv/Roles.php
View File

@@ -228,7 +228,8 @@ class Roles implements ConfigurationInterface
*/
private function processSpecifics(array $row): array
{
foreach ($this->job->configuration['specifics'] as $name => $enabled) {
$names = array_keys($this->configuration['specifics']);
foreach ($names as $name) {
/** @var SpecificInterface $specific */
$specific = app('FireflyIII\Import\Specifics\\' . $name);
$row = $specific->run($row);

4
app/Support/Search/Search.php
View File

@@ -119,7 +119,7 @@ class Search implements SearchInterface
// Filter transactions that match the given triggers.
$filtered = $set->filter(
function (Transaction $transaction) use ($words) {
function (Transaction $transaction) {
if ($this->matchModifiers($transaction)) {
return $transaction;
@@ -237,7 +237,7 @@ class Search implements SearchInterface
return false;
}
foreach ($needle as $what) {
if (($pos = strpos($haystack, $what)) !== false) {
if (strpos($haystack, $what) !== false) {
return true;
}
}