Skip to content

Commit

Permalink
Workflow implements LoggerAwareInterface and Trait
Browse files Browse the repository at this point in the history
  • Loading branch information
sagikazarmark committed May 29, 2015
1 parent 6054374 commit b7a2484
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
22 changes: 11 additions & 11 deletions src/Workflow/StepAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@
use Ddeboer\DataImport\Workflow;
use Ddeboer\DataImport\Writer;
use Psr\Log\LoggerInterface;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\NullLogger;

/**
* A mediator between a reader and one or more writers and converters
*
* @author David de Boer <david@ddeboer.nl>
*/
class StepAggregator implements Workflow
class StepAggregator implements Workflow, LoggerAwareInterface
{
use LoggerAwareTrait;

/**
* @var Reader
*/
Expand All @@ -37,11 +41,6 @@ class StepAggregator implements Workflow
*/
private $skipItemOnFailure = false;

/**
* @var LoggerInterface
*/
private $logger;

/**
* @var \SplPriorityQueue
*/
Expand All @@ -58,15 +57,16 @@ class StepAggregator implements Workflow
protected $shouldStop = false;

/**
* @param Reader $reader
* @param LoggerInterface $logger
* @param string $name
* @param Reader $reader
* @param string $name
*/
public function __construct(Reader $reader, LoggerInterface $logger = null, $name = null)
public function __construct(Reader $reader, $name = null)
{
$this->name = $name;
$this->logger = $logger ?: new NullLogger();
$this->reader = $reader;

// Defaults
$this->logger = new NullLogger();
$this->steps = new \SplPriorityQueue();
}

Expand Down
3 changes: 2 additions & 1 deletion tests/WorkflowTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ public function testExceptionInterfaceThrownFromWriterIsCaught()
->with($exception->getMessage());


$workflow = new StepAggregator($reader, $logger);
$workflow = new StepAggregator($reader);
$workflow->setLogger($logger);
$workflow->setSkipItemOnFailure(true);
$workflow->addWriter($writer);
$workflow->process();
Expand Down

0 comments on commit b7a2484

Please sign in to comment.