Refactor census assistant, add unit tests

1 files changed, 22 insertions, 16 deletions

diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php
index 8c6283e819..6d6710380f 100644
--- a/app/Census/AbstractCensusColumn.php
+++ b/app/Census/AbstractCensusColumn.php
@@ -16,32 +16,38 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census column
  */
 class AbstractCensusColumn {
-	/** @var Individual - the individual recorded on the census */
-	protected $individul;
+	/** @var CensusInterface - the place where the census took place */
+	protected $census;
 
-	/** @var Place - the place where the census took place */
-	protected $place;
+	/**
+	 * Create a column for a census
+	 *
+	 * @param CensusInterface $census
+	 */
+	public function __construct(CensusInterface $census) {
+		$this->census = $census;
+	}
 
-	/** @var Date - the date when the census took place */
-	protected $date;
+	/**
+	 * When did this census occur
+	 *
+	 * @return Date
+	 */
+	public function date() {
+		return new Date($this->census->censusDate());
+	}
 
 	/**
-	 * Create a census column
+	 * Where did this census occur
 	 *
-	 * @param Individual $individual
-	 * @param Place      $place
-	 * @param Date       $date
+	 * @return Date
 	 */
-	public function __construct(Individual $individual, Place $place, Date $date) {
-		$this->individual = $individual;
-		$this->place      = $place;
-		$this->date       = $date;
+	public function place() {
+		return $this->census->censusPlace();
 	}
 }