spiral / framework

src/DataGrid/src/GridFactory.php

Spacing +13 added lines, -13 removed lines

@@ -108,7 +108,7 @@ 
         ['view' => $view, 'source' => $source] = $this->applySorters($view, $source, $schema);
         ['view' => $view, 'source' => $source] = $this->applyPaginator($view, $source, $schema);
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source)){
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -126,11 +126,11 @@ 
     protected function getFilters($source, GridSchema $schema): array
     {
         $filters = [];
-        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value) {
-            if ($schema->hasFilter($name)) {
+        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value){
+            if ($schema->hasFilter($name)){
                 $filter = $schema->getFilter($name)->withValue($value);
 
-                if ($filter !== null) {
+                if ($filter !== null){
                     $source = $this->compiler->compile($source, $filter);
                     $filters[$name] = $filter->getValue();
                 }
@@ -142,7 +142,7 @@ 
 
     protected function applyCounter(GridInterface $view, $source, GridSchema $schema): array
     {
-        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)) {
+        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)){
             $view = $view->withOption(GridInterface::COUNT, ($this->count)($source));
         }
 
@@ -160,11 +160,11 @@ 
     protected function getSorters($source, GridSchema $schema): array
     {
         $sorters = [];
-        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value) {
-            if ($schema->hasSorter($name)) {
+        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value){
+            if ($schema->hasSorter($name)){
                 $sorter = $schema->getSorter($name)->withDirection($value);
 
-                if ($sorter !== null) {
+                if ($sorter !== null){
                     $source = $this->compiler->compile($source, $sorter);
                     $sorters[$name] = $sorter->getValue();
                 }
@@ -176,7 +176,7 @@ 
 
     protected function applyPaginator(GridInterface $view, $source, GridSchema $schema): array
     {
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null){
             ['source' => $source, 'paginator' => $paginator] = $this->getPaginator($source, $schema);
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator);
         }
@@ -187,12 +187,12 @@ 
     protected function getPaginator($source, GridSchema $schema): array
     {
         $paginator = $schema->getPaginator();
-        if (!$paginator instanceof FilterInterface) {
+        if (!$paginator instanceof FilterInterface){
             throw new CompilerException('Paginator can not be null');
         }
 
         $withValue = $paginator->withValue($this->getOption(static::KEY_PAGINATE));
-        if ($withValue === null) {
+        if ($withValue === null){
             throw new CompilerException('Paginator can not be null');
         }
 
@@ -211,7 +211,7 @@ 
     protected function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result)){
             return [];
         }
 
@@ -226,7 +226,7 @@ 
      */
     protected function getOption(string $option)
     {
-        if ($this->input->hasValue($option)) {
+        if ($this->input->hasValue($option)){
             return $this->input->getValue($option);
         }
 

Braces +26 added lines, -13 removed lines

@@ -108,7 +108,8 @@ 
         ['view' => $view, 'source' => $source] = $this->applySorters($view, $source, $schema);
         ['view' => $view, 'source' => $source] = $this->applyPaginator($view, $source, $schema);
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source))
+        {
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -126,11 +127,14 @@ 
     protected function getFilters($source, GridSchema $schema): array
     {
         $filters = [];
-        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value) {
-            if ($schema->hasFilter($name)) {
+        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value)
+        {
+            if ($schema->hasFilter($name))
+            {
                 $filter = $schema->getFilter($name)->withValue($value);
 
-                if ($filter !== null) {
+                if ($filter !== null)
+                {
                     $source = $this->compiler->compile($source, $filter);
                     $filters[$name] = $filter->getValue();
                 }
@@ -142,7 +146,8 @@ 
 
     protected function applyCounter(GridInterface $view, $source, GridSchema $schema): array
     {
-        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)) {
+        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT))
+        {
             $view = $view->withOption(GridInterface::COUNT, ($this->count)($source));
         }
 
@@ -160,11 +165,14 @@ 
     protected function getSorters($source, GridSchema $schema): array
     {
         $sorters = [];
-        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value) {
-            if ($schema->hasSorter($name)) {
+        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value)
+        {
+            if ($schema->hasSorter($name))
+            {
                 $sorter = $schema->getSorter($name)->withDirection($value);
 
-                if ($sorter !== null) {
+                if ($sorter !== null)
+                {
                     $source = $this->compiler->compile($source, $sorter);
                     $sorters[$name] = $sorter->getValue();
                 }
@@ -176,7 +184,8 @@ 
 
     protected function applyPaginator(GridInterface $view, $source, GridSchema $schema): array
     {
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null)
+        {
             ['source' => $source, 'paginator' => $paginator] = $this->getPaginator($source, $schema);
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator);
         }
@@ -187,12 +196,14 @@ 
     protected function getPaginator($source, GridSchema $schema): array
     {
         $paginator = $schema->getPaginator();
-        if (!$paginator instanceof FilterInterface) {
+        if (!$paginator instanceof FilterInterface)
+        {
             throw new CompilerException('Paginator can not be null');
         }
 
         $withValue = $paginator->withValue($this->getOption(static::KEY_PAGINATE));
-        if ($withValue === null) {
+        if ($withValue === null)
+        {
             throw new CompilerException('Paginator can not be null');
         }
 
@@ -211,7 +222,8 @@ 
     protected function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result))
+        {
             return [];
         }
 
@@ -226,7 +238,8 @@ 
      */
     protected function getOption(string $option)
     {
-        if ($this->input->hasValue($option)) {
+        if ($this->input->hasValue($option))
+        {
             return $this->input->getValue($option);
         }
 

src/DataGridBridge/src/Interceptor/GridInterceptor.php

Spacing +14 added lines, -14 removed lines

@@ -48,7 +48,7 @@ 
         GridResponseInterface $response,
         ContainerInterface $container,
         GridFactory $gridFactory
-    ) {
+    ){
         $this->response = $response;
         $this->container = $container;
         $this->gridFactory = $gridFactory;
@@ -66,14 +66,14 @@ 
     {
         $result = $core->callAction($controller, $action, $parameters);
 
-        if (is_iterable($result)) {
+        if (is_iterable($result)){
             $schema = $this->getSchema($controller, $action);
-            if ($schema !== null) {
+            if ($schema !== null){
                 $grid = $this->makeFactory($schema)
                     ->withDefaults($schema['defaults'])
                     ->create($result, $schema['grid']);
 
-                if ($schema['view'] !== null) {
+                if ($schema['view'] !== null){
                     $grid = $grid->withView($schema['view']);
                 }
 
@@ -93,14 +93,14 @@ 
     private function getSchema(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return null;
         }
 
@@ -108,7 +108,7 @@ 
 
         /** @var DataGrid $dataGrid */
         $dataGrid = $reader->getMethodAnnotation($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null){
             return null;
         }
 
@@ -129,19 +129,19 @@ 
             'factory'  => $dataGrid->factory,
         ];
 
-        if (is_string($schema['view'])) {
+        if (is_string($schema['view'])){
             $schema['view'] = $this->container->get($schema['view']);
         }
 
-        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults')) {
+        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults')){
             $schema['defaults'] = $schema['grid']->getDefaults();
         }
 
-        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions')) {
+        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions')){
             $schema['options'] = $schema['grid']->getOptions();
         }
 
-        if ($schema['view'] === null && is_callable($schema['grid'])) {
+        if ($schema['view'] === null && is_callable($schema['grid'])){
             $schema['view'] = $schema['grid'];
         }
 
@@ -150,9 +150,9 @@ 
 
     private function makeFactory(array $schema): GridFactoryInterface
     {
-        if (!empty($schema['factory']) && $this->container->has($schema['factory'])) {
+        if (!empty($schema['factory']) && $this->container->has($schema['factory'])){
             $factory = $this->container->get($schema['factory']);
-            if ($factory instanceof GridFactoryInterface) {
+            if ($factory instanceof GridFactoryInterface){
                 return $factory;
             }
         }

Braces +27 added lines, -13 removed lines

@@ -66,14 +66,17 @@ 
     {
         $result = $core->callAction($controller, $action, $parameters);
 
-        if (is_iterable($result)) {
+        if (is_iterable($result))
+        {
             $schema = $this->getSchema($controller, $action);
-            if ($schema !== null) {
+            if ($schema !== null)
+            {
                 $grid = $this->makeFactory($schema)
                     ->withDefaults($schema['defaults'])
                     ->create($result, $schema['grid']);
 
-                if ($schema['view'] !== null) {
+                if ($schema['view'] !== null)
+                {
                     $grid = $grid->withView($schema['view']);
                 }
 
@@ -93,14 +96,18 @@ 
     private function getSchema(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return null;
         }
 
@@ -108,7 +115,8 @@ 
 
         /** @var DataGrid $dataGrid */
         $dataGrid = $reader->getMethodAnnotation($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null)
+        {
             return null;
         }
 
@@ -129,19 +137,23 @@ 
             'factory'  => $dataGrid->factory,
         ];
 
-        if (is_string($schema['view'])) {
+        if (is_string($schema['view']))
+        {
             $schema['view'] = $this->container->get($schema['view']);
         }
 
-        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults')) {
+        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults'))
+        {
             $schema['defaults'] = $schema['grid']->getDefaults();
         }
 
-        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions')) {
+        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions'))
+        {
             $schema['options'] = $schema['grid']->getOptions();
         }
 
-        if ($schema['view'] === null && is_callable($schema['grid'])) {
+        if ($schema['view'] === null && is_callable($schema['grid']))
+        {
             $schema['view'] = $schema['grid'];
         }
 
@@ -150,9 +162,11 @@ 
 
     private function makeFactory(array $schema): GridFactoryInterface
     {
-        if (!empty($schema['factory']) && $this->container->has($schema['factory'])) {
+        if (!empty($schema['factory']) && $this->container->has($schema['factory']))
+        {
             $factory = $this->container->get($schema['factory']);
-            if ($factory instanceof GridFactoryInterface) {
+            if ($factory instanceof GridFactoryInterface)
+            {
                 return $factory;
             }
         }