APOLLO-3348 ripped out exchangeArray

ministryofjustice · Jun 27, 2014 · 0a3039d · 0a3039d
1 parent 2de3695
commit 0a3039d
Show file tree

Hide file tree

Showing 29 changed files with 10 additions and 620 deletions.
diff --git a/src/Opg/Common/Model/Entity/EntityInterface.php b/src/Opg/Common/Model/Entity/EntityInterface.php
@@ -16,10 +16,4 @@ interface EntityInterface extends InputFilterAwareInterface
      */
     public function toArray($exposeClassname = false);
 
-    /**
-     * @param array $data
-     *
-     * @return EntityInterface
-     */
-    public function exchangeArray(array $data);
 }
diff --git a/src/Opg/Core/Model/Entity/CaseItem/BusinessRule.php b/src/Opg/Core/Model/Entity/CaseItem/BusinessRule.php
@@ -2,11 +2,9 @@
 namespace Opg\Core\Model\Entity\CaseItem;
 
 use Opg\Common\Model\Entity\EntityInterface;
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Common\Model\Entity\Traits\ToArray;
 use Doctrine\ORM\Mapping as ORM;
 use \Zend\InputFilter\InputFilter;
-use \Zend\InputFilter\Factory as InputFactory;
 use JMS\Serializer\Annotation\Exclude;
 use JMS\Serializer\Annotation\ReadOnly;
 use JMS\Serializer\Annotation\Type;
@@ -27,7 +25,6 @@ class BusinessRule implements EntityInterface, \IteratorAggregate
     use \Opg\Common\Model\Entity\Traits\InputFilter;
     use \Opg\Common\Model\Entity\Traits\IteratorAggregate;
     use ToArray;
-    use ExchangeArray;
 
     /**
      * @ORM\Column(type = "integer", options = {"unsigned": true}) @ORM\GeneratedValue(strategy = "AUTO") @ORM\Id

diff --git a/src/Opg/Core/Model/Entity/CaseItem/CaseItem.php b/src/Opg/Core/Model/Entity/CaseItem/CaseItem.php
@@ -9,7 +9,6 @@
 use Opg\Common\Model\Entity\HasCorrespondenceInterface;
 use Opg\Common\Model\Entity\HasRagRating;
 use Opg\Common\Model\Entity\HasUidInterface;
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Common\Model\Entity\Traits\InputFilter;
 use Opg\Common\Model\Entity\Traits\HasNotes;
 use Opg\Common\Model\Entity\Traits\HasCorrespondence;
@@ -41,9 +40,6 @@ abstract class CaseItem implements EntityInterface, \IteratorAggregate, CaseItem
     use HasNotes;
     use UniqueIdentifier;
     use InputFilter;
-    use ExchangeArray {
-        exchangeArray as exchangeArrayTrait;
-    }
     use HasCorrespondence;
 
     const APPLICATION_TYPE_CLASSIC = 0;
@@ -431,52 +427,6 @@ public function setDocuments(ArrayCollection $documents)
         return $this;
     }
 
-    /**
-     * @TODO is this still required?
-     *
-     * @param  array $data
-     *
-     * @return CaseItem
-     */
-    public function exchangeArray(array $data)
-    {
-        $this->exchangeArrayTrait($data);
-
-        if (!empty($data['assignedUser'])) {
-            $assignedUser = new User();
-            $assignedUser->exchangeArray($data['assignedUser']);
-            $this->setAssignedUser($assignedUser);
-        }
-
-        if (!empty($data['tasks'])) {
-            $this->tasks = null;
-            foreach ($data['tasks'] as $taskData) {
-                $newTask = new Task();
-                $this->addTask(is_object($taskData) ? $taskData : $newTask->exchangeArray($taskData));
-            }
-        }
-
-        if (!empty($data['notes'])) {
-            $this->notes = null;
-            foreach ($data['notes'] as $noteData) {
-                $newNote = new Note();
-                $this->addNote(is_object($noteData) ? $noteData : $newNote->exchangeArray($noteData));
-            }
-        }
-
-        if (!empty($data['documents'])) {
-            $this->documents = null;
-            foreach ($data['documents'] as $documentData) {
-                $newDocument = new Document();
-                $this->addDocument(
-                    is_object($documentData) ? $documentData : $newDocument->exchangeArray($documentData)
-                );
-            }
-        }
-
-        return $this;
-    }
-
     /**
      * @return \ArrayIterator
      */

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Attorney.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Attorney.php
@@ -3,7 +3,6 @@
 
 use Opg\Core\Model\Entity\CaseItem\Lpa\Traits\RelationshipToDonor;
 use Zend\InputFilter\InputFilterInterface;
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Traits\Company;
 use Opg\Common\Model\Entity\Traits\ToArray;
 use Doctrine\ORM\Mapping as ORM;
@@ -21,10 +20,7 @@
  */
 class Attorney extends AttorneyAbstract implements PartyInterface, HasRelationshipToDonor
 {
-    use ToArray {
-        toArray as traitToArray;
-    }
-    use ExchangeArray;
+    use ToArray;
     use RelationshipToDonor;
 
     /**
@@ -117,16 +113,6 @@ public function getInputFilter()
         return $this->inputFilter;
     }
 
-    /**
-     * @param bool $exposeClassname
-     *
-     * @return array
-     */
-    public function toArray($exposeClassname = true)
-    {
-        return $this->traitToArray($exposeClassname);
-    }
-
     /**
      * @param \DateTime $lpa002SignatureDate
      *

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/CertificateProvider.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/CertificateProvider.php
@@ -1,7 +1,6 @@
 <?php
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Party;
 
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Common\Model\Entity\Traits\ToArray;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Traits\RelationshipToDonor;
 use Opg\Core\Model\Entity\Person\Person as BasePerson;
@@ -17,10 +16,7 @@
  */
 class CertificateProvider extends BasePerson implements PartyInterface, HasRelationshipToDonor
 {
-    use ToArray {
-        toArray as toTraitArray;
-    }
-    use ExchangeArray;
+    use ToArray;
     use RelationshipToDonor;
 
     /**
@@ -83,16 +79,6 @@ public function setStatement($statement)
         return $this;
     }
 
-    /**
-     * @param bool $exposeClassName
-     *
-     * @return array
-     */
-    public function toArray($exposeClassName = true)
-    {
-        return $this->toTraitArray($exposeClassName);
-    }
-
     /**
      * @param string $certificateProviderSkills
      *

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Correspondent.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Correspondent.php
@@ -2,7 +2,6 @@
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Party;
 
 use Opg\Common\Model\Entity\EntityInterface;
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Traits\RelationshipToDonor;
 use Opg\Core\Model\Entity\Person\Person as BasePerson;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Traits\Company;
@@ -20,22 +19,9 @@
 class Correspondent extends BasePerson implements PartyInterface, EntityInterface, HasRelationshipToDonor
 {
     use Company;
-    use ToArray {
-        toArray as toTraitArray;
-    }
-    use ExchangeArray;
+    use ToArray;
     use RelationshipToDonor;
 
-    /**
-     * @param bool $exposeClassName
-     *
-     * @return array
-     */
-    public function toArray($exposeClassName = true)
-    {
-        return $this->toTraitArray($exposeClassName);
-    }
-
     /**
      * @return InputFilterInterface
      * @codeCoverageIgnore

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Donor.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Donor.php
@@ -1,10 +1,8 @@
 <?php
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Party;
 
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Zend\InputFilter\InputFilter;
 use Opg\Common\Model\Entity\Traits\ToArray;
-use Zend\InputFilter\Factory as InputFactory;
 use Opg\Core\Model\Entity\Person\Person as BasePerson;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
@@ -13,6 +11,7 @@
 use JMS\Serializer\Annotation\Type;
 use Opg\Common\Model\Entity\DateFormat as OPGDateFormat;
 
+
 /**
  * @ORM\Entity
  *
@@ -21,10 +20,7 @@
  */
 class Donor extends BasePerson implements PartyInterface
 {
-    use ToArray {
-        toArray as traitToArray;
-    }
-    use ExchangeArray;
+    use ToArray;
 
     /**
      * @return InputFilter|InputFilterInterface
@@ -315,14 +311,4 @@ public function setNotesForPreviousLpa($notesForPreviousLpa)
 
         return $this;
     }
-
-    /**
-     * @param bool $exposeClassname
-     *
-     * @return array
-     */
-    public function toArray($exposeClassname = true)
-    {
-        return $this->traitToArray($exposeClassname);
-    }
 }
diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/NotifiedPerson.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/NotifiedPerson.php
@@ -1,7 +1,6 @@
 <?php
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Party;
 
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Traits\RelationshipToDonor;
 use Opg\Core\Model\Entity\Person\Person as BasePerson;
 use Opg\Common\Model\Entity\Traits\ToArray;
@@ -20,10 +19,7 @@
  */
 class NotifiedPerson extends BasePerson implements PartyInterface, HasRelationshipToDonor
 {
-    use ToArray {
-        toArray as toTraitArray;
-    }
-    use ExchangeArray;
+    use ToArray;
     use RelationshipToDonor;
 
     /**
@@ -87,16 +83,6 @@ public function getNotifiedDateString()
         return '';
     }
 
-    /**
-     * @param bool $exposeClassName
-     *
-     * @return array
-     */
-    public function toArray($exposeClassName = true)
-    {
-        return $this->toTraitArray($exposeClassName);
-    }
-
     /**
      * @return InputFilterInterface
      */

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/ReplacementAttorney.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/ReplacementAttorney.php
@@ -1,7 +1,6 @@
 <?php
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Party;
 
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Common\Model\Entity\Traits\ToArray;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Accessor;
@@ -16,10 +15,7 @@
  */
 class ReplacementAttorney extends AttorneyAbstract
 {
-    use ExchangeArray;
-    use ToArray {
-        toArray as traitToArray;
-    }
+    use ToArray;
 
     /**
      * @ORM\Column(type="date", nullable=true)

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/TrustCorporation.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/TrustCorporation.php
@@ -2,7 +2,6 @@
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Party;
 
 use Doctrine\ORM\Mapping as ORM;
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Common\Model\Entity\Traits\ToArray;
 
 /**
@@ -14,7 +13,6 @@
 class TrustCorporation extends AttorneyAbstract
 {
     use ToArray;
-    use ExchangeArray;
 
     const AS_ATTORNEY             = 'Attorney';
     const AS_REPLACEMENT_ATTORNEY = 'Replacement Attorney';

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Note/Note.php b/src/Opg/Core/Model/Entity/CaseItem/Note/Note.php
@@ -286,31 +286,6 @@ public function getPerson()
         return $this->person;
     }
 
-    /**
-     * @param array $data
-     *
-     * @return Note
-     */
-    public function exchangeArray(array $data)
-    {
-        empty($data['id']) ? : $this->setId($data['id']);
-        empty($data['type']) ? : $this->setType($data['type']);
-
-        if (!empty($data['user'])) {
-            $createdByUser = new User();
-            $createdByUser->exchangeArray($data['user']);
-
-            $this->setCreatedByUser($createdByUser);
-        }
-
-        empty($data['status']) ? : $this->setStatus($data['status']);
-        empty($data['description']) ? : $this->setDescription($data['description']);
-        empty($data['name']) ? : $this->setName($data['name']);
-        empty($data['createdTime']) ? : $this->setCreatedTime($data['createdTime']);
-
-        return $this;
-    }
-
     /**
      * @throws \Opg\Common\Exception\UnusedException
      * @return InputFilter

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Page/Page.php b/src/Opg/Core/Model/Entity/CaseItem/Page/Page.php
@@ -3,7 +3,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Opg\Common\Model\Entity\EntityInterface;
-use Opg\Common\Model\Entity\Traits\ExchangeArray;
 use Opg\Common\Model\Entity\Traits\ToArray;
 use Opg\Core\Model\Entity\CaseItem\Document\Document;
 use Zend\InputFilter\Factory as InputFactory;
@@ -22,7 +21,6 @@ class Page implements EntityInterface, \IteratorAggregate
 {
     use \Opg\Common\Model\Entity\Traits\InputFilter;
     use ToArray;
-    use ExchangeArray;
 
     /**
      * @ORM\Column(type = "integer", options = {"unsigned": true}) @ORM\GeneratedValue(strategy = "AUTO") @ORM\Id