@@ -58,8 +58,8 @@ |
||
58 | 58 | */ |
59 | 59 | public function boot(EnvironmentInterface $env, DirectoriesInterface $dirs) |
60 | 60 | { |
61 | - if (!$dirs->has('locale')) { |
|
62 | - $dirs->set('locale', $dirs->get('app') . 'locale/'); |
|
61 | + if (!$dirs->has('locale')){ |
|
62 | + $dirs->set('locale', $dirs->get('app').'locale/'); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | $this->config->setDefaults('translator', [ |
@@ -58,7 +58,8 @@ |
||
58 | 58 | */ |
59 | 59 | public function boot(EnvironmentInterface $env, DirectoriesInterface $dirs) |
60 | 60 | { |
61 | - if (!$dirs->has('locale')) { |
|
61 | + if (!$dirs->has('locale')) |
|
62 | + { |
|
62 | 63 | $dirs->set('locale', $dirs->get('app') . 'locale/'); |
63 | 64 | } |
64 | 65 |
@@ -42,15 +42,15 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function boot(EnvironmentInterface $env, DirectoriesInterface $dirs) |
44 | 44 | { |
45 | - if (!$dirs->has('views')) { |
|
46 | - $dirs->set('views', $dirs->get('app') . 'views'); |
|
45 | + if (!$dirs->has('views')){ |
|
46 | + $dirs->set('views', $dirs->get('app').'views'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | // default view config |
50 | 50 | $this->config->setDefaults('views', [ |
51 | 51 | 'cache' => [ |
52 | 52 | 'enabled' => !$env->get('DEBUG', false), |
53 | - 'directory' => $dirs->get('cache') . 'views' |
|
53 | + 'directory' => $dirs->get('cache').'views' |
|
54 | 54 | ], |
55 | 55 | 'namespaces' => [ |
56 | 56 | 'default' => [$dirs->get('views')] |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function addDirectory(string $namespace, string $directory) |
68 | 68 | { |
69 | - if (!isset($this->config->getConfig('views')['namespaces'][$namespace])) { |
|
69 | + if (!isset($this->config->getConfig('views')['namespaces'][$namespace])){ |
|
70 | 70 | $this->config->modify('views', new Append('namespaces', $namespace, [])); |
71 | 71 | } |
72 | 72 | |
73 | - $this->config->modify('views', new Append('namespaces.' . $namespace, null, $directory)); |
|
73 | + $this->config->modify('views', new Append('namespaces.'.$namespace, null, $directory)); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -42,7 +42,8 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function boot(EnvironmentInterface $env, DirectoriesInterface $dirs) |
44 | 44 | { |
45 | - if (!$dirs->has('views')) { |
|
45 | + if (!$dirs->has('views')) |
|
46 | + { |
|
46 | 47 | $dirs->set('views', $dirs->get('app') . 'views'); |
47 | 48 | } |
48 | 49 | |
@@ -66,7 +67,8 @@ discard block |
||
66 | 67 | */ |
67 | 68 | public function addDirectory(string $namespace, string $directory) |
68 | 69 | { |
69 | - if (!isset($this->config->getConfig('views')['namespaces'][$namespace])) { |
|
70 | + if (!isset($this->config->getConfig('views')['namespaces'][$namespace])) |
|
71 | + { |
|
70 | 72 | $this->config->modify('views', new Append('namespaces', $namespace, [])); |
71 | 73 | } |
72 | 74 |
@@ -28,7 +28,7 @@ |
||
28 | 28 | $finalizer->addFinalizer(function () use ($container) { |
29 | 29 | /** @var DatabaseManager $dbal */ |
30 | 30 | $dbal = $container->get(DatabaseManager::class); |
31 | - foreach ($dbal->getDrivers() as $driver) { |
|
31 | + foreach ($dbal->getDrivers() as $driver){ |
|
32 | 32 | $driver->disconnect(); |
33 | 33 | } |
34 | 34 | }); |
@@ -25,10 +25,12 @@ |
||
25 | 25 | */ |
26 | 26 | public function boot(FinalizerInterface $finalizer, ContainerInterface $container) |
27 | 27 | { |
28 | - $finalizer->addFinalizer(function () use ($container) { |
|
28 | + $finalizer->addFinalizer(function () use ($container) |
|
29 | + { |
|
29 | 30 | /** @var DatabaseManager $dbal */ |
30 | 31 | $dbal = $container->get(DatabaseManager::class); |
31 | - foreach ($dbal->getDrivers() as $driver) { |
|
32 | + foreach ($dbal->getDrivers() as $driver) |
|
33 | + { |
|
32 | 34 | $driver->disconnect(); |
33 | 35 | } |
34 | 36 | }); |
@@ -35,9 +35,9 @@ |
||
35 | 35 | ConfiguratorInterface $config, |
36 | 36 | EnvironmentInterface $env, |
37 | 37 | DirectoriesInterface $dirs |
38 | - ) { |
|
39 | - if (!$dirs->has('migrations')) { |
|
40 | - $dirs->set('migrations', $dirs->get('app') . 'migrations'); |
|
38 | + ){ |
|
39 | + if (!$dirs->has('migrations')){ |
|
40 | + $dirs->set('migrations', $dirs->get('app').'migrations'); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | $config->setDefaults('migration', [ |
@@ -36,7 +36,8 @@ |
||
36 | 36 | EnvironmentInterface $env, |
37 | 37 | DirectoriesInterface $dirs |
38 | 38 | ) { |
39 | - if (!$dirs->has('migrations')) { |
|
39 | + if (!$dirs->has('migrations')) |
|
40 | + { |
|
40 | 41 | $dirs->set('migrations', $dirs->get('app') . 'migrations'); |
41 | 42 | } |
42 | 43 |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | string $header, |
94 | 94 | string $footer = '', |
95 | 95 | array $options = [] |
96 | - ) { |
|
96 | + ){ |
|
97 | 97 | $this->config->modify( |
98 | 98 | 'console', |
99 | 99 | $this->sequence('configure', $sequence, $header, $footer, $options) |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | string $header, |
112 | 112 | string $footer = '', |
113 | 113 | array $options = [] |
114 | - ) { |
|
114 | + ){ |
|
115 | 115 | $this->config->modify( |
116 | 116 | 'console', |
117 | 117 | $this->sequence('update', $sequence, $header, $footer, $options) |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | string $footer, |
134 | 134 | array $options |
135 | 135 | ): Append { |
136 | - if (is_array($sequence) || $sequence instanceof \Closure) { |
|
136 | + if (is_array($sequence) || $sequence instanceof \Closure){ |
|
137 | 137 | return new Append( |
138 | 138 | $target, |
139 | 139 | null, |
@@ -133,7 +133,8 @@ |
||
133 | 133 | string $footer, |
134 | 134 | array $options |
135 | 135 | ): Append { |
136 | - if (is_array($sequence) || $sequence instanceof \Closure) { |
|
136 | + if (is_array($sequence) || $sequence instanceof \Closure) |
|
137 | + { |
|
137 | 138 | return new Append( |
138 | 139 | $target, |
139 | 140 | null, |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | PermissionsInterface $permissions, |
41 | 41 | ContainerInterface $actorScope, |
42 | 42 | array $roles = [] |
43 | - ) { |
|
43 | + ){ |
|
44 | 44 | $this->roles = $roles; |
45 | 45 | $this->container = $actorScope; |
46 | 46 | $this->permissions = $permissions; |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | public function allows(string $permission, array $context = []): bool |
53 | 53 | { |
54 | 54 | $allows = false; |
55 | - foreach ($this->getRoles() as $role) { |
|
56 | - if (!$this->permissions->hasRole($role)) { |
|
55 | + foreach ($this->getRoles() as $role){ |
|
56 | + if (!$this->permissions->hasRole($role)){ |
|
57 | 57 | continue; |
58 | 58 | } |
59 | 59 | |
@@ -99,13 +99,13 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function getActor(): ActorInterface |
101 | 101 | { |
102 | - if (!is_null($this->actor)) { |
|
102 | + if (!is_null($this->actor)){ |
|
103 | 103 | return $this->actor; |
104 | 104 | } |
105 | 105 | |
106 | - try { |
|
106 | + try{ |
|
107 | 107 | return $this->container->get(ActorInterface::class); |
108 | - } catch (ContainerException $e) { |
|
108 | + }catch (ContainerException $e){ |
|
109 | 109 | throw new ScopeException("Unable to resolve Actor from the scope", $e->getCode(), $e); |
110 | 110 | } |
111 | 111 | } |
@@ -52,8 +52,10 @@ discard block |
||
52 | 52 | public function allows(string $permission, array $context = []): bool |
53 | 53 | { |
54 | 54 | $allows = false; |
55 | - foreach ($this->getRoles() as $role) { |
|
56 | - if (!$this->permissions->hasRole($role)) { |
|
55 | + foreach ($this->getRoles() as $role) |
|
56 | + { |
|
57 | + if (!$this->permissions->hasRole($role)) |
|
58 | + { |
|
57 | 59 | continue; |
58 | 60 | } |
59 | 61 | |
@@ -99,13 +101,17 @@ discard block |
||
99 | 101 | */ |
100 | 102 | public function getActor(): ActorInterface |
101 | 103 | { |
102 | - if (!is_null($this->actor)) { |
|
104 | + if (!is_null($this->actor)) |
|
105 | + { |
|
103 | 106 | return $this->actor; |
104 | 107 | } |
105 | 108 | |
106 | - try { |
|
109 | + try |
|
110 | + { |
|
107 | 111 | return $this->container->get(ActorInterface::class); |
108 | - } catch (ContainerException $e) { |
|
112 | + } |
|
113 | + catch (ContainerException $e) |
|
114 | + { |
|
109 | 115 | throw new ScopeException("Unable to resolve Actor from the scope", $e->getCode(), $e); |
110 | 116 | } |
111 | 117 | } |
@@ -39,28 +39,28 @@ |
||
39 | 39 | */ |
40 | 40 | protected function mapDirectories(array $directories): array |
41 | 41 | { |
42 | - if (!isset($directories['root'])) { |
|
42 | + if (!isset($directories['root'])){ |
|
43 | 43 | throw new BootException("Missing required directory `root`."); |
44 | 44 | } |
45 | 45 | |
46 | - if (!isset($directories['app'])) { |
|
47 | - $directories['app'] = $directories['root'] . '/app/'; |
|
46 | + if (!isset($directories['app'])){ |
|
47 | + $directories['app'] = $directories['root'].'/app/'; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | return array_merge([ |
51 | 51 | // public root |
52 | - 'public' => $directories['root'] . '/public/', |
|
52 | + 'public' => $directories['root'].'/public/', |
|
53 | 53 | |
54 | 54 | // vendor libraries |
55 | - 'vendor' => $directories['root'] . '/vendor/', |
|
55 | + 'vendor' => $directories['root'].'/vendor/', |
|
56 | 56 | |
57 | 57 | // data directories |
58 | - 'runtime' => $directories['root'] . '/runtime/', |
|
59 | - 'cache' => $directories['root'] . '/runtime/cache/', |
|
58 | + 'runtime' => $directories['root'].'/runtime/', |
|
59 | + 'cache' => $directories['root'].'/runtime/cache/', |
|
60 | 60 | |
61 | 61 | // application directories |
62 | - 'config' => $directories['app'] . '/config/', |
|
63 | - 'resources' => $directories['app'] . '/resources/', |
|
62 | + 'config' => $directories['app'].'/config/', |
|
63 | + 'resources' => $directories['app'].'/resources/', |
|
64 | 64 | ], $directories); |
65 | 65 | } |
66 | 66 | } |
67 | 67 | \ No newline at end of file |
@@ -39,11 +39,13 @@ |
||
39 | 39 | */ |
40 | 40 | protected function mapDirectories(array $directories): array |
41 | 41 | { |
42 | - if (!isset($directories['root'])) { |
|
42 | + if (!isset($directories['root'])) |
|
43 | + { |
|
43 | 44 | throw new BootException("Missing required directory `root`."); |
44 | 45 | } |
45 | 46 | |
46 | - if (!isset($directories['app'])) { |
|
47 | + if (!isset($directories['app'])) |
|
48 | + { |
|
47 | 49 | $directories['app'] = $directories['root'] . '/app/'; |
48 | 50 | } |
49 | 51 |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | int $verbosity, |
49 | 49 | HandlerInterface $handler, |
50 | 50 | FilesInterface $files |
51 | - ) { |
|
51 | + ){ |
|
52 | 52 | $this->directory = $directory; |
53 | 53 | $this->maxFiles = $maxFiles; |
54 | 54 | $this->verbosity = $verbosity; |
@@ -92,17 +92,17 @@ discard block |
||
92 | 92 | protected function rotateSnapshots() |
93 | 93 | { |
94 | 94 | $finder = new Finder(); |
95 | - $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) { |
|
95 | + $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b){ |
|
96 | 96 | return $b->getMTime() - $a->getMTime(); |
97 | 97 | }); |
98 | 98 | |
99 | 99 | $count = 0; |
100 | - foreach ($finder as $file) { |
|
100 | + foreach ($finder as $file){ |
|
101 | 101 | $count++; |
102 | - if ($count > $this->maxFiles) { |
|
103 | - try { |
|
102 | + if ($count > $this->maxFiles){ |
|
103 | + try{ |
|
104 | 104 | $this->files->delete($file->getRealPath()); |
105 | - } catch (FilesException $e) { |
|
105 | + }catch (FilesException $e){ |
|
106 | 106 | // ignore |
107 | 107 | } |
108 | 108 | } |
@@ -92,17 +92,23 @@ |
||
92 | 92 | protected function rotateSnapshots() |
93 | 93 | { |
94 | 94 | $finder = new Finder(); |
95 | - $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) { |
|
95 | + $finder->in($this->directory)->sort(function (SplFileInfo $a, SplFileInfo $b) |
|
96 | + { |
|
96 | 97 | return $b->getMTime() - $a->getMTime(); |
97 | 98 | }); |
98 | 99 | |
99 | 100 | $count = 0; |
100 | - foreach ($finder as $file) { |
|
101 | + foreach ($finder as $file) |
|
102 | + { |
|
101 | 103 | $count++; |
102 | - if ($count > $this->maxFiles) { |
|
103 | - try { |
|
104 | + if ($count > $this->maxFiles) |
|
105 | + { |
|
106 | + try |
|
107 | + { |
|
104 | 108 | $this->files->delete($file->getRealPath()); |
105 | - } catch (FilesException $e) { |
|
109 | + } |
|
110 | + catch (FilesException $e) |
|
111 | + { |
|
106 | 112 | // ignore |
107 | 113 | } |
108 | 114 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | */ |
31 | 31 | protected function authorize(string $permission, array $context = []): bool |
32 | 32 | { |
33 | - if (!$this->allows($permission, $context)) { |
|
33 | + if (!$this->allows($permission, $context)){ |
|
34 | 34 | $name = $this->resolvePermission($permission); |
35 | 35 | |
36 | 36 | throw new ControllerException( |
@@ -30,7 +30,8 @@ |
||
30 | 30 | */ |
31 | 31 | protected function authorize(string $permission, array $context = []): bool |
32 | 32 | { |
33 | - if (!$this->allows($permission, $context)) { |
|
33 | + if (!$this->allows($permission, $context)) |
|
34 | + { |
|
34 | 35 | $name = $this->resolvePermission($permission); |
35 | 36 | |
36 | 37 | throw new ControllerException( |