Merge branch 'master' into PostgresMerge

ministryofjustice · May 27, 2014 · 99adf91 · 99adf91
2 parents 11a84dc + cec8ec5
commit 99adf91
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/src/Opg/Common/Model/Entity/Traits/HasSystemStatus.php b/src/Opg/Common/Model/Entity/Traits/HasSystemStatus.php
@@ -12,6 +12,7 @@ trait HasSystemStatus
     /**
      * @ORM\Column(type = "boolean",options={"default":1})
      * @var bool
+     * @Type("boolean")
      */
     protected $systemStatus = true;
 

diff --git a/src/Opg/Common/Model/Entity/Traits/UniqueIdentifier.php b/src/Opg/Common/Model/Entity/Traits/UniqueIdentifier.php
@@ -1,6 +1,7 @@
 <?php
 namespace Opg\Common\Model\Entity\Traits;
 use Doctrine\ORM\Mapping as ORM;
+use JMS\Serializer\Annotation\Type;
 
 /**
  * Class UniqueIdentifier
@@ -14,6 +15,7 @@ trait UniqueIdentifier
      *
      * @ORM\Column(type = "bigint", options = {"unsigned": true}, unique = true)
      * @var int
+     * @Type("integer")
      * @Groups({"api-poa-list","api-task-list"})
      */
     protected $uId;

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/AttorneyAbstract.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/AttorneyAbstract.php
@@ -7,6 +7,7 @@
 use Opg\Core\Model\Entity\Person\Person as BasePerson;
 use Doctrine\ORM\Mapping as ORM;
 use Zend\InputFilter\Factory as InputFactory;
+use JMS\Serializer\Annotation\Type;
 
 /**
  * Class AttorneyAbstract
@@ -20,12 +21,14 @@ abstract class AttorneyAbstract extends BasePerson implements HasSystemStatusInt
     /**
      * @ORM\Column(type="string", nullable=true)
      * @var string
+     * @Type("string")
      */
     protected $dxNumber;
 
     /**
      * @ORM\Column(type="string", nullable=true)
      * @var string
+     * @Type("string")
      */
     protected $dxExchange;
 

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Correspondent.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Correspondent.php
@@ -10,6 +10,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Zend\InputFilter\Factory as InputFactory;
 use Zend\Validator\Callback;
+use JMS\Serializer\Annotation\Type;
 
 /**
  * @ORM\Entity

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Traits/Company.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Traits/Company.php
@@ -2,6 +2,7 @@
 namespace Opg\Core\Model\Entity\CaseItem\Lpa\Traits;
 
 use Doctrine\ORM\Mapping as ORM;
+use JMS\Serializer\Annotation\Type;
 
 /**
  * Class Company
@@ -12,12 +13,14 @@ trait Company
     /**
      * @ORM\Column(type = "string", nullable = true)
      * @var string
+     * @Type("string")
      */
     protected $companyName;
 
     /**
      * @ORM\Column(type = "string", nullable = true)
      * @var string
+     * @Type("string")
      */
     protected $companyNumber;