AmsTaFFix / extjs-bundle

Tests/Command/ORM/GeneratedRestControllerAssociationTest.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
         $manager = $this->client->getContainer()->get("doctrine.orm.default_entity_manager");
         $owner = new CarOwner();
         $owner->setName("james");
-        foreach($this->records as $record) {
+        foreach ($this->records as $record) {
             $owner->addCar($record);
         }
         $manager->persist($owner);
@@ -44,7 +44,7 @@ 
 
     public function testGetWithAssociation() {
         $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);

Tests/Command/ORM/GenerateRestControllerCommandTest.php

Spacing +1 added lines, -1 removed lines

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

Tests/Command/ODM/GeneratedRestControllerReferenceAssociationTest.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 class GeneratedRestControllerReferenceAssociationTest extends BaseTestGeneratedRestController {
     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/ODM/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;

Tests/Command/ODM/GeneratedRestControllerEmbeddedAssociationTest.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/app_test.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
     exit(0);
 }
 
-$loader = require_once __DIR__ . '/bootstrap.php';
-require_once __DIR__ . '/app/AppKernel.php';
+$loader = require_once __DIR__.'/bootstrap.php';
+require_once __DIR__.'/app/AppKernel.php';
 use Symfony\Component\HttpFoundation\Request;
 
 $kernel = new AppKernel('test', true);

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

Indentation +3 added lines, -3 removed lines

@@ -30,12 +30,12 @@
 
 class
 {%- endif %}
- {{ controller }}Controller
+    {{ controller }}Controller
 {%- if not trait %}
- extends FOSRestController
+    extends FOSRestController
 {%- endif %}
 {% endblock class_definition %}
- {
+    {
 {% block class_body %}
     /**
      * Get detail of a {{ entity_name }} record

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

Braces +6 added lines, -2 removed lines

@@ -26,7 +26,8 @@ 
 {%- if trait %}
 
 trait
-{%- else %}
+{%- else {
+    %}
 
 class
 {%- endif %}
@@ -48,6 +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")));;
         return $this->handleView($view);
@@ -249,7 +251,9 @@ 
             array(\JMS\Serializer\Exclusion\GroupsExclusionStrategy::DEFAULT_GROUP),
             $groups
         ));
-        if ($version !== null) $serializeContext->setVersion($version);
+        if ($version !== null) {
+            $serializeContext->setVersion($version);
+        }
         return $serializeContext;
     }
 }

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