kamilabs / api-core-bundle

RequestProcessor/Step/Filter/FilterStep.php

Spacing +14 added lines, -17 removed lines

@@ -40,29 +40,26 @@ 
             $reflection = $this->getArtifact('reflection');
 
             $queryModel = 'e';
-            if(strripos($filter['property'], '.')){
+            if (strripos($filter['property'], '.')) {
                 $filtr = explode('.', $filter['property']);
-                if($reflection->hasProperty(Inflector::camelize($filtr[0]))){
+                if ($reflection->hasProperty(Inflector::camelize($filtr[0]))) {
                     $property = $reflection->getProperty(Inflector::camelize($filtr[0]));
-                    $ann = $this->reader->getPropertyAnnotation($property, OneToOne::class)?:
-                            $this->reader->getPropertyAnnotation($property, OneToMany::class)?:
-                            $this->reader->getPropertyAnnotation($property, ManyToMany::class)?:
-                            $this->reader->getPropertyAnnotation($property, ManyToOne::class)?:null;
-                    if($ann){
+                    $ann = $this->reader->getPropertyAnnotation($property, OneToOne::class) ?: $this->reader->getPropertyAnnotation($property, OneToMany::class) ?: $this->reader->getPropertyAnnotation($property, ManyToMany::class) ?: $this->reader->getPropertyAnnotation($property, ManyToOne::class) ?: null;
+                    if ($ann) {
                         $reflection = new \ReflectionClass($ann->targetEntity);
-                        if($reflection->hasProperty(Inflector::camelize($filtr[1]))){
+                        if ($reflection->hasProperty(Inflector::camelize($filtr[1]))) {
                             $property = $reflection->getProperty(Inflector::camelize($filtr[1]));
                             $filter['property'] = Inflector::camelize($filtr[1]);
                             $queryBuilder->leftJoin(sprintf('e.%s', $filtr[0]), $filtr[0]{0});
                             $queryModel = Inflector::camelize($filtr[0]{0});
                         } else {
-                            throw new BadRequestHttpException('Related property ' . $filtr[1] . ' not found in related model ' . $filtr[0] . ' in filter field');
+                            throw new BadRequestHttpException('Related property '.$filtr[1].' not found in related model '.$filtr[0].' in filter field');
                         }
-                    }else{
-                        throw new BadRequestHttpException('Property ' . $filtr[0] . ' isn\'t related model in filter field');
+                    } else {
+                        throw new BadRequestHttpException('Property '.$filtr[0].' isn\'t related model in filter field');
                     }
-                } else{
-                    throw new BadRequestHttpException('Related property ' . $filtr[0] . ' not found in filter field');
+                } else {
+                    throw new BadRequestHttpException('Related property '.$filtr[0].' not found in filter field');
                 }
             }
 
@@ -111,12 +108,12 @@ 
                 sprintf(
                     $queryModel.'.%s BETWEEN :%s_min_value AND :%s_max_value',
                     $filter['property'],
-                    $filter['property'].($index+10),
-                    $filter['property'].($index+11)
+                    $filter['property'].($index + 10),
+                    $filter['property'].($index + 11)
                 )
             )
-            ->setParameter(sprintf('%s_min_value', $filter['property'].($index+10)), $filter['min'])
-            ->setParameter(sprintf('%s_max_value', $filter['property'].($index+11)), $filter['max']);
+            ->setParameter(sprintf('%s_min_value', $filter['property'].($index + 10)), $filter['min'])
+            ->setParameter(sprintf('%s_max_value', $filter['property'].($index + 11)), $filter['max']);
         ;
     }