AmsTaFFix / extjs-bundle

Generator/RestControllerGenerator.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace Tpg\ExtjsBundle\Generator;
 
-use Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver;
 use Sensio\Bundle\GeneratorBundle\Generator\ControllerGenerator;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\Yaml\Yaml;

Tests/Command/BaseTestGeneratedRestController.php

Unused Use Statements -7 removed lines

@@ -3,16 +3,9 @@
 
 include_once(__DIR__ . '/../app/AppKernel.php');
 
-use Doctrine\Bundle\MongoDBBundle\Command\CreateSchemaDoctrineODMCommand;
-use Doctrine\Bundle\MongoDBBundle\Command\DropSchemaDoctrineODMCommand;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
-use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
-use Doctrine\Bundle\DoctrineBundle\Command\Proxy\CreateSchemaDoctrineCommand;
-
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Routing\Router;
 use Tpg\ExtjsBundle\Command\GenerateRestControllerCommand;
 
 class BaseTestGeneratedRestController extends WebTestCase {

TpgExtjsBundle.php

Braces +12 added lines, -8 removed lines

@@ -17,18 +17,22 @@
 
         $builder->addCompilerPass(new LazyServiceMapPass('tpg_extjs.serialization_visitor', 'format',
             function(ContainerBuilder $container, Definition $def) {
-                if ($container->hasDefinition("tpg_extjs.orm_serializer"))
-                    $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(3, $def);
-                if ($container->hasDefinition("tpg_extjs.odm_serializer"))
-                    $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(3, $def);
+                if ($container->hasDefinition("tpg_extjs.orm_serializer")) {
+                                    $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(3, $def);
+                }
+                if ($container->hasDefinition("tpg_extjs.odm_serializer")) {
+                                    $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(3, $def);
+                }
             }
         ));
         $builder->addCompilerPass(new LazyServiceMapPass('tpg_extjs.deserialization_visitor', 'format',
             function(ContainerBuilder $container, Definition $def) {
-                if ($container->hasDefinition("tpg_extjs.orm_serializer"))
-                    $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(4, $def);
-                if ($container->hasDefinition("tpg_extjs.odm_serializer"))
-                    $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(4, $def);
+                if ($container->hasDefinition("tpg_extjs.orm_serializer")) {
+                                    $container->getDefinition('tpg_extjs.orm_serializer')->replaceArgument(4, $def);
+                }
+                if ($container->hasDefinition("tpg_extjs.odm_serializer")) {
+                                    $container->getDefinition('tpg_extjs.odm_serializer')->replaceArgument(4, $def);
+                }
             }
         ));
 

Service/GeneratorService.php

Braces +20 added lines, -8 removed lines

@@ -99,8 +99,12 @@ 
                 $structure['proxy'] = array(
                     'type'=>$classModelProxyAnnotation->name,
                 ) + $classModelProxyAnnotation->option;
-                if ($classModelProxyAnnotation->reader != array()) $structure['proxy']['reader'] = $classModelProxyAnnotation->reader;
-                if ($classModelProxyAnnotation->writer != array()) $structure['proxy']['writer'] = $classModelProxyAnnotation->writer;
+                if ($classModelProxyAnnotation->reader != array()) {
+                    $structure['proxy']['reader'] = $classModelProxyAnnotation->reader;
+                }
+                if ($classModelProxyAnnotation->writer != array()) {
+                    $structure['proxy']['writer'] = $classModelProxyAnnotation->writer;
+                }
             }
             /** @var $classExclusionPolicy ExclusionPolicy */
             $classExclusionPolicy = $this->annoReader->getClassAnnotation($classRef, 'JMS\Serializer\Annotation\ExclusionPolicy');
@@ -223,8 +227,9 @@ 
                     $association['name'] = $property->getName();
                     $association['model'] = $this->getModelName($annotation->targetEntity);
                     $association['entity'] = $annotation->targetEntity;
-                    if (!isset($association['key']) || empty($association['key']))
-                        $association['key'] = $this->tryToGetJoinColumnNameOfMappedBy($annotation);
+                    if (!isset($association['key']) || empty($association['key'])) {
+                                            $association['key'] = $this->tryToGetJoinColumnNameOfMappedBy($annotation);
+                    }
                     break;
                 case 'Doctrine\ORM\Mapping\OneToMany':
                     $association['type'] = substr(get_class($annotation), 21);
@@ -359,8 +364,11 @@ 
     protected function getAnnotation($entity, $property, $annotation) {
         $classRef = new \ReflectionClass($entity);
         $propertyRef = $classRef->getProperty($property);
-        if ($propertyRef) return $this->annoReader->getPropertyAnnotation($propertyRef, $annotation);
-        else return null;
+        if ($propertyRef) {
+            return $this->annoReader->getPropertyAnnotation($propertyRef, $annotation);
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -520,9 +528,13 @@ 
         $secondList = $list;
         $duplicateList = array();
         foreach ($list as $index=>$row) {
-            if (in_array($index, $duplicateList)) continue;
+            if (in_array($index, $duplicateList)) {
+                continue;
+            }
             foreach ($secondList as $index2 => $row2) {
-                if ($index === $index2) continue;
+                if ($index === $index2) {
+                    continue;
+                }
                 if ($row == $row2) {
                     $duplicateList[] = $index2;
                 }

Listener/DeserializationAssociateRelationship.php

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
         $classMetadata = $e->getContext()->getMetadataFactory()->getMetadataForClass($className);
         /** @var PropertyMetadata $propertyMetadata */
         foreach ($classMetadata->propertyMetadata as $propertyMetadata) {
-            if ($propertyMetadata->reflection === null) continue;
+            if ($propertyMetadata->reflection === null) {
+                continue;
+            }
             /** @var JoinColumn $joinColumnAnnotation */
             $joinColumnAnnotation = $this->reader->getPropertyAnnotation(
                 $propertyMetadata->reflection,