spiral / framework

src/Framework/Domain/GuardPermissionsProvider.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
     public function getPermission(string $controller, string $action): Permission
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (!array_key_exists($key, $this->cache)) {
+        if (!array_key_exists($key, $this->cache)){
             $this->cache[$key] = $this->generatePermission($controller, $action);
         }
 
@@ -56,20 +56,20 @@ 
 
     private function generatePermission(string $controller, string $action): Permission
     {
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return Permission::failed();
         }
 
         $guarded = $this->reader->firstFunctionMetadata($method, Guarded::class);
-        if (!$guarded instanceof Guarded) {
+        if (!$guarded instanceof Guarded){
             return Permission::failed();
         }
 
         $namespace = $this->reader->firstClassMetadata($method->getDeclaringClass(), GuardNamespace::class);
 
-        if ($guarded->permission || ($namespace instanceof GuardNamespace && $namespace->namespace)) {
+        if ($guarded->permission || ($namespace instanceof GuardNamespace && $namespace->namespace)){
             return Permission::ok(
                 $this->makePermission($guarded, $method, $namespace),
                 $this->mapFailureException($guarded),
@@ -92,11 +92,11 @@ 
     private function makePermission(Guarded $guarded, \ReflectionMethod $method, ?GuardNamespace $ns): string
     {
         $permission = [];
-        if ($this->namespace) {
+        if ($this->namespace){
             $permission[] = $this->namespace;
         }
 
-        if ($ns !== null && $ns->namespace) {
+        if ($ns !== null && $ns->namespace){
             $permission[] = $ns->namespace;
         }
 

Braces +15 added lines, -7 removed lines

@@ -47,7 +47,8 @@ 
     public function getPermission(string $controller, string $action): Permission
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (!array_key_exists($key, $this->cache)) {
+        if (!array_key_exists($key, $this->cache))
+        {
             $this->cache[$key] = $this->generatePermission($controller, $action);
         }
 
@@ -56,20 +57,25 @@ 
 
     private function generatePermission(string $controller, string $action): Permission
     {
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return Permission::failed();
         }
 
         $guarded = $this->reader->firstFunctionMetadata($method, Guarded::class);
-        if (!$guarded instanceof Guarded) {
+        if (!$guarded instanceof Guarded)
+        {
             return Permission::failed();
         }
 
         $namespace = $this->reader->firstClassMetadata($method->getDeclaringClass(), GuardNamespace::class);
 
-        if ($guarded->permission || ($namespace instanceof GuardNamespace && $namespace->namespace)) {
+        if ($guarded->permission || ($namespace instanceof GuardNamespace && $namespace->namespace))
+        {
             return Permission::ok(
                 $this->makePermission($guarded, $method, $namespace),
                 $this->mapFailureException($guarded),
@@ -92,11 +98,13 @@ 
     private function makePermission(Guarded $guarded, \ReflectionMethod $method, ?GuardNamespace $ns): string
     {
         $permission = [];
-        if ($this->namespace) {
+        if ($this->namespace)
+        {
             $permission[] = $this->namespace;
         }
 
-        if ($ns !== null && $ns->namespace) {
+        if ($ns !== null && $ns->namespace)
+        {
             $permission[] = $ns->namespace;
         }
 

src/Framework/Domain/Annotation/Guarded.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         ?string $permission = null,
         string $else = 'forbidden',
         ?string $errorMessage = null
-    ) {
+    ){
         $this->permission = $permission;
         $this->else = $else;
         $this->errorMessage = $errorMessage;

src/AnnotatedRoutes/src/Annotation/Route.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
         string $group = self::DEFAULT_GROUP,
         array $middleware = [],
         int $priority = 0
-    ) {
+    ){
         $this->route = $route;
         $this->name = $name;
         $this->methods = $methods;

src/Bridge/DataGrid/src/Interceptor/GridInterceptor.php

Spacing +14 added lines, -14 removed lines

@@ -53,7 +53,7 @@ 
         ContainerInterface $container,
         GridFactory $gridFactory,
         ReaderInterface $reader = null
-    ) {
+    ){
         $this->response = $response;
         $this->container = $container;
         $this->gridFactory = $gridFactory;
@@ -72,14 +72,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']);
                 }
 
@@ -99,20 +99,20 @@ 
     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;
         }
 
         /** @var null|DataGrid $dataGrid */
         $dataGrid = $this->reader->firstFunctionMetadata($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null){
             return null;
         }
 
@@ -133,19 +133,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'];
         }
 
@@ -154,9 +154,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

@@ -72,14 +72,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']);
                 }
 
@@ -99,20 +102,25 @@ 
     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;
         }
 
         /** @var null|DataGrid $dataGrid */
         $dataGrid = $this->reader->firstFunctionMetadata($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null)
+        {
             return null;
         }
 
@@ -133,19 +141,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'];
         }
 
@@ -154,9 +166,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;
             }
         }

src/Bridge/DataGrid/src/Annotation/DataGrid.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         array $defaults = [],
         array $options = [],
         ?string $factory = null
-    ) {
+    ){
         $this->grid = $grid;
         $this->view = $view;
         $this->defaults = $defaults;

src/Annotations/src/AnnotationLocator.php

Spacing +10 added lines, -10 removed lines

@@ -67,9 +67,9 @@ 
      */
     public function findClasses(string $annotation): iterable
     {
-        foreach ($this->getTargets() as $target) {
+        foreach ($this->getTargets() as $target){
             $found = $this->reader->firstClassMetadata($target, $annotation);
-            if ($found !== null) {
+            if ($found !== null){
                 yield new AnnotatedClass($target, $found);
             }
         }
@@ -83,10 +83,10 @@ 
      */
     public function findMethods(string $annotation): iterable
     {
-        foreach ($this->getTargets() as $target) {
-            foreach ($target->getMethods() as $method) {
+        foreach ($this->getTargets() as $target){
+            foreach ($target->getMethods() as $method){
                 $found = $this->reader->firstFunctionMetadata($method, $annotation);
-                if ($found !== null) {
+                if ($found !== null){
                     yield new AnnotatedMethod($method, $found);
                 }
             }
@@ -101,10 +101,10 @@ 
      */
     public function findProperties(string $annotation): iterable
     {
-        foreach ($this->getTargets() as $target) {
-            foreach ($target->getProperties() as $property) {
+        foreach ($this->getTargets() as $target){
+            foreach ($target->getProperties() as $property){
                 $found = $this->reader->firstPropertyMetadata($property, $annotation);
-                if ($found !== null) {
+                if ($found !== null){
                     yield new AnnotatedProperty($property, $found);
                 }
             }
@@ -116,12 +116,12 @@ 
      */
     private function getTargets(): iterable
     {
-        if ($this->targets === []) {
+        if ($this->targets === []){
             yield from $this->classLocator->getClasses();
             return;
         }
 
-        foreach ($this->targets as $target) {
+        foreach ($this->targets as $target){
             yield from $this->classLocator->getClasses($target);
         }
     }

Braces +20 added lines, -10 removed lines

@@ -67,9 +67,11 @@ 
      */
     public function findClasses(string $annotation): iterable
     {
-        foreach ($this->getTargets() as $target) {
+        foreach ($this->getTargets() as $target)
+        {
             $found = $this->reader->firstClassMetadata($target, $annotation);
-            if ($found !== null) {
+            if ($found !== null)
+            {
                 yield new AnnotatedClass($target, $found);
             }
         }
@@ -83,10 +85,13 @@ 
      */
     public function findMethods(string $annotation): iterable
     {
-        foreach ($this->getTargets() as $target) {
-            foreach ($target->getMethods() as $method) {
+        foreach ($this->getTargets() as $target)
+        {
+            foreach ($target->getMethods() as $method)
+            {
                 $found = $this->reader->firstFunctionMetadata($method, $annotation);
-                if ($found !== null) {
+                if ($found !== null)
+                {
                     yield new AnnotatedMethod($method, $found);
                 }
             }
@@ -101,10 +106,13 @@ 
      */
     public function findProperties(string $annotation): iterable
     {
-        foreach ($this->getTargets() as $target) {
-            foreach ($target->getProperties() as $property) {
+        foreach ($this->getTargets() as $target)
+        {
+            foreach ($target->getProperties() as $property)
+            {
                 $found = $this->reader->firstPropertyMetadata($property, $annotation);
-                if ($found !== null) {
+                if ($found !== null)
+                {
                     yield new AnnotatedProperty($property, $found);
                 }
             }
@@ -116,12 +124,14 @@ 
      */
     private function getTargets(): iterable
     {
-        if ($this->targets === []) {
+        if ($this->targets === [])
+        {
             yield from $this->classLocator->getClasses();
             return;
         }
 
-        foreach ($this->targets as $target) {
+        foreach ($this->targets as $target)
+        {
             yield from $this->classLocator->getClasses($target);
         }
     }

src/Annotations/tests/LocatorTest.php

Spacing +12 added lines, -12 removed lines

@@ -29,23 +29,23 @@ 
     public function testLocateClasses()
     {
         // Annotations.
-        $classes = $this->getAnnotationsLocator(__DIR__ . '/Fixtures')->findClasses(ClassAnnotation::class);
+        $classes = $this->getAnnotationsLocator(__DIR__.'/Fixtures')->findClasses(ClassAnnotation::class);
         $classes = iterator_to_array($classes);
 
         $this->assertCount(1, $classes);
 
-        foreach ($classes as $class) {
+        foreach ($classes as $class){
             $this->assertSame(TestClass::class, $class->getClass()->getName());
             $this->assertSame('abc', $class->getAnnotation()->value);
         }
 
         // Attributes.
-        $classes = $this->getAttributesLocator(__DIR__ . '/Fixtures')->findClasses(ClassAnnotation::class);
+        $classes = $this->getAttributesLocator(__DIR__.'/Fixtures')->findClasses(ClassAnnotation::class);
         $classes = iterator_to_array($classes);
 
         $this->assertCount(1, $classes);
 
-        foreach ($classes as $class) {
+        foreach ($classes as $class){
             $this->assertSame(AttributeTestClass::class, $class->getClass()->getName());
             $this->assertSame('abc', $class->getAnnotation()->value);
         }
@@ -54,24 +54,24 @@ 
     public function testLocateProperties()
     {
         // Annotations.
-        $props = $this->getAnnotationsLocator(__DIR__ . '/Fixtures')->findProperties(PropertyAnnotation::class);
+        $props = $this->getAnnotationsLocator(__DIR__.'/Fixtures')->findProperties(PropertyAnnotation::class);
         $props = iterator_to_array($props);
 
         $this->assertCount(1, $props);
 
-        foreach ($props as $prop) {
+        foreach ($props as $prop){
             $this->assertSame(TestClass::class, $prop->getClass()->getName());
             $this->assertSame('name', $prop->getProperty()->getName());
             $this->assertSame('123', $prop->getAnnotation()->id);
         }
 
         // Attributes.
-        $props = $this->getAttributesLocator(__DIR__ . '/Fixtures')->findProperties(PropertyAnnotation::class);
+        $props = $this->getAttributesLocator(__DIR__.'/Fixtures')->findProperties(PropertyAnnotation::class);
         $props = iterator_to_array($props);
 
         $this->assertCount(1, $props);
 
-        foreach ($props as $prop) {
+        foreach ($props as $prop){
             $this->assertSame(AttributeTestClass::class, $prop->getClass()->getName());
             $this->assertSame('name', $prop->getProperty()->getName());
             $this->assertSame('123', $prop->getAnnotation()->id);
@@ -81,24 +81,24 @@ 
     public function testLocateMethods()
     {
         // Annotations.
-        $methods = $this->getAnnotationsLocator(__DIR__ . '/Fixtures')->findMethods(MethodAnnotation::class);
+        $methods = $this->getAnnotationsLocator(__DIR__.'/Fixtures')->findMethods(MethodAnnotation::class);
         $methods = iterator_to_array($methods);
 
         $this->assertCount(1, $methods);
 
-        foreach ($methods as $m) {
+        foreach ($methods as $m){
             $this->assertSame(TestClass::class, $m->getClass()->getName());
             $this->assertSame('testMethod', $m->getMethod()->getName());
             $this->assertSame('/', $m->getAnnotation()->path);
         }
 
         // Attributes.
-        $methods = $this->getAttributesLocator(__DIR__ . '/Fixtures')->findMethods(MethodAnnotation::class);
+        $methods = $this->getAttributesLocator(__DIR__.'/Fixtures')->findMethods(MethodAnnotation::class);
         $methods = iterator_to_array($methods);
 
         $this->assertCount(1, $methods);
 
-        foreach ($methods as $m) {
+        foreach ($methods as $m){
             $this->assertSame(AttributeTestClass::class, $m->getClass()->getName());
             $this->assertSame('testMethod', $m->getMethod()->getName());
             $this->assertSame('/', $m->getAnnotation()->path);

Braces +12 added lines, -6 removed lines

@@ -34,7 +34,8 @@ 
 
         $this->assertCount(1, $classes);
 
-        foreach ($classes as $class) {
+        foreach ($classes as $class)
+        {
             $this->assertSame(TestClass::class, $class->getClass()->getName());
             $this->assertSame('abc', $class->getAnnotation()->value);
         }
@@ -45,7 +46,8 @@ 
 
         $this->assertCount(1, $classes);
 
-        foreach ($classes as $class) {
+        foreach ($classes as $class)
+        {
             $this->assertSame(AttributeTestClass::class, $class->getClass()->getName());
             $this->assertSame('abc', $class->getAnnotation()->value);
         }
@@ -59,7 +61,8 @@ 
 
         $this->assertCount(1, $props);
 
-        foreach ($props as $prop) {
+        foreach ($props as $prop)
+        {
             $this->assertSame(TestClass::class, $prop->getClass()->getName());
             $this->assertSame('name', $prop->getProperty()->getName());
             $this->assertSame('123', $prop->getAnnotation()->id);
@@ -71,7 +74,8 @@ 
 
         $this->assertCount(1, $props);
 
-        foreach ($props as $prop) {
+        foreach ($props as $prop)
+        {
             $this->assertSame(AttributeTestClass::class, $prop->getClass()->getName());
             $this->assertSame('name', $prop->getProperty()->getName());
             $this->assertSame('123', $prop->getAnnotation()->id);
@@ -86,7 +90,8 @@ 
 
         $this->assertCount(1, $methods);
 
-        foreach ($methods as $m) {
+        foreach ($methods as $m)
+        {
             $this->assertSame(TestClass::class, $m->getClass()->getName());
             $this->assertSame('testMethod', $m->getMethod()->getName());
             $this->assertSame('/', $m->getAnnotation()->path);
@@ -98,7 +103,8 @@ 
 
         $this->assertCount(1, $methods);
 
-        foreach ($methods as $m) {
+        foreach ($methods as $m)
+        {
             $this->assertSame(AttributeTestClass::class, $m->getClass()->getName());
             $this->assertSame('testMethod', $m->getMethod()->getName());
             $this->assertSame('/', $m->getAnnotation()->path);

tests/app/src/Controller/DemoController.php

Braces +3 added lines, -1 removed lines

@@ -49,10 +49,12 @@
      * @Guarded("do")
      * @return string
      */
-    public function do()
+    public function do{
+        ()
     {
         return 'ok';
     }
+    }
 
     /**
      * @return string