AmsTaFFix / extjs-bundle

Generator/RestControllerGenerator.php

Doc Comments +17 added lines

@@ -18,6 +18,9 @@ 
      */
     protected $entityBundle;
 
+    /**
+     * @param string $name
+     */
     public function setEntityName($name) {
         $this->entityName = $name;
     }
@@ -25,18 +28,32 @@ 
         $this->entityBundle = $bundle;
     }
 
+    /**
+     * @param boolean $flag
+     */
     public function setUseTrait($flag) {
         $this->trait = $flag;
     }
 
+    /**
+     * @param string $file
+     */
     public function setTemplateFile($file) {
         $this->template = $file;
     }
 
+    /**
+     * @param boolean $mongo
+     */
     public function setMongo($mongo) {
         $this->mongo = $mongo;
     }
 
+    /**
+     * @param string $controller
+     * @param string $routeFormat
+     * @param string $templateFormat
+     */
     public function generate(BundleInterface $bundle, $controller, $routeFormat, $templateFormat, array $actions = array())
     {
         $dir = $bundle->getPath();

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;

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_'))

Service/GeneratorService.php

Doc Comments +13 added lines, -4 removed lines

@@ -27,10 +27,16 @@ 
     protected $remotingBundles = array();
     protected $fieldsParams = array();
 
+    /**
+     * @param AnnotationReader $reader
+     */
     public function setAnnotationReader($reader) {
         $this->annoReader = $reader;
     }
 
+    /**
+     * @param \Test\TestBundle\Mockup\TwigEngineMokcup $engine
+     */
     public function setTwigEngine($engine) {
         $this->twig = $engine;
     }
@@ -127,6 +133,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     protected function convertNaming($name) {
         return $name;
     }
@@ -351,9 +360,9 @@ 
 
     /**
      * Get Annotation
-     * @param $entity
-     * @param $property
-     * @param $annotation
+     * @param string $entity
+     * @param string $property
+     * @param string $annotation
      * @return Annotation|null
      */
     protected function getAnnotation($entity, $property, $annotation) {
@@ -367,7 +376,7 @@ 
      * Get Column Type of a model.
      *
      * @param $entity string Class name of the entity
-     * @param $property string
+     * @param string $property string
      * @return string
      */
     public function getEntityColumnType($entity, $property) {

Indentation +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
                     break;
                 case 'Doctrine\ORM\Mapping\JoinColumns':
                     if (count($annotation->value) > 1) {
-                      throw new \Exception('Multiple foreign key is not supported');
+                        throw new \Exception('Multiple foreign key is not supported');
                     }
                     $saveField = true;
                     $field['name'] = $this->convertNaming($annotation->value[0]->name);
@@ -284,7 +284,7 @@ 
 
         /** Add the ability to override field parameter */
         if (isset($this->fieldsParams[$field['type']])) {
-          $field = array_merge($field, $this->fieldsParams[$field['type']]);
+            $field = array_merge($field, $this->fieldsParams[$field['type']]);
         }
 
         if (!empty($association)) {

Spacing +17 added lines, -17 removed lines

@@ -47,12 +47,12 @@ 
      */
     public function generateRemotingApi() {
         $list = array();
-        foreach($this->remotingBundles as $bundle) {
+        foreach ($this->remotingBundles as $bundle) {
             $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 */
@@ -84,7 +84,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,
@@ -153,10 +153,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;
@@ -209,7 +209,7 @@ 
                             $format = explode(',',
                                 substr(
                                     $type,
-                                    stripos($type, '<')+2,
+                                    stripos($type, '<') + 2,
                                     -2
                                 )
                             );
@@ -273,11 +273,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'];
         }
 
@@ -309,7 +309,7 @@ 
      * @throws \Exception
      * @return string
      */
-    protected function tryToGetJoinColumnNameOfMappedBy($annotation){
+    protected function tryToGetJoinColumnNameOfMappedBy($annotation) {
         $annotation = $this->tryToGetJoinColumnAnnotationOfMappedBy($annotation);
         if ($annotation !== null) {
             if ($annotation instanceof JoinColumn) {
@@ -329,9 +329,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,
@@ -457,7 +457,7 @@ 
      */
     protected function getValidator($name, $annotation) {
         $validate = array();
-        switch($name) {
+        switch ($name) {
             case 'NotBlank':
             case 'NotNull':
                 $validate['type'] = "presence";
@@ -467,8 +467,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) {
@@ -481,9 +481,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':

Braces +14 added lines, -6 removed lines

@@ -98,8 +98,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');
@@ -222,8 +226,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);
@@ -358,8 +363,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;
+        }
     }
 
     /**

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 {

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Tpg\ExtjsBundle\Tests\Command;
 
-include_once(__DIR__ . '/../app/AppKernel.php');
+include_once(__DIR__.'/../app/AppKernel.php');
 
 use Doctrine\Bundle\MongoDBBundle\Command\CreateSchemaDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\Command\DropSchemaDoctrineODMCommand;

Tests/Fixtures/Test/TestBundle/Document/Client.php

Doc Comments +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
     /**
      * Add orders
      *
-     * @param Test\TestBundle\Document\Order $orders
+     * @param Order $orders
      *
      * @return $this
      */
@@ -109,7 +109,7 @@ 
     /**
      * Remove orders
      *
-     * @param Test\TestBundle\Document\Order $orders
+     * @param Order $orders
      */
     public function removeOrder(\Test\TestBundle\Document\Order $orders)
     {
@@ -120,7 +120,7 @@ 
     /**
      * Get orders
      *
-     * @return Doctrine\Common\Collections\Collection $orders
+     * @return \Doctrine\Common\Collections\ArrayCollection $orders
      */
     public function getOrders()
     {

Twig/ExtjsExtension.php

Doc Comments -2 removed lines

@@ -48,8 +48,6 @@
     /**
      * Inject ExtJs Model into the DOM.
      *
-     * @param boolean $injection Produce ExtJS model code on the page directly?
-     * @param string $model Model Name.
      */
     public function injectModel() {
         $params = func_get_args();

Controller/GeneratorController.php

Spacing +9 added lines, -9 removed lines

@@ -20,26 +20,26 @@ 
         $kernel = $this->get('kernel');
         if ($models === null) {
             $list = $this->container->getParameter("tpg_extjs.entities");
-            return new StreamedResponse(function () use($list, $generator, $kernel) {
+            return new StreamedResponse(function() use($list, $generator, $kernel) {
                 foreach ($list as $configEntityLine) {
                     list($bundleName, $path) = explode("/", substr($configEntityLine, 1), 2);
                     /** @var Bundle $bundle */
                     $bundle = $kernel->getBundle($bundleName, true);
 
                     /** Entity end with backslash, it is a directory */
-                    $loadAllEntitiesFromDir = ($configEntityLine[strlen($configEntityLine)-1] == "/");
+                    $loadAllEntitiesFromDir = ($configEntityLine[strlen($configEntityLine) - 1] == "/");
 
-                    if ( $loadAllEntitiesFromDir ) {
+                    if ($loadAllEntitiesFromDir) {
                         $bundleRef = new \ReflectionClass($bundle);
                         $dir = new Finder();
                         $dir->files()->depth('== 0')->in(dirname($bundleRef->getFileName()).'/'.$path)->name('/.*\.php$/');
-                        foreach($dir as $file) {
+                        foreach ($dir as $file) {
                             /** @var SplFileInfo $file*/
-                            $entityClassname = $bundleRef->getNamespaceName() . "\\" . str_replace("/", "\\", $path) . substr($file->getFilename(), 0, -4);
+                            $entityClassname = $bundleRef->getNamespaceName()."\\".str_replace("/", "\\", $path).substr($file->getFilename(), 0, -4);
                             echo $generator->generateMarkupForEntity($entityClassname);
                         }
-                    } else  {
-                        $entityClassname = $bundle->getNamespace() . "\\" . str_replace("/", "\\", $path);
+                    } else {
+                        $entityClassname = $bundle->getNamespace()."\\".str_replace("/", "\\", $path);
                         echo $generator->generateMarkupForEntity($entityClassname);
                     }
                 }
@@ -51,7 +51,7 @@ 
             if (!is_array($models)) {
                 $models = array($models);
             }
-            return new StreamedResponse(function () use($models, $generator) {
+            return new StreamedResponse(function() use($models, $generator) {
                 foreach ($models as $model) {
                     $model = str_replace(".", "\\", $model);
                     echo $generator->generateMarkupForEntity($model);
@@ -102,7 +102,7 @@ 
         } else {
             $requestData = array();
             $i = 0;
-            foreach($actionparams as $parameter) {
+            foreach ($actionparams as $parameter) {
                 $requestData[$parameter->getName()] = $data[$i++];
             }
         }

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);
+                }
             }
         ));
 

Tests/Service/GeneratorServiceTest.php

Indentation +7 added lines, -7 removed lines

@@ -21,19 +21,19 @@
         $this->twigEngine = new TwigEngineMokcup();
         $this->service->setTwigEngine($this->twigEngine);
         $this->service->setModelFieldsParameters(array(
-          "date" => array( "format" => "d-m-y")
+            "date" => array( "format" => "d-m-y")
         ));
     }
 
     public function testCustomFieldParameters() {
-      $this->service->generateMarkupForEntity('Test\TestBundle\Model\Person');
-      $fieldsType = array();
-      foreach ($this->twigEngine->renderParameters['fields'] as $field) {
+        $this->service->generateMarkupForEntity('Test\TestBundle\Model\Person');
+        $fieldsType = array();
+        foreach ($this->twigEngine->renderParameters['fields'] as $field) {
         if (isset($field['format'])) {
-          $fieldsType[$field['name']] = $field['format'];
+            $fieldsType[$field['name']] = $field['format'];
+        }
         }
-      }
-      $this->assertEquals("d-m-y", $fieldsType['createdAt']);
+        $this->assertEquals("d-m-y", $fieldsType['createdAt']);
     }
 
     public function testEntityProperty() {

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $this->twigEngine = new TwigEngineMokcup();
         $this->service->setTwigEngine($this->twigEngine);
         $this->service->setModelFieldsParameters(array(
-          "date" => array( "format" => "d-m-y")
+          "date" => array("format" => "d-m-y")
         ));
     }
 

Tests/Command/ORM/GeneratedRestControllerTest.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
     public function testGetsActionWithFilterOnName() {
         $filter = json_encode(array(
-            array('property'=>'name','value'=>'Ford')
+            array('property'=>'name', 'value'=>'Ford')
         ));
         $this->client->request('GET', '/cars.json?filter='.$filter);
         $content = json_decode($this->client->getResponse()->getContent(), true);
@@ -26,7 +26,7 @@ 
 
     public function testGetsActionWithFilterOnPlateNumner() {
         $filter = json_encode(array(
-            array('property'=>'plateNumber','value'=>'BB243')
+            array('property'=>'plateNumber', 'value'=>'BB243')
         ));
         $this->client->request('GET', '/cars.json?filter='.$filter);
         $content = json_decode($this->client->getResponse()->getContent(), true);