AmsTaFFix / extjs-bundle

Service/GeneratorService.php

Spacing +18 added lines, -18 removed lines

@@ -47,13 +47,13 @@ 
      */
     public function generateRemotingApi() {
         $list = array();
-        foreach($this->remotingBundles as $bundle) {
+        foreach ($this->remotingBundles as $bundle) {
             $controllers = array();
             $bundleRef = new \ReflectionClass($bundle);
             $controllerDir = new Finder();
             $controllerDir->files()->in(dirname($bundleRef->getFileName()).'/Controller/')->name('/.*Controller\.php$/');
-            foreach($controllerDir as $controllerFile) {
-                $controller = $bundleRef->getNamespaceName() . "\\Controller\\" . substr($controllerFile->getFilename(), 0, -4);
+            foreach ($controllerDir as $controllerFile) {
+                $controller = $bundleRef->getNamespaceName()."\\Controller\\".substr($controllerFile->getFilename(), 0, -4);
                 $controllerRef = new \ReflectionClass($controller);
                 foreach ($controllerRef->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     /** @var $methodDirectAnnotation Direct */
@@ -85,7 +85,7 @@ 
                 $modelName = str_replace("\\", ".", $classRef->getName());
             }
             if ($classModelAnnotation->generateAsBase === true) {
-                $modelName = substr($modelName, 0, strrpos($modelName, '.')+1) . 'Base' . substr($modelName, strrpos($modelName, '.')+1);
+                $modelName = substr($modelName, 0, strrpos($modelName, '.') + 1).'Base'.substr($modelName, strrpos($modelName, '.') + 1);
             }
             $structure = array(
                 'name' => $modelName,
@@ -154,10 +154,10 @@ 
             if (strpos(get_class($annotation), 'Symfony\Component\Validator\Constraints') === 0) {
                 $validators[] = array_merge(
                     array('field'=>$this->convertNaming($property->getName())),
-                    $this->getValidator(substr($className, 40),$annotation)
+                    $this->getValidator(substr($className, 40), $annotation)
                 );
             }
-            switch(get_class($annotation)) {
+            switch (get_class($annotation)) {
                 case 'Tpg\ExtjsBundle\Annotation\Model\Field':
                     $field['type'] = $annotation->type;
                     break;
@@ -210,7 +210,7 @@ 
                             $format = explode(',',
                                 substr(
                                     $type,
-                                    stripos($type, '<')+2,
+                                    stripos($type, '<') + 2,
                                     -2
                                 )
                             );
@@ -274,11 +274,11 @@ 
                     $field['type'] = $this->getEntityColumnType($association['entity'], $annotation->referencedColumnName);
                     $field['useNull'] = true;
                     $association['key'] = $this->convertNaming($annotation->name);
-                    $field['mapping'] = $property->getName() . '.' . $annotation->referencedColumnName;
+                    $field['mapping'] = $property->getName().'.'.$annotation->referencedColumnName;
                     break;
             }
         }
-        if($fieldIsId){
+        if ($fieldIsId) {
             $structure['idProperty'] = $field['name'];
         }
 
@@ -310,7 +310,7 @@ 
      * @throws \Exception
      * @return string
      */
-    protected function tryToGetJoinColumnNameOfMappedBy($annotation){
+    protected function tryToGetJoinColumnNameOfMappedBy($annotation) {
         $annotation = $this->tryToGetJoinColumnAnnotationOfMappedBy($annotation);
         if ($annotation !== null) {
             if ($annotation instanceof JoinColumn) {
@@ -330,9 +330,9 @@ 
      * @param OneToMany $annotation
      * @return null|Annotation
      */
-    protected function tryToGetJoinColumnAnnotationOfMappedBy($annotation){
+    protected function tryToGetJoinColumnAnnotationOfMappedBy($annotation) {
         $result = null;
-        if($annotation->targetEntity && $annotation->mappedBy) {
+        if ($annotation->targetEntity && $annotation->mappedBy) {
             $result = $this->getAnnotation(
                 $annotation->targetEntity,
                 $annotation->mappedBy,
@@ -458,7 +458,7 @@ 
      */
     protected function getValidator($name, $annotation) {
         $validate = array();
-        switch($name) {
+        switch ($name) {
             case 'NotBlank':
             case 'NotNull':
                 $validate['type'] = "presence";
@@ -468,8 +468,8 @@ 
                 break;
             case 'Length':
                 $validate['type'] = "length";
-                $validate['max'] = (int)$annotation->max;
-                $validate['min'] = (int)$annotation->min;
+                $validate['max'] = (int) $annotation->max;
+                $validate['min'] = (int) $annotation->min;
                 break;
             case 'Regex':
                 if ($annotation->match) {
@@ -482,9 +482,9 @@ 
             case 'MinLength':
                 $validate['type'] = "length";
                 if ($name == "MaxLength") {
-                    $validate['max'] = (int)$annotation->limit;
+                    $validate['max'] = (int) $annotation->limit;
                 } else {
-                    $validate['min'] = (int)$annotation->limit;
+                    $validate['min'] = (int) $annotation->limit;
                 }
                 break;
             case 'Choice':
@@ -528,7 +528,7 @@ 
                 }
             }
         }
-        foreach(array_reverse($duplicateList) as $index) {
+        foreach (array_reverse($duplicateList) as $index) {
             unset($list[$index]);
         }
     }

Resources/skeleton/controller/UseTraitController.php

Spacing +6 added lines, -6 removed lines

@@ -2,20 +2,20 @@
 
 namespace {{ namespace }}\Controller;
 
-{% block use_statements %}
+{%block use_statements%}
 use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\QueryParam;
-{% endblock use_statements %}
+{%endblock use_statements%}
 
-{% block class_definition %}
+{%block class_definition%}
 /**
  * Class {{ controller }}Controller
  * @package {{ namespace }}\Controller
  */
 class {{ controller }}Controller extends FOSRestController
-{% endblock class_definition %}
+{%endblock class_definition%}
 {
-{% block class_body %}
+{%block class_body%}
     use Generated\{{ controller }}Controller;
-{% endblock class_body %}
+{%endblock class_body%}
 }

Resources/skeleton/controller/Controller.php

Spacing +17 added lines, -17 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
 namespace {{ namespace }}\Controller
-{%- if trait %}
+{%- if trait%}
 \Generated
-{%- endif %}
+{%- endif%}
 ;
 
-{% block use_statements %}
+{%block use_statements%}
 use Doctrine\ORM\EntityManager;
 use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Request\ParamFetcherInterface;
@@ -16,27 +16,27 @@ 
 use \Doctrine\DBAL\DBALException;
 use \JMS\Serializer\DeserializationContext;
 use {{ entity_class }};
-{% endblock use_statements %}
+{%endblock use_statements%}
 
-{% block class_definition %}
+{%block class_definition%}
 /**
  * {%- if trait %} Trait{%- else %} Class{%- endif %} {{ controller }}Controller
  */
 
-{%- if trait %}
+{%- if trait%}
 
 trait
-{%- else %}
+{%- else%}
 
 class
-{%- endif %}
+{%- endif%}
  {{ controller }}Controller
-{%- if not trait %}
+{%- if not trait%}
  extends FOSRestController
-{%- endif %}
-{% endblock class_definition %}
+{%- endif%}
+{%endblock class_definition%}
  {
-{% block class_body %}
+{%block class_body%}
     /**
      * Get detail of a {{ entity_name }} record
      * @param              $id
@@ -49,7 +49,7 @@ 
     public function get{{ controller|capitalize }}Action($id) {
         $manager = $this->get("{{ manager }}");
         $entity = $manager->getRepository('{{ entity_bundle }}:{{ entity }}')->find($id);
-        $view = View::create($entity, 200)->setSerializationContext($this->getSerializerContext(array("get")));;
+        $view = View::create($entity, 200)->setSerializationContext($this->getSerializerContext(array("get"))); ;
         return $this->handleView($view);
     }
 
@@ -82,7 +82,7 @@ 
         $start = 0;
         if ($paramFetcher->get("start") === "0") {
             if ($paramFetcher->get("page") > 1) {
-                $start = ($paramFetcher->get("page")-1) * $paramFetcher->get("limit");
+                $start = ($paramFetcher->get("page") - 1)*$paramFetcher->get("limit");
             }
         } else {
             $start = $paramFetcher->get("start");
@@ -93,10 +93,10 @@ 
             $paramFetcher->get("limit"),
             $start
         );
-        {%- if mongo %}
+        {%- if mongo%}
 // @todo fix it...
 //        $list = array_values($list->toArray());
-        {%- endif %}
+        {%- endif%}
 
         $context = $this->getSerializerContext(array('list'));
         $view = View::create($list, 200)->setSerializationContext($context);
@@ -240,7 +240,7 @@ 
         return $this->handleView(View::create(null, 204));
     }
 
-{% endblock class_body %}
+{%endblock class_body%}
 
     protected function getSerializerContext($groups = array(), $version = null) {
         $serializeContext = SerializationContext::create();

Command/GenerateEntityCommand.php

Spacing +4 added lines, -4 removed lines

@@ -39,19 +39,19 @@
                 exit(1);
             }
         }
-        $metadata = $this->getMetadata($input, $output, $outputLocation===false);
-        foreach($metadata->getMetadata() as $classMetadata) {
+        $metadata = $this->getMetadata($input, $output, $outputLocation === false);
+        foreach ($metadata->getMetadata() as $classMetadata) {
             /** @var ClassMetadata $classMetadata */
             $classMetadata->reflClass = new \ReflectionClass($classMetadata->name);
             if ($reader->getClassAnnotation($classMetadata->getReflectionClass(), 'Tpg\ExtjsBundle\Annotation\Model') !== null) {
                 if ($outputLocation) {
                     if (is_dir($outputLocation)) {
                         $baseDir = $outputLocation;
-                        foreach(explode("\\", $classMetadata->namespace) as $dir) {
+                        foreach (explode("\\", $classMetadata->namespace) as $dir) {
                             @mkdir($baseDir.DIRECTORY_SEPARATOR.$dir);
                             $baseDir .= DIRECTORY_SEPARATOR.$dir;
                         }
-                        $fileName = $baseDir.DIRECTORY_SEPARATOR.substr($classMetadata->name, strlen($classMetadata->namespace)+1).".js";
+                        $fileName = $baseDir.DIRECTORY_SEPARATOR.substr($classMetadata->name, strlen($classMetadata->namespace) + 1).".js";
                         if (!$this->canWriteFile($input, $output, $fileName)) {
                             continue;
                         }

Command/GenerateRestControllerCommand.php

Spacing +4 added lines, -4 removed lines

@@ -101,25 +101,25 @@
             }
         }
 
-        $dialog->writeSection($output, 'Controller generation: ' . $controller . 'Controller (' . $bundle->getName() . ')');
+        $dialog->writeSection($output, 'Controller generation: '.$controller.'Controller ('.$bundle->getName().')');
 
         /** @var RestControllerGenerator $generator */
         $generator = $this->getGenerator($bundle);
         if ($input->getOption('trait')) {
             $output->writeln("<info>Generating Controller with Traits</info>");
             $generator->setUseTrait(true);
-            $generator->generate($bundle,$controller,'','');
+            $generator->generate($bundle, $controller, '', '');
             $output->writeln("<info>Trait Controller Generated</info>");
             $generator->setUseTrait(false);
             $generator->setTemplateFile('UseTraitController.php');
             try {
-                $generator->generate($bundle,$controller,'','');
+                $generator->generate($bundle, $controller, '', '');
                 $output->writeln("<info>Controller Generated</info>");
             } catch (\RuntimeException $e) {
                 $output->writeln("<info>Controller Skipped</info>");
             }
         } else {
-            $generator->generate($bundle,$controller,'','');
+            $generator->generate($bundle, $controller, '', '');
             $output->writeln("<info>Controller Generated</info>");
         }
 

Annotation/Model/Field.php

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
  * @Target("PROPERTY")
  */
 class Field implements Annotation {
-    public $type="string";
+    public $type = "string";
 } 
\ No newline at end of file

Component/JsonDeserializationVisitor.php

Spacing +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
     public function visitProperty(PropertyMetadata $metadata, $data, Context $context) {
         $name = $this->namingStrategy->translateName($metadata);
 
-        if (null === $data || ! is_array($data) || ! array_key_exists($name, $data)) {
+        if (null === $data || !is_array($data) || !array_key_exists($name, $data)) {
             return;
         }
 
-        if ( ! $metadata->type) {
+        if (!$metadata->type) {
             throw new RuntimeException(sprintf('You must define a type for %s::$%s.', $metadata->reflection->class, $metadata->name));
         }
 

Generator/RestControllerGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -64,11 +64,11 @@
             'trait'      => $this->trait,
             'namespace'  => $bundle->getNamespace(),
             'bundle'     => $bundle->getName(),
-            "manager"    => ($this->mongo===true)?"doctrine_mongodb.odm.default_document_manager":"doctrine.orm.default_entity_manager",
-            'serializer' => ($this->mongo===true)?"tpg_extjs.odm_serializer":"tpg_extjs.orm_serializer",
+            "manager"    => ($this->mongo === true) ? "doctrine_mongodb.odm.default_document_manager" : "doctrine.orm.default_entity_manager",
+            'serializer' => ($this->mongo === true) ? "tpg_extjs.odm_serializer" : "tpg_extjs.orm_serializer",
             'controller'        => $controller,
             'entity_class'      => $entityClass,
-            'entity_name'       => str_replace(array("/","\\"), "_", $this->entityName),
+            'entity_name'       => str_replace(array("/", "\\"), "_", $this->entityName),
             'entity_bundle'     => $this->entityBundle->getName(),
             'entity'            => array_pop($tmpEntity),
             'route_name_prefix' => strtolower(preg_replace('/([A-Z])/', '_\\1', $bundle->getName().'_api_'))