From e8392cc7c833e189bb3b7a9a3a30a5560bf650aa Mon Sep 17 00:00:00 2001 From: Matt Cockayne Date: Fri, 18 Sep 2015 20:41:58 +0100 Subject: [PATCH] Alters $version property to $current_version To avoid collision with route param 'version' from the Doctrine integration with Apigility --- src/ZucchiDoctrine/Entity/AbstractEntity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ZucchiDoctrine/Entity/AbstractEntity.php b/src/ZucchiDoctrine/Entity/AbstractEntity.php index ce1cdcd..df64fe9 100755 --- a/src/ZucchiDoctrine/Entity/AbstractEntity.php +++ b/src/ZucchiDoctrine/Entity/AbstractEntity.php @@ -43,7 +43,7 @@ class AbstractEntity implements * @ORM\Column(type="integer") * @Form\Exclude */ - protected $version; + protected $current_version; /** @@ -162,4 +162,4 @@ public function fromArray($options) } } } -} \ No newline at end of file +}