@@ -29,6 +29,13 @@ public function loadConfiguration()
2929 $ builder = $ this ->getContainerBuilder ();
3030
3131 $ config = $ this ->getConfig (self ::DEFAULTS );
32+
33+ if ( ! isset ($ config ['prefix ' ])) {
34+ throw new \Pd \Supervisor \DI \MissingConfigurationValueException (
35+ 'Parametr \'prefix \' pro extension \'supervisor \' je vyzadovany. Doplnte jej a jako hodnotu vyberte idealne nazev projektu. '
36+ );
37+ }
38+
3239 foreach ($ this ->compiler ->getExtensions () as $ extension ) {
3340 if ($ extension instanceof IConfigurationProvider) {
3441 $ config ['configuration ' ] = array_merge_recursive ($ extension ->getSupervisorConfiguration (), $ config ['configuration ' ]);
@@ -38,7 +45,7 @@ public function loadConfiguration()
3845 $ this ->loadSupervisorConfiguration (
3946 (array ) $ config ['configuration ' ],
4047 (array ) $ config ['defaults ' ],
41- isset ( $ config [ ' prefix ' ]) ? ( string ) $ config ['prefix ' ] : NULL ,
48+ ( string ) $ config ['prefix ' ],
4249 isset ($ config ['group ' ]) ? (string ) $ config ['group ' ] : NULL
4350 );
4451
@@ -53,7 +60,7 @@ public function loadConfiguration()
5360 }
5461
5562
56- private function loadSupervisorConfiguration (array $ config , array $ defaults = [], string $ prefix = NULL , string $ group = NULL )
63+ private function loadSupervisorConfiguration (array $ config , array $ defaults = [], string $ prefix , string $ group = NULL )
5764 {
5865 $ builder = $ this ->getContainerBuilder ();
5966
@@ -103,23 +110,18 @@ private function mergeProperties(array $properties, array $defaults = []): array
103110 }
104111
105112
106- private function prepareName (string $ name , string $ prefix = NULL ): string
113+ private function prepareName (string $ name , string $ prefix ): string
107114 {
108115 $ builder = $ this ->getContainerBuilder ();
109- $ parameters = [
110- 'webId ' => $ builder ->parameters ['webId ' ],
111- ];
112116 $ name = Helpers::expand ($ name , $ builder ->parameters );
113117
114- if ($ prefix !== NULL ) {
115- $ name = sprintf ('%s-%s ' , $ prefix , $ name );
116- }
118+ $ name = sprintf ('%s-%s ' , $ prefix , $ name );
117119
118120 return $ name ;
119121 }
120122
121123
122- private function prepareGroup (array $ config , \Nette \DI \ServiceDefinition $ configuration , string $ prefix = NULL , string $ group = NULL ): void
124+ private function prepareGroup (array $ config , \Nette \DI \ServiceDefinition $ configuration , string $ prefix , string $ group = NULL ): void
123125 {
124126 if ( ! $ group ) {
125127 return ;
0 commit comments