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 {

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() {

Service/GeneratorService.php

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)) {