kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-12-22 18:32:43 +01:00
parent f13a93348f
commit 8bd76d1ff0
188 changed files with 383 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Support/Import/Configuration/File/Initial.php
View File

@@ -75,7 +75,6 @@ class Initial implements ConfigurationInterface
'specifix' => [],
'delimiters' => $delimiters,
'specifics' => $specifics,
];
return $data;

1
app/Support/Import/Configuration/File/Map.php
View File

@@ -188,6 +188,7 @@ class Map implements ConfigurationInterface
/**
* @return bool
*
* @throws FireflyException
*/
private function getMappableColumns(): bool

9
app/Support/Import/Configuration/File/Roles.php
View File

@@ -48,15 +48,16 @@ class Roles implements ConfigurationInterface
* Get the data necessary to show the configuration screen.
*
* @return array
*
* @throws \League\Csv\Exception
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getData(): array
{
$config = $this->job->configuration;
$content = $this->job->uploadFileContents();
$headers = [];
$offset = 0;
$config = $this->job->configuration;
$content = $this->job->uploadFileContents();
$headers = [];
$offset = 0;
// create CSV reader.
$reader = Reader::createFromString($content);
$reader->setDelimiter($config['delimiter']);

3
app/Support/Import/Configuration/File/Upload.php
View File

@@ -107,11 +107,10 @@ class Upload implements ConfigurationInterface
$config['has-file-upload'] = $uploaded;
$repository->setConfiguration($this->job, $config);
if ($uploaded === false) {
if (false === $uploaded) {
$this->warning = 'No valid upload.';
}
return true;
}
}

8
app/Support/Import/Configuration/Spectre/InputMandatory.php
View File

@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Import\Configuration\Spectre;
use Crypt;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ImportJob;
@@ -42,6 +40,7 @@ class InputMandatory implements ConfigurationInterface
* Get the data necessary to show the configuration screen.
*
* @return array
*
* @throws FireflyException
*/
public function getData(): array
@@ -76,8 +75,6 @@ class InputMandatory implements ConfigurationInterface
/**
* @param ImportJob $job
*
* @return void
*/
public function setJob(ImportJob $job)
{
@@ -90,6 +87,7 @@ class InputMandatory implements ConfigurationInterface
* @param array $data
*
* @return bool
*
* @throws FireflyException
*/
public function storeConfiguration(array $data): bool
@@ -120,4 +118,4 @@ class InputMandatory implements ConfigurationInterface
return true;
}
}
}

12
app/Support/Import/Configuration/Spectre/SelectCountry.php
View File

@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Import\Configuration\Spectre;
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\SpectreProvider;
use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
@@ -324,8 +322,6 @@ class SelectCountry implements ConfigurationInterface
/**
* @param ImportJob $job
*
* @return void
*/
public function setJob(ImportJob $job)
{
@@ -341,12 +337,12 @@ class SelectCountry implements ConfigurationInterface
*/
public function storeConfiguration(array $data): bool
{
$config = $this->job->configuration;
$config['country'] = $data['country_code'] ?? 'XF'; // default to fake country.
$config = $this->job->configuration;
$config['country'] = $data['country_code'] ?? 'XF'; // default to fake country.
$config['selected-country'] = true;
$this->job->configuration = $config;
$this->job->configuration = $config;
$this->job->save();
return true;
}
}
}

14
app/Support/Import/Configuration/Spectre/SelectProvider.php
View File

@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Import\Configuration\Spectre;
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\SpectreProvider;
use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
@@ -69,8 +67,6 @@ class SelectProvider implements ConfigurationInterface
/**
* @param ImportJob $job
*
* @return void
*/
public function setJob(ImportJob $job)
{
@@ -86,12 +82,12 @@ class SelectProvider implements ConfigurationInterface
*/
public function storeConfiguration(array $data): bool
{
$config = $this->job->configuration;
$config['provider'] = intval($data['provider_code']) ?? 0; // default to fake country.
$config['selected-provider'] = true;
$this->job->configuration = $config;
$config = $this->job->configuration;
$config['provider'] = intval($data['provider_code']) ?? 0; // default to fake country.
$config['selected-provider'] = true;
$this->job->configuration = $config;
$this->job->save();
return true;
}
}
}