@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | { |
53 | 53 | $permission = $this->getPermissions($controller, $action); |
54 | 54 | |
55 | - if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) { |
|
55 | + if ($permission !== null && !$this->guard->allows($permission[0], $parameters)){ |
|
56 | 56 | throw new ControllerException($permission[2], $permission[1]); |
57 | 57 | } |
58 | 58 | |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | private function getPermissions(string $controller, string $action): ?array |
72 | 72 | { |
73 | 73 | $key = sprintf('%s:%s', $controller, $action); |
74 | - if (array_key_exists($key, $this->cache)) { |
|
74 | + if (array_key_exists($key, $this->cache)){ |
|
75 | 75 | return $this->cache[$key]; |
76 | 76 | } |
77 | 77 | |
78 | 78 | $this->cache[$key] = null; |
79 | - try { |
|
79 | + try{ |
|
80 | 80 | $method = new \ReflectionMethod($controller, $action); |
81 | - } catch (\ReflectionException $e) { |
|
81 | + }catch (\ReflectionException $e){ |
|
82 | 82 | return null; |
83 | 83 | } |
84 | 84 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | Guarded::class |
97 | 97 | ); |
98 | 98 | |
99 | - if ($action === null) { |
|
99 | + if ($action === null){ |
|
100 | 100 | return null; |
101 | 101 | } |
102 | 102 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $guarded->errorMessage ?? sprintf('Unauthorized access `%s`', $guarded->permission ?? $method->getName()) |
120 | 120 | ]; |
121 | 121 | |
122 | - if ($guarded->permission === null && $ns === null) { |
|
122 | + if ($guarded->permission === null && $ns === null){ |
|
123 | 123 | throw new InterceptorException( |
124 | 124 | sprintf( |
125 | 125 | 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`', |
@@ -129,16 +129,16 @@ discard block |
||
129 | 129 | ); |
130 | 130 | } |
131 | 131 | |
132 | - if ($ns !== null) { |
|
132 | + if ($ns !== null){ |
|
133 | 133 | $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]); |
134 | 134 | } |
135 | 135 | |
136 | - if ($this->namespace !== null) { |
|
136 | + if ($this->namespace !== null){ |
|
137 | 137 | // global namespace |
138 | 138 | $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]); |
139 | 139 | } |
140 | 140 | |
141 | - switch ($guarded->else) { |
|
141 | + switch ($guarded->else){ |
|
142 | 142 | case 'unauthorized': |
143 | 143 | $permission[1] = ControllerException::UNAUTHORIZED; |
144 | 144 | break; |
@@ -52,7 +52,8 @@ discard block |
||
52 | 52 | { |
53 | 53 | $permission = $this->getPermissions($controller, $action); |
54 | 54 | |
55 | - if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) { |
|
55 | + if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) |
|
56 | + { |
|
56 | 57 | throw new ControllerException($permission[2], $permission[1]); |
57 | 58 | } |
58 | 59 | |
@@ -71,14 +72,18 @@ discard block |
||
71 | 72 | private function getPermissions(string $controller, string $action): ?array |
72 | 73 | { |
73 | 74 | $key = sprintf('%s:%s', $controller, $action); |
74 | - if (array_key_exists($key, $this->cache)) { |
|
75 | + if (array_key_exists($key, $this->cache)) |
|
76 | + { |
|
75 | 77 | return $this->cache[$key]; |
76 | 78 | } |
77 | 79 | |
78 | 80 | $this->cache[$key] = null; |
79 | - try { |
|
81 | + try |
|
82 | + { |
|
80 | 83 | $method = new \ReflectionMethod($controller, $action); |
81 | - } catch (\ReflectionException $e) { |
|
84 | + } |
|
85 | + catch (\ReflectionException $e) |
|
86 | + { |
|
82 | 87 | return null; |
83 | 88 | } |
84 | 89 | |
@@ -96,7 +101,8 @@ discard block |
||
96 | 101 | Guarded::class |
97 | 102 | ); |
98 | 103 | |
99 | - if ($action === null) { |
|
104 | + if ($action === null) |
|
105 | + { |
|
100 | 106 | return null; |
101 | 107 | } |
102 | 108 | |
@@ -119,7 +125,8 @@ discard block |
||
119 | 125 | $guarded->errorMessage ?? sprintf('Unauthorized access `%s`', $guarded->permission ?? $method->getName()) |
120 | 126 | ]; |
121 | 127 | |
122 | - if ($guarded->permission === null && $ns === null) { |
|
128 | + if ($guarded->permission === null && $ns === null) |
|
129 | + { |
|
123 | 130 | throw new InterceptorException( |
124 | 131 | sprintf( |
125 | 132 | 'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`', |
@@ -129,16 +136,19 @@ discard block |
||
129 | 136 | ); |
130 | 137 | } |
131 | 138 | |
132 | - if ($ns !== null) { |
|
139 | + if ($ns !== null) |
|
140 | + { |
|
133 | 141 | $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]); |
134 | 142 | } |
135 | 143 | |
136 | - if ($this->namespace !== null) { |
|
144 | + if ($this->namespace !== null) |
|
145 | + { |
|
137 | 146 | // global namespace |
138 | 147 | $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]); |
139 | 148 | } |
140 | 149 | |
141 | - switch ($guarded->else) { |
|
150 | + switch ($guarded->else) |
|
151 | + { |
|
142 | 152 | case 'unauthorized': |
143 | 153 | $permission[1] = ControllerException::UNAUTHORIZED; |
144 | 154 | break; |
@@ -38,15 +38,15 @@ |
||
38 | 38 | public function getServices(): array |
39 | 39 | { |
40 | 40 | $result = []; |
41 | - foreach ($this->classes->getClasses(ServiceInterface::class) as $service) { |
|
42 | - if (!$service->isInstantiable()) { |
|
41 | + foreach ($this->classes->getClasses(ServiceInterface::class) as $service){ |
|
42 | + if (!$service->isInstantiable()){ |
|
43 | 43 | continue; |
44 | 44 | } |
45 | 45 | |
46 | 46 | $instance = $this->container->get($service->getName()); |
47 | 47 | |
48 | - foreach ($service->getInterfaces() as $interface) { |
|
49 | - if ($interface->isSubclassOf(ServiceInterface::class)) { |
|
48 | + foreach ($service->getInterfaces() as $interface){ |
|
49 | + if ($interface->isSubclassOf(ServiceInterface::class)){ |
|
50 | 50 | $result[$interface->getName()] = $instance; |
51 | 51 | } |
52 | 52 | } |
@@ -38,15 +38,19 @@ |
||
38 | 38 | public function getServices(): array |
39 | 39 | { |
40 | 40 | $result = []; |
41 | - foreach ($this->classes->getClasses(ServiceInterface::class) as $service) { |
|
42 | - if (!$service->isInstantiable()) { |
|
41 | + foreach ($this->classes->getClasses(ServiceInterface::class) as $service) |
|
42 | + { |
|
43 | + if (!$service->isInstantiable()) |
|
44 | + { |
|
43 | 45 | continue; |
44 | 46 | } |
45 | 47 | |
46 | 48 | $instance = $this->container->get($service->getName()); |
47 | 49 | |
48 | - foreach ($service->getInterfaces() as $interface) { |
|
49 | - if ($interface->isSubclassOf(ServiceInterface::class)) { |
|
50 | + foreach ($service->getInterfaces() as $interface) |
|
51 | + { |
|
52 | + if ($interface->isSubclassOf(ServiceInterface::class)) |
|
53 | + { |
|
50 | 54 | $result[$interface->getName()] = $instance; |
51 | 55 | } |
52 | 56 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | EnvironmentInterface $env, |
40 | 40 | FinalizerInterface $finalizer, |
41 | 41 | ContainerInterface $container |
42 | - ) { |
|
42 | + ){ |
|
43 | 43 | $this->env = $env; |
44 | 44 | $this->finalizer = $finalizer; |
45 | 45 | $this->container = $container; |
@@ -69,14 +69,14 @@ discard block |
||
69 | 69 | $worker = $this->container->get(Worker::class); |
70 | 70 | $locator = $this->container->get(LocatorInterface::class); |
71 | 71 | |
72 | - foreach ($locator->getServices() as $interface => $service) { |
|
72 | + foreach ($locator->getServices() as $interface => $service){ |
|
73 | 73 | $server->registerService($interface, $service); |
74 | 74 | } |
75 | 75 | |
76 | 76 | $server->serve( |
77 | 77 | $worker, |
78 | 78 | function (\Throwable $e = null): void { |
79 | - if ($e !== null) { |
|
79 | + if ($e !== null){ |
|
80 | 80 | $this->handleException($e); |
81 | 81 | } |
82 | 82 | |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | */ |
91 | 91 | protected function handleException(\Throwable $e): void |
92 | 92 | { |
93 | - try { |
|
93 | + try{ |
|
94 | 94 | $this->container->get(SnapshotterInterface::class)->register($e); |
95 | - } catch (\Throwable | ContainerExceptionInterface $se) { |
|
95 | + }catch (\Throwable | ContainerExceptionInterface $se){ |
|
96 | 96 | // no need to notify when unable to register an exception |
97 | 97 | } |
98 | 98 | } |
@@ -69,14 +69,16 @@ discard block |
||
69 | 69 | $worker = $this->container->get(Worker::class); |
70 | 70 | $locator = $this->container->get(LocatorInterface::class); |
71 | 71 | |
72 | - foreach ($locator->getServices() as $interface => $service) { |
|
72 | + foreach ($locator->getServices() as $interface => $service) |
|
73 | + { |
|
73 | 74 | $server->registerService($interface, $service); |
74 | 75 | } |
75 | 76 | |
76 | 77 | $server->serve( |
77 | 78 | $worker, |
78 | 79 | function (\Throwable $e = null): void { |
79 | - if ($e !== null) { |
|
80 | + if ($e !== null) |
|
81 | + { |
|
80 | 82 | $this->handleException($e); |
81 | 83 | } |
82 | 84 | |
@@ -90,9 +92,12 @@ discard block |
||
90 | 92 | */ |
91 | 93 | protected function handleException(\Throwable $e): void |
92 | 94 | { |
93 | - try { |
|
95 | + try |
|
96 | + { |
|
94 | 97 | $this->container->get(SnapshotterInterface::class)->register($e); |
95 | - } catch (\Throwable | ContainerExceptionInterface $se) { |
|
98 | + } |
|
99 | + catch (\Throwable | ContainerExceptionInterface $se) |
|
100 | + { |
|
96 | 101 | // no need to notify when unable to register an exception |
97 | 102 | } |
98 | 103 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | |
33 | 33 | public function compile(string $path, ContextInterface $context): void |
34 | 34 | { |
35 | - if ($path === 'custom:error') { |
|
35 | + if ($path === 'custom:error'){ |
|
36 | 36 | throw new EngineException('Unable to compile custom:error'); |
37 | 37 | } |
38 | 38 | } |
@@ -32,7 +32,8 @@ |
||
32 | 32 | |
33 | 33 | public function compile(string $path, ContextInterface $context): void |
34 | 34 | { |
35 | - if ($path === 'custom:error') { |
|
35 | + if ($path === 'custom:error') |
|
36 | + { |
|
36 | 37 | throw new EngineException('Unable to compile custom:error'); |
37 | 38 | } |
38 | 39 | } |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | { |
37 | 37 | exec('protoc 2>&1', $out); |
38 | 38 | |
39 | - if (strpos(implode("\n", $out), '--php_out') === false) { |
|
39 | + if (strpos(implode("\n", $out), '--php_out') === false){ |
|
40 | 40 | $this->markTestSkipped('Protoc binary is missing'); |
41 | 41 | } |
42 | 42 | |
43 | 43 | parent::setUp(); |
44 | 44 | |
45 | 45 | $fs = new Files(); |
46 | - $this->proto = \realpath($fs->normalizePath($this->app->dir('app') . 'proto/service.proto')); |
|
46 | + $this->proto = \realpath($fs->normalizePath($this->app->dir('app').'proto/service.proto')); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | public function tearDown(): void |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | |
53 | 53 | $fs = new Files(); |
54 | 54 | |
55 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
56 | - $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
|
55 | + if ($fs->isDirectory($this->app->dir('app').'src/Service')){ |
|
56 | + $fs->deleteDirectory($this->app->dir('app').'src/Service'); |
|
57 | 57 | } |
58 | 58 | |
59 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
60 | - $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
|
59 | + if ($fs->isDirectory($this->app->dir('app').'src/GPBMetadata')){ |
|
60 | + $fs->deleteDirectory($this->app->dir('app').'src/GPBMetadata'); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | 'proto' => $this->proto |
86 | 86 | ]); |
87 | 87 | |
88 | - $this->assertFileExists($this->app->dir('app') . 'src/Service/EchoInterface.php'); |
|
89 | - $this->assertFileExists($this->app->dir('app') . 'src/Service/Sub/Message.php'); |
|
90 | - $this->assertFileExists($this->app->dir('app') . 'src/GPBMetadata/Service.php'); |
|
88 | + $this->assertFileExists($this->app->dir('app').'src/Service/EchoInterface.php'); |
|
89 | + $this->assertFileExists($this->app->dir('app').'src/Service/Sub/Message.php'); |
|
90 | + $this->assertFileExists($this->app->dir('app').'src/GPBMetadata/Service.php'); |
|
91 | 91 | } |
92 | 92 | } |
@@ -36,7 +36,8 @@ discard block |
||
36 | 36 | { |
37 | 37 | exec('protoc 2>&1', $out); |
38 | 38 | |
39 | - if (strpos(implode("\n", $out), '--php_out') === false) { |
|
39 | + if (strpos(implode("\n", $out), '--php_out') === false) |
|
40 | + { |
|
40 | 41 | $this->markTestSkipped('Protoc binary is missing'); |
41 | 42 | } |
42 | 43 | |
@@ -52,11 +53,13 @@ discard block |
||
52 | 53 | |
53 | 54 | $fs = new Files(); |
54 | 55 | |
55 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
56 | + if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) |
|
57 | + { |
|
56 | 58 | $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
57 | 59 | } |
58 | 60 | |
59 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
61 | + if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) |
|
62 | + { |
|
60 | 63 | $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
61 | 64 | } |
62 | 65 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | public function setUp(): void |
24 | 24 | { |
25 | 25 | exec('protoc 2>&1', $out); |
26 | - if (strpos(implode("\n", $out), '--php_out') === false) { |
|
26 | + if (strpos(implode("\n", $out), '--php_out') === false){ |
|
27 | 27 | $this->markTestSkipped('Protoc binary is missing'); |
28 | 28 | } |
29 | 29 | |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | $fs = new Files(); |
33 | 33 | |
34 | 34 | $this->runCommandDebug('grpc:generate', [ |
35 | - 'proto' => realpath($fs->normalizePath($this->app->dir('app') . 'proto/service.proto')) |
|
35 | + 'proto' => realpath($fs->normalizePath($this->app->dir('app').'proto/service.proto')) |
|
36 | 36 | ]); |
37 | 37 | |
38 | - $output = $this->app->dir('app') . 'src/Service/EchoService.php'; |
|
38 | + $output = $this->app->dir('app').'src/Service/EchoService.php'; |
|
39 | 39 | file_put_contents($output, GenerateTest::SERVICE); |
40 | 40 | } |
41 | 41 | |
@@ -45,12 +45,12 @@ discard block |
||
45 | 45 | |
46 | 46 | $fs = new Files(); |
47 | 47 | |
48 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
49 | - $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
|
48 | + if ($fs->isDirectory($this->app->dir('app').'src/Service')){ |
|
49 | + $fs->deleteDirectory($this->app->dir('app').'src/Service'); |
|
50 | 50 | } |
51 | 51 | |
52 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
53 | - $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
|
52 | + if ($fs->isDirectory($this->app->dir('app').'src/GPBMetadata')){ |
|
53 | + $fs->deleteDirectory($this->app->dir('app').'src/GPBMetadata'); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $msg->setMsg('hello'); |
77 | 77 | |
78 | 78 | $w->shouldReceive('receive')->once()->with( |
79 | - \Mockery::on(function (&$context) { |
|
79 | + \Mockery::on(function (&$context){ |
|
80 | 80 | $context = '{ |
81 | 81 | "service": "service.Echo", |
82 | 82 | "method": "Ping", |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | )->andReturn($msg->serializeToString()); |
89 | 89 | |
90 | 90 | $w->shouldReceive('send')->once()->with( |
91 | - \Mockery::on(function ($out) { |
|
91 | + \Mockery::on(function ($out){ |
|
92 | 92 | $msg = new Message(); |
93 | 93 | $msg->mergeFromString($out); |
94 | 94 | $this->assertSame('hello', $msg->getMsg()); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | // one command only |
102 | 102 | $w->shouldReceive('receive')->once()->with( |
103 | - \Mockery::on(function (&$context) { |
|
103 | + \Mockery::on(function (&$context){ |
|
104 | 104 | $context = null; |
105 | 105 | return true; |
106 | 106 | }) |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $msg->setMsg('hello'); |
121 | 121 | |
122 | 122 | $w->shouldReceive('receive')->once()->with( |
123 | - \Mockery::on(function (&$context) { |
|
123 | + \Mockery::on(function (&$context){ |
|
124 | 124 | $context = '{ |
125 | 125 | "service": "service.Echo", |
126 | 126 | "method": "Invalid", |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | )->andReturn($msg->serializeToString()); |
133 | 133 | |
134 | 134 | $w->shouldReceive('error')->once()->with( |
135 | - \Mockery::on(function ($out) { |
|
135 | + \Mockery::on(function ($out){ |
|
136 | 136 | $this->assertStringContainsString('Method `Invalid` not found', $out); |
137 | 137 | return true; |
138 | 138 | }) |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | |
141 | 141 | // one command only |
142 | 142 | $w->shouldReceive('receive')->once()->with( |
143 | - \Mockery::on(function (&$context) { |
|
143 | + \Mockery::on(function (&$context){ |
|
144 | 144 | $context = null; |
145 | 145 | return true; |
146 | 146 | }) |
@@ -23,7 +23,8 @@ discard block |
||
23 | 23 | public function setUp(): void |
24 | 24 | { |
25 | 25 | exec('protoc 2>&1', $out); |
26 | - if (strpos(implode("\n", $out), '--php_out') === false) { |
|
26 | + if (strpos(implode("\n", $out), '--php_out') === false) |
|
27 | + { |
|
27 | 28 | $this->markTestSkipped('Protoc binary is missing'); |
28 | 29 | } |
29 | 30 | |
@@ -45,11 +46,13 @@ discard block |
||
45 | 46 | |
46 | 47 | $fs = new Files(); |
47 | 48 | |
48 | - if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) { |
|
49 | + if ($fs->isDirectory($this->app->dir('app') . 'src/Service')) |
|
50 | + { |
|
49 | 51 | $fs->deleteDirectory($this->app->dir('app') . 'src/Service'); |
50 | 52 | } |
51 | 53 | |
52 | - if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) { |
|
54 | + if ($fs->isDirectory($this->app->dir('app') . 'src/GPBMetadata')) |
|
55 | + { |
|
53 | 56 | $fs->deleteDirectory($this->app->dir('app') . 'src/GPBMetadata'); |
54 | 57 | } |
55 | 58 | } |
@@ -76,7 +79,8 @@ discard block |
||
76 | 79 | $msg->setMsg('hello'); |
77 | 80 | |
78 | 81 | $w->shouldReceive('receive')->once()->with( |
79 | - \Mockery::on(function (&$context) { |
|
82 | + \Mockery::on(function (&$context) |
|
83 | + { |
|
80 | 84 | $context = '{ |
81 | 85 | "service": "service.Echo", |
82 | 86 | "method": "Ping", |
@@ -88,7 +92,8 @@ discard block |
||
88 | 92 | )->andReturn($msg->serializeToString()); |
89 | 93 | |
90 | 94 | $w->shouldReceive('send')->once()->with( |
91 | - \Mockery::on(function ($out) { |
|
95 | + \Mockery::on(function ($out) |
|
96 | + { |
|
92 | 97 | $msg = new Message(); |
93 | 98 | $msg->mergeFromString($out); |
94 | 99 | $this->assertSame('hello', $msg->getMsg()); |
@@ -100,7 +105,8 @@ discard block |
||
100 | 105 | |
101 | 106 | // one command only |
102 | 107 | $w->shouldReceive('receive')->once()->with( |
103 | - \Mockery::on(function (&$context) { |
|
108 | + \Mockery::on(function (&$context) |
|
109 | + { |
|
104 | 110 | $context = null; |
105 | 111 | return true; |
106 | 112 | }) |
@@ -120,7 +126,8 @@ discard block |
||
120 | 126 | $msg->setMsg('hello'); |
121 | 127 | |
122 | 128 | $w->shouldReceive('receive')->once()->with( |
123 | - \Mockery::on(function (&$context) { |
|
129 | + \Mockery::on(function (&$context) |
|
130 | + { |
|
124 | 131 | $context = '{ |
125 | 132 | "service": "service.Echo", |
126 | 133 | "method": "Invalid", |
@@ -132,7 +139,8 @@ discard block |
||
132 | 139 | )->andReturn($msg->serializeToString()); |
133 | 140 | |
134 | 141 | $w->shouldReceive('error')->once()->with( |
135 | - \Mockery::on(function ($out) { |
|
142 | + \Mockery::on(function ($out) |
|
143 | + { |
|
136 | 144 | $this->assertStringContainsString('Method `Invalid` not found', $out); |
137 | 145 | return true; |
138 | 146 | }) |
@@ -140,7 +148,8 @@ discard block |
||
140 | 148 | |
141 | 149 | // one command only |
142 | 150 | $w->shouldReceive('receive')->once()->with( |
143 | - \Mockery::on(function (&$context) { |
|
151 | + \Mockery::on(function (&$context) |
|
152 | + { |
|
144 | 153 | $context = null; |
145 | 154 | return true; |
146 | 155 | }) |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function has(string $section): bool |
48 | 48 | { |
49 | - foreach (static::LOADERS as $extension => $class) { |
|
49 | + foreach (static::LOADERS as $extension => $class){ |
|
50 | 50 | $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension); |
51 | - if (file_exists($filename)) { |
|
51 | + if (file_exists($filename)){ |
|
52 | 52 | return true; |
53 | 53 | } |
54 | 54 | } |
@@ -61,15 +61,15 @@ discard block |
||
61 | 61 | */ |
62 | 62 | public function load(string $section): array |
63 | 63 | { |
64 | - foreach (static::LOADERS as $extension => $class) { |
|
64 | + foreach (static::LOADERS as $extension => $class){ |
|
65 | 65 | $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension); |
66 | - if (!file_exists($filename)) { |
|
66 | + if (!file_exists($filename)){ |
|
67 | 67 | continue; |
68 | 68 | } |
69 | 69 | |
70 | - try { |
|
70 | + try{ |
|
71 | 71 | return $this->getLoader($extension)->loadFile($section, $filename); |
72 | - } catch (LoaderException $e) { |
|
72 | + }catch (LoaderException $e){ |
|
73 | 73 | throw new LoaderException("Unable to load config `{$section}`.", $e->getCode(), $e); |
74 | 74 | } |
75 | 75 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | private function getLoader(string $extension): FileLoaderInterface |
85 | 85 | { |
86 | - if (isset($this->loaders[$extension])) { |
|
86 | + if (isset($this->loaders[$extension])){ |
|
87 | 87 | return $this->loaders[$extension]; |
88 | 88 | } |
89 | 89 |
@@ -46,9 +46,11 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function has(string $section): bool |
48 | 48 | { |
49 | - foreach (static::LOADERS as $extension => $class) { |
|
49 | + foreach (static::LOADERS as $extension => $class) |
|
50 | + { |
|
50 | 51 | $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension); |
51 | - if (file_exists($filename)) { |
|
52 | + if (file_exists($filename)) |
|
53 | + { |
|
52 | 54 | return true; |
53 | 55 | } |
54 | 56 | } |
@@ -61,15 +63,20 @@ discard block |
||
61 | 63 | */ |
62 | 64 | public function load(string $section): array |
63 | 65 | { |
64 | - foreach (static::LOADERS as $extension => $class) { |
|
66 | + foreach (static::LOADERS as $extension => $class) |
|
67 | + { |
|
65 | 68 | $filename = sprintf('%s/%s.%s', $this->directory, $section, $extension); |
66 | - if (!file_exists($filename)) { |
|
69 | + if (!file_exists($filename)) |
|
70 | + { |
|
67 | 71 | continue; |
68 | 72 | } |
69 | 73 | |
70 | - try { |
|
74 | + try |
|
75 | + { |
|
71 | 76 | return $this->getLoader($extension)->loadFile($section, $filename); |
72 | - } catch (LoaderException $e) { |
|
77 | + } |
|
78 | + catch (LoaderException $e) |
|
79 | + { |
|
73 | 80 | throw new LoaderException("Unable to load config `{$section}`.", $e->getCode(), $e); |
74 | 81 | } |
75 | 82 | } |
@@ -83,7 +90,8 @@ discard block |
||
83 | 90 | */ |
84 | 91 | private function getLoader(string $extension): FileLoaderInterface |
85 | 92 | { |
86 | - if (isset($this->loaders[$extension])) { |
|
93 | + if (isset($this->loaders[$extension])) |
|
94 | + { |
|
87 | 95 | return $this->loaders[$extension]; |
88 | 96 | } |
89 | 97 |
@@ -36,11 +36,11 @@ |
||
36 | 36 | */ |
37 | 37 | public function loadFile(string $section, string $filename): array |
38 | 38 | { |
39 | - try { |
|
39 | + try{ |
|
40 | 40 | return ContainerScope::runScope($this->container, function () use ($filename) { |
41 | 41 | return (require $filename); |
42 | 42 | }); |
43 | - } catch (\Throwable $e) { |
|
43 | + }catch (\Throwable $e){ |
|
44 | 44 | throw new LoaderException($e->getMessage(), $e->getCode(), $e); |
45 | 45 | } |
46 | 46 | } |
@@ -36,11 +36,15 @@ |
||
36 | 36 | */ |
37 | 37 | public function loadFile(string $section, string $filename): array |
38 | 38 | { |
39 | - try { |
|
40 | - return ContainerScope::runScope($this->container, function () use ($filename) { |
|
39 | + try |
|
40 | + { |
|
41 | + return ContainerScope::runScope($this->container, function () use ($filename) |
|
42 | + { |
|
41 | 43 | return (require $filename); |
42 | 44 | }); |
43 | - } catch (\Throwable $e) { |
|
45 | + } |
|
46 | + catch (\Throwable $e) |
|
47 | + { |
|
44 | 48 | throw new LoaderException($e->getMessage(), $e->getCode(), $e); |
45 | 49 | } |
46 | 50 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $content = file_get_contents($filename); |
24 | 24 | $data = json_decode($content, true); |
25 | 25 | |
26 | - if (is_null($data)) { |
|
26 | + if (is_null($data)){ |
|
27 | 27 | throw new LoaderException(json_last_error_msg(), json_last_error()); |
28 | 28 | } |
29 | 29 |
@@ -23,7 +23,8 @@ |
||
23 | 23 | $content = file_get_contents($filename); |
24 | 24 | $data = json_decode($content, true); |
25 | 25 | |
26 | - if (is_null($data)) { |
|
26 | + if (is_null($data)) |
|
27 | + { |
|
27 | 28 | throw new LoaderException(json_last_error_msg(), json_last_error()); |
28 | 29 | } |
29 | 30 |