File tree Expand file tree Collapse file tree 2 files changed +6
-10
lines changed
Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -158,7 +158,7 @@ public function checkVersions()
158158 public function configFile ()
159159 {
160160 if (defined ('HORDE_CONFIG_BASE ' )) {
161- $ path = HORDE_CONFIG_BASE ;
161+ $ path = HORDE_CONFIG_BASE . DIR_SEPARATOR . $ this -> _app ;
162162 } else {
163163 $ path = $ GLOBALS ['registry ' ]->get ('fileroot ' , $ this ->_app ) . '/config ' ;
164164 }
@@ -307,7 +307,7 @@ public function writePHPConfig($formvars, &$php = null)
307307 {
308308 $ php = $ this ->generatePHPConfig ($ formvars );
309309 if (defined ('HORDE_CONFIG_BASE ' )) {
310- $ path = HORDE_CONFIG_BASE ;
310+ $ path = HORDE_CONFIG_BASE . DIR_SEPARATOR . $ this -> _app ;
311311 } else {
312312 $ path = $ GLOBALS ['registry ' ]->get ('fileroot ' , $ this ->_app ) . '/config ' ;
313313 }
Original file line number Diff line number Diff line change @@ -87,8 +87,7 @@ protected function _load($offset)
8787
8888 /**
8989 */
90- #[\ReturnTypeWillChange]
91- public function offsetExists ($ offset )
90+ public function offsetExists ($ offset ): bool
9291 {
9392 $ this ->_load ($ offset );
9493 return isset ($ this ->_config [$ offset ]);
@@ -104,17 +103,15 @@ public function offsetGet($offset)
104103 ?? null ;
105104 }
106105
107- #[\ReturnTypeWillChange]
108- public function offsetSet ($ offset , $ value )
106+ public function offsetSet ($ offset , $ value ): void
109107 {
110108 $ this ->_load ($ offset );
111109 $ this ->_config [$ offset ] = $ value ;
112110 }
113111
114112 /**
115113 */
116- #[\ReturnTypeWillChange]
117- public function offsetUnset ($ offset )
114+ public function offsetUnset ($ offset ): void
118115 {
119116 $ this ->_load ($ offset );
120117 unset($ this ->_config [$ offset ]);
@@ -124,8 +121,7 @@ public function offsetUnset($offset)
124121
125122 /**
126123 */
127- #[\ReturnTypeWillChange]
128- public function count ()
124+ public function count (): int
129125 {
130126 /* Return non-zero to ensure a count() calls returns true. */
131127 return 1 ;
You can’t perform that action at this time.
0 commit comments