From 78912903ce5fccc1647a3609d17526a055753f71 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 26 Aug 2016 06:47:12 +0200 Subject: [PATCH] Change signature of importstorage. --- app/Import/ImportProcedure.php | 3 +-- app/Import/ImportStorage.php | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php index e55d382449..32f972343b 100644 --- a/app/Import/ImportProcedure.php +++ b/app/Import/ImportProcedure.php @@ -88,9 +88,8 @@ class ImportProcedure $cleaned = $validator->clean(); // then import collection: - $storage = new ImportStorage($cleaned); + $storage = new ImportStorage($job->user, $cleaned); $storage->setJob($job); - $storage->setUser($job->user); // and run store routine: $result = $storage->store(); diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index e3aa5aa532..02fe0d9ccb 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -40,14 +40,20 @@ class ImportStorage /** @var User */ public $user; + /** @var Collection */ + private $rules; + /** * ImportStorage constructor. * + * @param User $user * @param Collection $entries */ - public function __construct(Collection $entries) + public function __construct(User $user, Collection $entries) { $this->entries = $entries; + $this->user = $user; + $this->rules = $this->getUserRules(); } @@ -124,6 +130,13 @@ class ImportStorage return $tag; } + /** + * @return Collection + */ + private function getUserRules(): Collection + { + } + /** * @param float $amount *