AmsTaFFix / extjs-bundle

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

Tests/Command/ODM/GeneratedRestControllerReferenceAssociationTest.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
     public function testGetWithAssociation() {
         $filter = json_encode(array(
-            array('property'=>'name','value'=>'Invoice 1')
+            array('property'=>'name', 'value'=>'Invoice 1')
         ));
         $this->client->request('GET', '/orders.json?filter='.$filter);
         $content = json_decode($this->client->getResponse()->getContent(), true);

Tests/Command/ORM/GenerateRestControllerCommandTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Tpg\ExtjsBundle\Tests\Command\ODM;
 
-include_once(__DIR__ . '/../../app/AppKernel.php');
+include_once(__DIR__.'/../../app/AppKernel.php');
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;

Service/GeneratorService.php

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':