@@ -17,18 +17,22 @@ |
||
| 17 | 17 | |
| 18 | 18 | $builder->addCompilerPass(new LazyServiceMapPass('tpg_extjs.serialization_visitor', 'format', |
| 19 | 19 | function(ContainerBuilder $container, Definition $def) { |
| 20 | - if ($container->hasDefinition("tpg_extjs.orm_serializer")) |
|
| 21 | - $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(3, $def); |
|
| 22 | - if ($container->hasDefinition("tpg_extjs.odm_serializer")) |
|
| 23 | - $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(3, $def); |
|
| 20 | + if ($container->hasDefinition("tpg_extjs.orm_serializer")) { |
|
| 21 | + $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(3, $def); |
|
| 22 | + } |
|
| 23 | + if ($container->hasDefinition("tpg_extjs.odm_serializer")) { |
|
| 24 | + $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(3, $def); |
|
| 25 | + } |
|
| 24 | 26 | } |
| 25 | 27 | )); |
| 26 | 28 | $builder->addCompilerPass(new LazyServiceMapPass('tpg_extjs.deserialization_visitor', 'format', |
| 27 | 29 | function(ContainerBuilder $container, Definition $def) { |
| 28 | - if ($container->hasDefinition("tpg_extjs.orm_serializer")) |
|
| 29 | - $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(4, $def); |
|
| 30 | - if ($container->hasDefinition("tpg_extjs.odm_serializer")) |
|
| 31 | - $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(4, $def); |
|
| 30 | + if ($container->hasDefinition("tpg_extjs.orm_serializer")) { |
|
| 31 | + $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(4, $def); |
|
| 32 | + } |
|
| 33 | + if ($container->hasDefinition("tpg_extjs.odm_serializer")) { |
|
| 34 | + $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(4, $def); |
|
| 35 | + } |
|
| 32 | 36 | } |
| 33 | 37 | )); |
| 34 | 38 | |
@@ -99,8 +99,12 @@ discard block |
||
| 99 | 99 | $structure['proxy'] = array( |
| 100 | 100 | 'type'=>$classModelProxyAnnotation->name, |
| 101 | 101 | ) + $classModelProxyAnnotation->option; |
| 102 | - if ($classModelProxyAnnotation->reader != array()) $structure['proxy']['reader'] = $classModelProxyAnnotation->reader; |
|
| 103 | - if ($classModelProxyAnnotation->writer != array()) $structure['proxy']['writer'] = $classModelProxyAnnotation->writer; |
|
| 102 | + if ($classModelProxyAnnotation->reader != array()) { |
|
| 103 | + $structure['proxy']['reader'] = $classModelProxyAnnotation->reader; |
|
| 104 | + } |
|
| 105 | + if ($classModelProxyAnnotation->writer != array()) { |
|
| 106 | + $structure['proxy']['writer'] = $classModelProxyAnnotation->writer; |
|
| 107 | + } |
|
| 104 | 108 | } |
| 105 | 109 | /** @var $classExclusionPolicy ExclusionPolicy */ |
| 106 | 110 | $classExclusionPolicy = $this->annoReader->getClassAnnotation($classRef, 'JMS\Serializer\Annotation\ExclusionPolicy'); |
@@ -223,8 +227,9 @@ discard block |
||
| 223 | 227 | $association['name'] = $property->getName(); |
| 224 | 228 | $association['model'] = $this->getModelName($annotation->targetEntity); |
| 225 | 229 | $association['entity'] = $annotation->targetEntity; |
| 226 | - if (!isset($association['key']) || empty($association['key'])) |
|
| 227 | - $association['key'] = $this->tryToGetJoinColumnNameOfMappedBy($annotation); |
|
| 230 | + if (!isset($association['key']) || empty($association['key'])) { |
|
| 231 | + $association['key'] = $this->tryToGetJoinColumnNameOfMappedBy($annotation); |
|
| 232 | + } |
|
| 228 | 233 | break; |
| 229 | 234 | case 'Doctrine\ORM\Mapping\OneToMany': |
| 230 | 235 | $association['type'] = substr(get_class($annotation), 21); |
@@ -359,8 +364,11 @@ discard block |
||
| 359 | 364 | protected function getAnnotation($entity, $property, $annotation) { |
| 360 | 365 | $classRef = new \ReflectionClass($entity); |
| 361 | 366 | $propertyRef = $classRef->getProperty($property); |
| 362 | - if ($propertyRef) return $this->annoReader->getPropertyAnnotation($propertyRef, $annotation); |
|
| 363 | - else return null; |
|
| 367 | + if ($propertyRef) { |
|
| 368 | + return $this->annoReader->getPropertyAnnotation($propertyRef, $annotation); |
|
| 369 | + } else { |
|
| 370 | + return null; |
|
| 371 | + } |
|
| 364 | 372 | } |
| 365 | 373 | |
| 366 | 374 | /** |
@@ -520,9 +528,13 @@ discard block |
||
| 520 | 528 | $secondList = $list; |
| 521 | 529 | $duplicateList = array(); |
| 522 | 530 | foreach ($list as $index=>$row) { |
| 523 | - if (in_array($index, $duplicateList)) continue; |
|
| 531 | + if (in_array($index, $duplicateList)) { |
|
| 532 | + continue; |
|
| 533 | + } |
|
| 524 | 534 | foreach ($secondList as $index2 => $row2) { |
| 525 | - if ($index === $index2) continue; |
|
| 535 | + if ($index === $index2) { |
|
| 536 | + continue; |
|
| 537 | + } |
|
| 526 | 538 | if ($row == $row2) { |
| 527 | 539 | $duplicateList[] = $index2; |
| 528 | 540 | } |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | {%- if trait %} |
| 27 | 27 | |
| 28 | 28 | trait |
| 29 | -{%- else %} |
|
| 29 | +{%- else { |
|
| 30 | + %} |
|
| 30 | 31 | |
| 31 | 32 | class |
| 32 | 33 | {%- endif %} |
@@ -48,6 +49,7 @@ discard block |
||
| 48 | 49 | */ |
| 49 | 50 | public function get{{ controller|capitalize }}Action($id) { |
| 50 | 51 | $manager = $this->get("{{ manager }}"); |
| 52 | +} |
|
| 51 | 53 | $entity = $manager->getRepository('{{ entity_bundle }}:{{ entity }}')->find($id); |
| 52 | 54 | $view = View::create($entity, 200)->setSerializationContext($this->getSerializerContext(array("get")));; |
| 53 | 55 | return $this->handleView($view); |
@@ -249,7 +251,9 @@ discard block |
||
| 249 | 251 | array(\JMS\Serializer\Exclusion\GroupsExclusionStrategy::DEFAULT_GROUP), |
| 250 | 252 | $groups |
| 251 | 253 | )); |
| 252 | - if ($version !== null) $serializeContext->setVersion($version); |
|
| 254 | + if ($version !== null) { |
|
| 255 | + $serializeContext->setVersion($version); |
|
| 256 | + } |
|
| 253 | 257 | return $serializeContext; |
| 254 | 258 | } |
| 255 | 259 | } |
@@ -27,7 +27,9 @@ |
||
| 27 | 27 | $classMetadata = $e->getContext()->getMetadataFactory()->getMetadataForClass($className); |
| 28 | 28 | /** @var PropertyMetadata $propertyMetadata */ |
| 29 | 29 | foreach ($classMetadata->propertyMetadata as $propertyMetadata) { |
| 30 | - if ($propertyMetadata->reflection === null) continue; |
|
| 30 | + if ($propertyMetadata->reflection === null) { |
|
| 31 | + continue; |
|
| 32 | + } |
|
| 31 | 33 | /** @var JoinColumn $joinColumnAnnotation */ |
| 32 | 34 | $joinColumnAnnotation = $this->reader->getPropertyAnnotation( |
| 33 | 35 | $propertyMetadata->reflection, |
@@ -25,10 +25,18 @@ |
||
| 25 | 25 | "writeRecordId"=>false, |
| 26 | 26 | ); |
| 27 | 27 | } else { |
| 28 | - if (isset($values['name'])) $this->name = $values['name']; |
|
| 28 | + if (isset($values['name'])) { |
|
| 29 | + $this->name = $values['name']; |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | + if (isset($values['option'])) { |
|
| 33 | + $this->option = array_merge($this->option, $values['option']); |
|
| 34 | + } |
|
| 35 | + if (isset($values['writer'])) { |
|
| 36 | + $this->writer = array_merge($this->writer, $values['writer']); |
|
| 37 | + } |
|
| 38 | + if (isset($values['reader'])) { |
|
| 39 | + $this->reader = $values['reader']; |
|
| 29 | 40 | } |
| 30 | - if (isset($values['option'])) $this->option = array_merge($this->option, $values['option']); |
|
| 31 | - if (isset($values['writer'])) $this->writer = array_merge($this->writer, $values['writer']); |
|
| 32 | - if (isset($values['reader'])) $this->reader = $values['reader']; |
|
| 33 | 41 | } |
| 34 | 42 | } |
| 35 | 43 | \ No newline at end of file |