@@ -49,7 +49,7 @@ |
||
| 49 | 49 | new Route('/auth/<action>', new Controller(AuthController::class)) |
| 50 | 50 | ); |
| 51 | 51 | |
| 52 | - $views->addDirectory('custom', __DIR__ . '/../../views/custom/'); |
|
| 52 | + $views->addDirectory('custom', __DIR__.'/../../views/custom/'); |
|
| 53 | 53 | $views->addEngine(TestEngine::class); |
| 54 | 54 | |
| 55 | 55 | $validation->addAlias('aliased', 'notEmpty'); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | |
| 44 | 44 | $memory->saveData('cycle', $schema); |
| 45 | 45 | |
| 46 | - if ($show->hasChanges()) { |
|
| 46 | + if ($show->hasChanges()){ |
|
| 47 | 47 | $this->writeln("\n<info>ORM Schema has been synchronized</info>"); |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -43,7 +43,8 @@ |
||
| 43 | 43 | |
| 44 | 44 | $memory->saveData('cycle', $schema); |
| 45 | 45 | |
| 46 | - if ($show->hasChanges()) { |
|
| 46 | + if ($show->hasChanges()) |
|
| 47 | + { |
|
| 47 | 48 | $this->writeln("\n<info>ORM Schema has been synchronized</info>"); |
| 48 | 49 | } |
| 49 | 50 | } |
@@ -85,11 +85,11 @@ discard block |
||
| 85 | 85 | public function getGenerators(): array |
| 86 | 86 | { |
| 87 | 87 | $result = []; |
| 88 | - foreach ($this->generators as $group) { |
|
| 89 | - foreach ($group as $generator) { |
|
| 90 | - if (is_object($generator) && !$generator instanceof Container\Autowire) { |
|
| 88 | + foreach ($this->generators as $group){ |
|
| 89 | + foreach ($group as $generator){ |
|
| 90 | + if (is_object($generator) && !$generator instanceof Container\Autowire){ |
|
| 91 | 91 | $result[] = $generator; |
| 92 | - } else { |
|
| 92 | + }else{ |
|
| 93 | 93 | $result[] = $this->container->get($generator); |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | protected function schema(MemoryInterface $memory): SchemaInterface |
| 106 | 106 | { |
| 107 | 107 | $schema = $memory->loadData('cycle'); |
| 108 | - if (is_null($schema)) { |
|
| 108 | + if (is_null($schema)){ |
|
| 109 | 109 | $schema = (new Compiler())->compile( |
| 110 | 110 | $this->container->get(Registry::class), |
| 111 | 111 | $this->getGenerators() |
@@ -85,11 +85,16 @@ discard block |
||
| 85 | 85 | public function getGenerators(): array |
| 86 | 86 | { |
| 87 | 87 | $result = []; |
| 88 | - foreach ($this->generators as $group) { |
|
| 89 | - foreach ($group as $generator) { |
|
| 90 | - if (is_object($generator) && !$generator instanceof Container\Autowire) { |
|
| 88 | + foreach ($this->generators as $group) |
|
| 89 | + { |
|
| 90 | + foreach ($group as $generator) |
|
| 91 | + { |
|
| 92 | + if (is_object($generator) && !$generator instanceof Container\Autowire) |
|
| 93 | + { |
|
| 91 | 94 | $result[] = $generator; |
| 92 | - } else { |
|
| 95 | + } |
|
| 96 | + else |
|
| 97 | + { |
|
| 93 | 98 | $result[] = $this->container->get($generator); |
| 94 | 99 | } |
| 95 | 100 | } |
@@ -105,7 +110,8 @@ discard block |
||
| 105 | 110 | protected function schema(MemoryInterface $memory): SchemaInterface |
| 106 | 111 | { |
| 107 | 112 | $schema = $memory->loadData('cycle'); |
| 108 | - if (is_null($schema)) { |
|
| 113 | + if (is_null($schema)) |
|
| 114 | + { |
|
| 109 | 115 | $schema = (new Compiler())->compile( |
| 110 | 116 | $this->container->get(Registry::class), |
| 111 | 117 | $this->getGenerators() |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | |
| 49 | 49 | public function input(InputScope $i) |
| 50 | 50 | { |
| 51 | - return 'value: ' . $i->withPrefix('section')->getValue('query', 'value'); |
|
| 51 | + return 'value: '.$i->withPrefix('section')->getValue('query', 'value'); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | public function error(): void |
@@ -49,15 +49,15 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function process(string $controller, string $action, array $parameters, CoreInterface $core) |
| 51 | 51 | { |
| 52 | - foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) { |
|
| 53 | - if (isset($parameters[$parameter])) { |
|
| 52 | + foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass){ |
|
| 53 | + if (isset($parameters[$parameter])){ |
|
| 54 | 54 | continue; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** @var FilterInterface $filter */ |
| 58 | 58 | $filter = $this->container->get($filterClass); |
| 59 | 59 | |
| 60 | - if (!$filter->isValid()) { |
|
| 60 | + if (!$filter->isValid()){ |
|
| 61 | 61 | return $this->renderInvalid($filter); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | protected function renderInvalid(FilterInterface $filter) |
| 77 | 77 | { |
| 78 | - switch ($this->strategy) { |
|
| 78 | + switch ($this->strategy){ |
|
| 79 | 79 | case self::STRATEGY_JSON_RESPONSE: |
| 80 | 80 | return [ |
| 81 | 81 | 'status' => 400, |
@@ -94,23 +94,23 @@ discard block |
||
| 94 | 94 | private function getDeclaredFilters(string $controller, string $action): array |
| 95 | 95 | { |
| 96 | 96 | $key = sprintf('%s:%s', $controller, $action); |
| 97 | - if (array_key_exists($key, $this->cache)) { |
|
| 97 | + if (array_key_exists($key, $this->cache)){ |
|
| 98 | 98 | return $this->cache[$key]; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | $this->cache[$key] = []; |
| 102 | - try { |
|
| 102 | + try{ |
|
| 103 | 103 | $method = new \ReflectionMethod($controller, $action); |
| 104 | - } catch (\ReflectionException $e) { |
|
| 104 | + }catch (\ReflectionException $e){ |
|
| 105 | 105 | return []; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - foreach ($method->getParameters() as $parameter) { |
|
| 109 | - if ($parameter->getClass() === null) { |
|
| 108 | + foreach ($method->getParameters() as $parameter){ |
|
| 109 | + if ($parameter->getClass() === null){ |
|
| 110 | 110 | continue; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if ($parameter->getClass()->implementsInterface(FilterInterface::class)) { |
|
| 113 | + if ($parameter->getClass()->implementsInterface(FilterInterface::class)){ |
|
| 114 | 114 | $this->cache[$key][$parameter->getName()] = $parameter->getClass()->getName(); |
| 115 | 115 | } |
| 116 | 116 | } |
@@ -49,15 +49,18 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function process(string $controller, string $action, array $parameters, CoreInterface $core) |
| 51 | 51 | { |
| 52 | - foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) { |
|
| 53 | - if (isset($parameters[$parameter])) { |
|
| 52 | + foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) |
|
| 53 | + { |
|
| 54 | + if (isset($parameters[$parameter])) |
|
| 55 | + { |
|
| 54 | 56 | continue; |
| 55 | 57 | } |
| 56 | 58 | |
| 57 | 59 | /** @var FilterInterface $filter */ |
| 58 | 60 | $filter = $this->container->get($filterClass); |
| 59 | 61 | |
| 60 | - if (!$filter->isValid()) { |
|
| 62 | + if (!$filter->isValid()) |
|
| 63 | + { |
|
| 61 | 64 | return $this->renderInvalid($filter); |
| 62 | 65 | } |
| 63 | 66 | |
@@ -75,7 +78,8 @@ discard block |
||
| 75 | 78 | */ |
| 76 | 79 | protected function renderInvalid(FilterInterface $filter) |
| 77 | 80 | { |
| 78 | - switch ($this->strategy) { |
|
| 81 | + switch ($this->strategy) |
|
| 82 | + { |
|
| 79 | 83 | case self::STRATEGY_JSON_RESPONSE: |
| 80 | 84 | return [ |
| 81 | 85 | 'status' => 400, |
@@ -94,23 +98,30 @@ discard block |
||
| 94 | 98 | private function getDeclaredFilters(string $controller, string $action): array |
| 95 | 99 | { |
| 96 | 100 | $key = sprintf('%s:%s', $controller, $action); |
| 97 | - if (array_key_exists($key, $this->cache)) { |
|
| 101 | + if (array_key_exists($key, $this->cache)) |
|
| 102 | + { |
|
| 98 | 103 | return $this->cache[$key]; |
| 99 | 104 | } |
| 100 | 105 | |
| 101 | 106 | $this->cache[$key] = []; |
| 102 | - try { |
|
| 107 | + try |
|
| 108 | + { |
|
| 103 | 109 | $method = new \ReflectionMethod($controller, $action); |
| 104 | - } catch (\ReflectionException $e) { |
|
| 110 | + } |
|
| 111 | + catch (\ReflectionException $e) |
|
| 112 | + { |
|
| 105 | 113 | return []; |
| 106 | 114 | } |
| 107 | 115 | |
| 108 | - foreach ($method->getParameters() as $parameter) { |
|
| 109 | - if ($parameter->getClass() === null) { |
|
| 116 | + foreach ($method->getParameters() as $parameter) |
|
| 117 | + { |
|
| 118 | + if ($parameter->getClass() === null) |
|
| 119 | + { |
|
| 110 | 120 | continue; |
| 111 | 121 | } |
| 112 | 122 | |
| 113 | - if ($parameter->getClass()->implementsInterface(FilterInterface::class)) { |
|
| 123 | + if ($parameter->getClass()->implementsInterface(FilterInterface::class)) |
|
| 124 | + { |
|
| 114 | 125 | $this->cache[$key][$parameter->getName()] = $parameter->getClass()->getName(); |
| 115 | 126 | } |
| 116 | 127 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $core = new InterceptableCore($core); |
| 40 | 40 | |
| 41 | - foreach (static::INTERCEPTORS as $interceptor) { |
|
| 41 | + foreach (static::INTERCEPTORS as $interceptor){ |
|
| 42 | 42 | $core->addInterceptor($container->get($interceptor)); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -38,7 +38,8 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $core = new InterceptableCore($core); |
| 40 | 40 | |
| 41 | - foreach (static::INTERCEPTORS as $interceptor) { |
|
| 41 | + foreach (static::INTERCEPTORS as $interceptor) |
|
| 42 | + { |
|
| 42 | 43 | $core->addInterceptor($container->get($interceptor)); |
| 43 | 44 | } |
| 44 | 45 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function testHasCookie(): void |
| 38 | 38 | { |
| 39 | - $this->http->setHandler(function () { |
|
| 39 | + $this->http->setHandler(function (){ |
|
| 40 | 40 | return (int)$this->cookies()->has('a'); |
| 41 | 41 | }); |
| 42 | 42 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | ]); |
| 55 | 55 | $this->http = $this->app->get(Http::class); |
| 56 | 56 | |
| 57 | - $this->http->setHandler(function () { |
|
| 57 | + $this->http->setHandler(function (){ |
|
| 58 | 58 | return (int)$this->cookies()->has('a'); |
| 59 | 59 | }); |
| 60 | 60 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 72 | 72 | $this->http = $this->app->get(Http::class); |
| 73 | 73 | |
| 74 | - $this->http->setHandler(function () { |
|
| 74 | + $this->http->setHandler(function (){ |
|
| 75 | 75 | return $this->cookies()->get('a'); |
| 76 | 76 | }); |
| 77 | 77 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 89 | 89 | $this->http = $this->app->get(Http::class); |
| 90 | 90 | |
| 91 | - $this->http->setHandler(function () { |
|
| 91 | + $this->http->setHandler(function (){ |
|
| 92 | 92 | $this->cookies()->set('a', 'value'); |
| 93 | 93 | |
| 94 | 94 | return 'ok'; |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 113 | 113 | $this->http = $this->app->get(Http::class); |
| 114 | 114 | |
| 115 | - $this->http->setHandler(function () { |
|
| 115 | + $this->http->setHandler(function (){ |
|
| 116 | 116 | $this->cookies()->schedule(Cookie::create('a', 'value')); |
| 117 | 117 | $this->assertSame([], $this->cookies()->getAll()); |
| 118 | 118 | $this->assertCount(1, $this->cookies()->getScheduled()); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 139 | 139 | $this->http = $this->app->get(Http::class); |
| 140 | 140 | |
| 141 | - $this->http->setHandler(function () { |
|
| 141 | + $this->http->setHandler(function (){ |
|
| 142 | 142 | $this->cookies()->delete('cookie'); |
| 143 | 143 | |
| 144 | 144 | return 'ok'; |
@@ -36,7 +36,8 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function testHasCookie(): void |
| 38 | 38 | { |
| 39 | - $this->http->setHandler(function () { |
|
| 39 | + $this->http->setHandler(function () |
|
| 40 | + { |
|
| 40 | 41 | return (int)$this->cookies()->has('a'); |
| 41 | 42 | }); |
| 42 | 43 | |
@@ -54,7 +55,8 @@ discard block |
||
| 54 | 55 | ]); |
| 55 | 56 | $this->http = $this->app->get(Http::class); |
| 56 | 57 | |
| 57 | - $this->http->setHandler(function () { |
|
| 58 | + $this->http->setHandler(function () |
|
| 59 | + { |
|
| 58 | 60 | return (int)$this->cookies()->has('a'); |
| 59 | 61 | }); |
| 60 | 62 | |
@@ -71,7 +73,8 @@ discard block |
||
| 71 | 73 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 72 | 74 | $this->http = $this->app->get(Http::class); |
| 73 | 75 | |
| 74 | - $this->http->setHandler(function () { |
|
| 76 | + $this->http->setHandler(function () |
|
| 77 | + { |
|
| 75 | 78 | return $this->cookies()->get('a'); |
| 76 | 79 | }); |
| 77 | 80 | |
@@ -88,7 +91,8 @@ discard block |
||
| 88 | 91 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 89 | 92 | $this->http = $this->app->get(Http::class); |
| 90 | 93 | |
| 91 | - $this->http->setHandler(function () { |
|
| 94 | + $this->http->setHandler(function () |
|
| 95 | + { |
|
| 92 | 96 | $this->cookies()->set('a', 'value'); |
| 93 | 97 | |
| 94 | 98 | return 'ok'; |
@@ -112,7 +116,8 @@ discard block |
||
| 112 | 116 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 113 | 117 | $this->http = $this->app->get(Http::class); |
| 114 | 118 | |
| 115 | - $this->http->setHandler(function () { |
|
| 119 | + $this->http->setHandler(function () |
|
| 120 | + { |
|
| 116 | 121 | $this->cookies()->schedule(Cookie::create('a', 'value')); |
| 117 | 122 | $this->assertSame([], $this->cookies()->getAll()); |
| 118 | 123 | $this->assertCount(1, $this->cookies()->getScheduled()); |
@@ -138,7 +143,8 @@ discard block |
||
| 138 | 143 | $this->app = $this->makeApp(['ENCRYPTER_KEY' => $key]); |
| 139 | 144 | $this->http = $this->app->get(Http::class); |
| 140 | 145 | |
| 141 | - $this->http->setHandler(function () { |
|
| 146 | + $this->http->setHandler(function () |
|
| 147 | + { |
|
| 142 | 148 | $this->cookies()->delete('cookie'); |
| 143 | 149 | |
| 144 | 150 | return 'ok'; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | public function do(GuardInterface $guard) |
| 30 | 30 | { |
| 31 | - if (!$guard->allows('do')) { |
|
| 31 | + if (!$guard->allows('do')){ |
|
| 32 | 32 | throw new ControllerException("Unauthorized permission 'do'", ControllerException::FORBIDDEN); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public function token(AuthContextInterface $authContext) |
| 39 | 39 | { |
| 40 | - if ($authContext->getToken() !== null) { |
|
| 40 | + if ($authContext->getToken() !== null){ |
|
| 41 | 41 | return $authContext->getToken()->getID(); |
| 42 | 42 | } |
| 43 | 43 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function token2() |
| 57 | 57 | { |
| 58 | - if ($this->auth->getToken() !== null) { |
|
| 58 | + if ($this->auth->getToken() !== null){ |
|
| 59 | 59 | return $this->auth->getToken()->getID(); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -26,10 +26,12 @@ discard block |
||
| 26 | 26 | $this->auth = $auth; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function do(GuardInterface $guard) |
|
| 29 | + public function do{ |
|
| 30 | + (GuardInterface $guard) |
|
| 30 | 31 | { |
| 31 | 32 | if (!$guard->allows('do')) { |
| 32 | 33 | throw new ControllerException("Unauthorized permission 'do'", ControllerException::FORBIDDEN); |
| 34 | + } |
|
| 33 | 35 | } |
| 34 | 36 | |
| 35 | 37 | return 'ok'; |
@@ -37,7 +39,8 @@ discard block |
||
| 37 | 39 | |
| 38 | 40 | public function token(AuthContextInterface $authContext) |
| 39 | 41 | { |
| 40 | - if ($authContext->getToken() !== null) { |
|
| 42 | + if ($authContext->getToken() !== null) |
|
| 43 | + { |
|
| 41 | 44 | return $authContext->getToken()->getID(); |
| 42 | 45 | } |
| 43 | 46 | |
@@ -55,7 +58,8 @@ discard block |
||
| 55 | 58 | |
| 56 | 59 | public function token2() |
| 57 | 60 | { |
| 58 | - if ($this->auth->getToken() !== null) { |
|
| 61 | + if ($this->auth->getToken() !== null) |
|
| 62 | + { |
|
| 59 | 63 | return $this->auth->getToken()->getID(); |
| 60 | 64 | } |
| 61 | 65 | |
@@ -40,8 +40,10 @@ |
||
| 40 | 40 | * @Guarded("do") |
| 41 | 41 | * @return string |
| 42 | 42 | */ |
| 43 | - public function do() |
|
| 43 | + public function do{ |
|
| 44 | + () |
|
| 44 | 45 | { |
| 45 | 46 | return 'ok'; |
| 46 | 47 | } |
| 48 | + } |
|
| 47 | 49 | } |