From 035ebfc96542c317663c41d1244dabb1260de1e4 Mon Sep 17 00:00:00 2001
From: Doug Hurst <doug.hurst@iostudio.com>
Date: Mon, 26 Nov 2012 12:27:27 -0600
Subject: [PATCH 1/3] #102 - Fix for JMS @Type change

---
 .gitignore                   | 3 +++
 Parser/JmsMetadataParser.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c49a5d8..1c8f116 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 vendor/
 composer.lock
 phpunit.xml
+
+*.iml
+.idea/
diff --git a/Parser/JmsMetadataParser.php b/Parser/JmsMetadataParser.php
index 907b0af..2dd9f04 100644
--- a/Parser/JmsMetadataParser.php
+++ b/Parser/JmsMetadataParser.php
@@ -77,7 +77,7 @@ class JmsMetadataParser implements ParserInterface
             if (!is_null($item->type)) {
                 $name = isset($item->serializedName) ? $item->serializedName : $item->name;
 
-                $dataType = $this->processDataType($item->type);
+                $dataType = $this->processDataType($item->type ? is_string($item->type) : $item->type['name']);
 
                 $params[$name] = array(
                     'dataType' => $dataType['normalized'],

From b42db62be2904437e41c47bdebb8610608a759cc Mon Sep 17 00:00:00 2001
From: Doug Hurst <doug.hurst@iostudio.com>
Date: Mon, 26 Nov 2012 12:37:44 -0600
Subject: [PATCH 2/3] #102 - Doh, PHP is not Python

---
 Parser/JmsMetadataParser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Parser/JmsMetadataParser.php b/Parser/JmsMetadataParser.php
index 2dd9f04..1f4664f 100644
--- a/Parser/JmsMetadataParser.php
+++ b/Parser/JmsMetadataParser.php
@@ -77,7 +77,7 @@ class JmsMetadataParser implements ParserInterface
             if (!is_null($item->type)) {
                 $name = isset($item->serializedName) ? $item->serializedName : $item->name;
 
-                $dataType = $this->processDataType($item->type ? is_string($item->type) : $item->type['name']);
+                $dataType = $this->processDataType(is_string($item->type) ? $item->type : $item->type['name']);
 
                 $params[$name] = array(
                     'dataType' => $dataType['normalized'],

From dad48bba3b44a55510bb00198ef948d4e0cb9a1f Mon Sep 17 00:00:00 2001
From: Doug Hurst <doug.hurst@iostudio.com>
Date: Mon, 26 Nov 2012 15:41:54 -0600
Subject: [PATCH 3/3] Removed IntelliJ stuff from gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c8f116..c49a5d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 vendor/
 composer.lock
 phpunit.xml
-
-*.iml
-.idea/