spiral / framework

tests/app/src/Controller/TestController.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
     public function input(InputScope $i)
     {
-        return 'value: ' . $i->withPrefix('section')->getValue('query', 'value');
+        return 'value: '.$i->withPrefix('section')->getValue('query', 'value');
     }
 
     public function error(): void

src/Auth/Cycle/TokenStorage.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        if (strpos($id, ':') === false) {
+        if (strpos($id, ':') === false){
             return null;
         }
 
@@ -52,14 +52,14 @@ 
         /** @var Token $token */
         $token = $this->orm->getRepository(Token::class)->findByPK($pk);
 
-        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash))) {
+        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash))){
             // hijacked or deleted
             return null;
         }
 
         $token->setSecretValue($hash);
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()){
             $this->delete($token);
             return null;
         }
@@ -72,7 +72,7 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token(
                 $this->issueID(),
                 $this->randomHash(128),
@@ -84,7 +84,7 @@ 
             $this->em->persist($token)->run();
 
             return $token;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
         }
     }
@@ -94,9 +94,9 @@ 
      */
     public function delete(TokenInterface $token): void
     {
-        try {
+        try{
             $this->em->delete($token)->run();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
         }
     }
@@ -115,7 +115,7 @@ 
             $this->orm->getSource(Token::class)->getTable()
         );
 
-        while ((clone $query)->where('id', $id)->count('id') !== 0) {
+        while ((clone $query)->where('id', $id)->count('id') !== 0){
             $id = $this->randomHash(64);
         }
 

Braces +18 added lines, -8 removed lines

@@ -43,7 +43,8 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        if (strpos($id, ':') === false) {
+        if (strpos($id, ':') === false)
+        {
             return null;
         }
 
@@ -52,14 +53,16 @@ 
         /** @var Token $token */
         $token = $this->orm->getRepository(Token::class)->findByPK($pk);
 
-        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash))) {
+        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash)))
+        {
             // hijacked or deleted
             return null;
         }
 
         $token->setSecretValue($hash);
 
-        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime()) {
+        if ($token->getExpiresAt() !== null && $token->getExpiresAt() < new \DateTime())
+        {
             $this->delete($token);
             return null;
         }
@@ -72,7 +75,8 @@ 
      */
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token(
                 $this->issueID(),
                 $this->randomHash(128),
@@ -84,7 +88,9 @@ 
             $this->em->persist($token)->run();
 
             return $token;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
         }
     }
@@ -94,9 +100,12 @@ 
      */
     public function delete(TokenInterface $token): void
     {
-        try {
+        try
+        {
             $this->em->delete($token)->run();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
         }
     }
@@ -115,7 +124,8 @@ 
             $this->orm->getSource(Token::class)->getTable()
         );
 
-        while ((clone $query)->where('id', $id)->count('id') !== 0) {
+        while ((clone $query)->where('id', $id)->count('id') !== 0)
+        {
             $id = $this->randomHash(64);
         }
 

src/Domain/FilterInterceptor.php

Spacing +10 added lines, -10 removed lines

@@ -49,15 +49,15 @@ 
      */
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
-        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) {
-            if (isset($parameters[$parameter])) {
+        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass){
+            if (isset($parameters[$parameter])){
                 continue;
             }
 
             /** @var FilterInterface $filter */
             $filter = $this->container->get($filterClass);
 
-            if (!$filter->isValid()) {
+            if (!$filter->isValid()){
                 return $this->renderInvalid($filter);
             }
 
@@ -75,7 +75,7 @@ 
      */
     protected function renderInvalid(FilterInterface $filter)
     {
-        switch ($this->strategy) {
+        switch ($this->strategy){
             case self::STRATEGY_JSON_RESPONSE:
                 return [
                     'status' => 400,
@@ -94,23 +94,23 @@ 
     private function getDeclaredFilters(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] = [];
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
-            if ($parameter->getClass() === null) {
+        foreach ($method->getParameters() as $parameter){
+            if ($parameter->getClass() === null){
                 continue;
             }
 
-            if ($parameter->getClass()->implementsInterface(FilterInterface::class)) {
+            if ($parameter->getClass()->implementsInterface(FilterInterface::class)){
                 $this->cache[$key][$parameter->getName()] = $parameter->getClass()->getName();
             }
         }

Braces +21 added lines, -10 removed lines

@@ -49,15 +49,18 @@ 
      */
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
-        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) {
-            if (isset($parameters[$parameter])) {
+        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass)
+        {
+            if (isset($parameters[$parameter]))
+            {
                 continue;
             }
 
             /** @var FilterInterface $filter */
             $filter = $this->container->get($filterClass);
 
-            if (!$filter->isValid()) {
+            if (!$filter->isValid())
+            {
                 return $this->renderInvalid($filter);
             }
 
@@ -75,7 +78,8 @@ 
      */
     protected function renderInvalid(FilterInterface $filter)
     {
-        switch ($this->strategy) {
+        switch ($this->strategy)
+        {
             case self::STRATEGY_JSON_RESPONSE:
                 return [
                     'status' => 400,
@@ -94,23 +98,30 @@ 
     private function getDeclaredFilters(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] = [];
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
-            if ($parameter->getClass() === null) {
+        foreach ($method->getParameters() as $parameter)
+        {
+            if ($parameter->getClass() === null)
+            {
                 continue;
             }
 
-            if ($parameter->getClass()->implementsInterface(FilterInterface::class)) {
+            if ($parameter->getClass()->implementsInterface(FilterInterface::class))
+            {
                 $this->cache[$key][$parameter->getName()] = $parameter->getClass()->getName();
             }
         }

src/Bootloader/DomainBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     {
         $core = new InterceptableCore($core);
 
-        foreach (static::INTERCEPTORS as $interceptor) {
+        foreach (static::INTERCEPTORS as $interceptor){
             $core->addInterceptor($container->get($interceptor));
         }
 

Braces +2 added lines, -1 removed lines

@@ -38,7 +38,8 @@
     {
         $core = new InterceptableCore($core);
 
-        foreach (static::INTERCEPTORS as $interceptor) {
+        foreach (static::INTERCEPTORS as $interceptor)
+        {
             $core->addInterceptor($container->get($interceptor));
         }
 

tests/Framework/Http/CookiesTest.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
 
     public function testHasCookie(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return (int)$this->cookies()->has('a');
         });
 
@@ -54,7 +54,7 @@ 
         ]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return (int)$this->cookies()->has('a');
         });
 
@@ -71,7 +71,7 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             return $this->cookies()->get('a');
         });
 
@@ -88,7 +88,7 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             $this->cookies()->set('a', 'value');
 
             return 'ok';
@@ -112,7 +112,7 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             $this->cookies()->schedule(Cookie::create('a', 'value'));
             $this->assertSame([], $this->cookies()->getAll());
             $this->assertCount(1, $this->cookies()->getScheduled());
@@ -138,7 +138,7 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function (){
             $this->cookies()->delete('cookie');
 
             return 'ok';

Braces +12 added lines, -6 removed lines

@@ -36,7 +36,8 @@ 
 
     public function testHasCookie(): void
     {
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return (int)$this->cookies()->has('a');
         });
 
@@ -54,7 +55,8 @@ 
         ]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return (int)$this->cookies()->has('a');
         });
 
@@ -71,7 +73,8 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             return $this->cookies()->get('a');
         });
 
@@ -88,7 +91,8 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             $this->cookies()->set('a', 'value');
 
             return 'ok';
@@ -112,7 +116,8 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             $this->cookies()->schedule(Cookie::create('a', 'value'));
             $this->assertSame([], $this->cookies()->getAll());
             $this->assertCount(1, $this->cookies()->getScheduled());
@@ -138,7 +143,8 @@ 
         $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]);
         $this->http = $this->app->get(Http::class);
 
-        $this->http->setHandler(function () {
+        $this->http->setHandler(function ()
+        {
             $this->cookies()->delete('cookie');
 
             return 'ok';

tests/app/src/Controller/AuthController.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 
     public function do(GuardInterface $guard)
     {
-        if (!$guard->allows('do')) {
+        if (!$guard->allows('do')){
             throw new ControllerException("Unauthorized permission 'do'", ControllerException::FORBIDDEN);
         }
 
@@ -37,7 +37,7 @@ 
 
     public function token(AuthContextInterface $authContext)
     {
-        if ($authContext->getToken() !== null) {
+        if ($authContext->getToken() !== null){
             return $authContext->getToken()->getID();
         }
 
@@ -55,7 +55,7 @@ 
 
     public function token2()
     {
-        if ($this->auth->getToken() !== null) {
+        if ($this->auth->getToken() !== null){
             return $this->auth->getToken()->getID();
         }
 

Braces +7 added lines, -3 removed lines

@@ -26,10 +26,12 @@ 
         $this->auth = $auth;
     }
 
-    public function do(GuardInterface $guard)
+    public function do{
+        (GuardInterface $guard)
     {
         if (!$guard->allows('do')) {
             throw new ControllerException("Unauthorized permission 'do'", ControllerException::FORBIDDEN);
+    }
         }
 
         return 'ok';
@@ -37,7 +39,8 @@ 
 
     public function token(AuthContextInterface $authContext)
     {
-        if ($authContext->getToken() !== null) {
+        if ($authContext->getToken() !== null)
+        {
             return $authContext->getToken()->getID();
         }
 
@@ -55,7 +58,8 @@ 
 
     public function token2()
     {
-        if ($this->auth->getToken() !== null) {
+        if ($this->auth->getToken() !== null)
+        {
             return $this->auth->getToken()->getID();
         }
 

tests/app/src/Controller/DemoController.php

Braces +3 added lines, -1 removed lines

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

src/Domain/CycleInterceptor.php

Spacing +11 added lines, -11 removed lines

@@ -45,22 +45,22 @@ 
     {
         $entities = $this->getDeclaredEntities($controller, $action);
 
-        foreach ($entities as $parameter => $role) {
+        foreach ($entities as $parameter => $role){
             $value = $this->getParameter($parameter, $parameters, count($entities) === 1);
-            if ($value === null) {
+            if ($value === null){
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
                 );
             }
 
-            if (is_object($value)) {
+            if (is_object($value)){
                 // pre-filled
                 continue;
             }
 
             $entity = $this->resolveEntity($role, $value);
-            if ($entity === null) {
+            if ($entity === null){
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
@@ -81,7 +81,7 @@ 
      */
     protected function getParameter(string $role, array $parameters, bool $useDefault = false)
     {
-        if (!$useDefault) {
+        if (!$useDefault){
             return $parameters[$role] ?? null;
         }
 
@@ -106,23 +106,23 @@ 
     private function getDeclaredEntities(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] = [];
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
-            if ($parameter->getClass() === null) {
+        foreach ($method->getParameters() as $parameter){
+            if ($parameter->getClass() === null){
                 continue;
             }
 
-            if ($this->orm->getSchema()->defines($parameter->getClass()->getName())) {
+            if ($this->orm->getSchema()->defines($parameter->getClass()->getName())){
                 $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($parameter->getClass()->getName());
             }
         }

Braces +23 added lines, -11 removed lines

@@ -45,22 +45,26 @@ 
     {
         $entities = $this->getDeclaredEntities($controller, $action);
 
-        foreach ($entities as $parameter => $role) {
+        foreach ($entities as $parameter => $role)
+        {
             $value = $this->getParameter($parameter, $parameters, count($entities) === 1);
-            if ($value === null) {
+            if ($value === null)
+            {
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
                 );
             }
 
-            if (is_object($value)) {
+            if (is_object($value))
+            {
                 // pre-filled
                 continue;
             }
 
             $entity = $this->resolveEntity($role, $value);
-            if ($entity === null) {
+            if ($entity === null)
+            {
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
@@ -81,7 +85,8 @@ 
      */
     protected function getParameter(string $role, array $parameters, bool $useDefault = false)
     {
-        if (!$useDefault) {
+        if (!$useDefault)
+        {
             return $parameters[$role] ?? null;
         }
 
@@ -106,23 +111,30 @@ 
     private function getDeclaredEntities(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] = [];
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
-            if ($parameter->getClass() === null) {
+        foreach ($method->getParameters() as $parameter)
+        {
+            if ($parameter->getClass() === null)
+            {
                 continue;
             }
 
-            if ($this->orm->getSchema()->defines($parameter->getClass()->getName())) {
+            if ($this->orm->getSchema()->defines($parameter->getClass()->getName()))
+            {
                 $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($parameter->getClass()->getName());
             }
         }

src/Domain/GuardInterceptor.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
     {
         $permission = $this->getPermissions($controller, $action);
 
-        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) {
+        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)){
             throw new ControllerException(
                 sprintf(
                     'Unauthorized permission `%s` for action `%s`->`%s`',
@@ -79,14 +79,14 @@ 
     private function getPermissions(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;
         }
 
@@ -104,7 +104,7 @@ 
             Guarded::class
         );
 
-        if ($action === null) {
+        if ($action === null){
             return null;
         }
 
@@ -126,7 +126,7 @@ 
             ControllerException::FORBIDDEN
         ];
 
-        if ($guarded->permission === null && $ns === null) {
+        if ($guarded->permission === null && $ns === null){
             throw new InterceptorException(sprintf(
                 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`',
                 $method->getDeclaringClass()->getName(),
@@ -134,16 +134,16 @@ 
             ));
         }
 
-        if ($ns !== null) {
+        if ($ns !== null){
             $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]);
         }
 
-        if ($this->namespace !== null) {
+        if ($this->namespace !== null){
             // global namespace
             $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]);
         }
 
-        switch ($guarded->else) {
+        switch ($guarded->else){
             case 'badAction':
                 $permission[1] = ControllerException::BAD_ACTION;
                 break;

Braces +19 added lines, -9 removed lines

@@ -52,7 +52,8 @@ 
     {
         $permission = $this->getPermissions($controller, $action);
 
-        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) {
+        if ($permission !== null && !$this->guard->allows($permission[0], $parameters))
+        {
             throw new ControllerException(
                 sprintf(
                     'Unauthorized permission `%s` for action `%s`->`%s`',
@@ -79,14 +80,18 @@ 
     private function getPermissions(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;
         }
 
@@ -104,7 +109,8 @@ 
             Guarded::class
         );
 
-        if ($action === null) {
+        if ($action === null)
+        {
             return null;
         }
 
@@ -126,7 +132,8 @@ 
             ControllerException::FORBIDDEN
         ];
 
-        if ($guarded->permission === null && $ns === null) {
+        if ($guarded->permission === null && $ns === null)
+        {
             throw new InterceptorException(sprintf(
                 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`',
                 $method->getDeclaringClass()->getName(),
@@ -134,16 +141,19 @@ 
             ));
         }
 
-        if ($ns !== null) {
+        if ($ns !== null)
+        {
             $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]);
         }
 
-        if ($this->namespace !== null) {
+        if ($this->namespace !== null)
+        {
             // global namespace
             $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]);
         }
 
-        switch ($guarded->else) {
+        switch ($guarded->else)
+        {
             case 'badAction':
                 $permission[1] = ControllerException::BAD_ACTION;
                 break;