RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 15:51:48 +03:00
Code Issues Projects Releases Wiki Activity

rebased, fixed cs

Browse Source
This commit is contained in:
Evan Villemez 2012-08-24 13:32:52 -04:00
parent 9b94ae4b2c
commit d4fe982300
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Parser/JmsMetadataParser.php
View File

@ -96,9 +96,9 @@ class JmsMetadataParser implements ParserInterface
$exp = explode("\\", $nested); $exp = explode("\\", $nested);
return sprintf("array of objects (%s)", end($exp)); return sprintf("array of objects (%s)", end($exp));
} else {
return "array";
} }
return "array";
} }
$exp = explode("\\", $type); $exp = explode("\\", $type);
@ -111,11 +111,10 @@ class JmsMetadataParser implements ParserInterface
* get the name of the class in the array, if available. * get the name of the class in the array, if available.
* *
* @param string $type * @param string $type
* @return string|false * @return string|null
*/ */
protected function getNestedClassInArray($type) protected function getNestedClassInArray($type)
{ {
//could be some type of array with <V>, or <K,V> //could be some type of array with <V>, or <K,V>
$regEx = "/\<([A-Za-z0-9\\\]*)(\,?\s?(.*))?\>/"; $regEx = "/\<([A-Za-z0-9\\\]*)(\,?\s?(.*))?\>/";
if (preg_match($regEx, $type, $matches)) { if (preg_match($regEx, $type, $matches)) {
@ -124,7 +123,7 @@ class JmsMetadataParser implements ParserInterface
return in_array($matched, array('boolean', 'integer', 'string', 'double', 'array', 'DateTime')) ? false : $matched; return in_array($matched, array('boolean', 'integer', 'string', 'double', 'array', 'DateTime')) ? false : $matched;
} }
return false; return null;
} }
/** /**
@ -133,7 +132,7 @@ class JmsMetadataParser implements ParserInterface
* http://jmsyst.com/bundles/JMSSerializerBundle/master/reference/annotations#type * http://jmsyst.com/bundles/JMSSerializerBundle/master/reference/annotations#type
* *
* @param string $type * @param string $type
* @return string|false * @return string|null
*/ */
protected function getNestedClass($type) protected function getNestedClass($type)
{ {
@ -147,7 +146,7 @@ class JmsMetadataParser implements ParserInterface
} }
//or could just be a class name (potentially) //or could just be a class name (potentially)
return (null === $this->factory->getMetadataForClass($type)) ? false : $type; return (null === $this->factory->getMetadataForClass($type)) ? null : $type;
} }
protected function getDescription($className, $propertyName) protected function getDescription($className, $propertyName)