AmsTaFFix / extjs-bundle

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

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;
+        }
     }
 
     /**