Skip to content

Commit 32efbec

Browse files
iherwigiherwig
committed
added support for custom php configuration
1 parent ec08343 commit 32efbec

File tree

3 files changed

+79
-5
lines changed

3 files changed

+79
-5
lines changed

‎src/wcmf/lib/presentation/Application.php

+8
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ public function __destruct() {
7474
public function initialize($defaultController='', $defaultContext='', $defaultAction='login') {
7575
$config = ObjectFactory::getInstance('configuration');
7676
$this->debug = $config->getBooleanValue('debug', 'Application');
77+
78+
// configure php
79+
if ($config->hasSection('phpconfig')) {
80+
$phpSettings = $config->getSection('phpconfig');
81+
foreach ($phpSettings as $option => $value) {
82+
ini_set($option, $value);
83+
}
84+
}
7785

7886
// create the Request and Response instances
7987
$this->request = ObjectFactory::getInstance('request');

‎src/wcmf/test/model/model.notation

+67-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<styles xmi:type="notation:FilteringStyle" xmi:id="_zYHCRKvxEeaQUopA1XIUeQ"/>
1717
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zYHCRavxEeaQUopA1XIUeQ"/>
1818
</children>
19-
<children xmi:type="notation:BasicCompartment" xmi:id="_zYHCRqvxEeaQUopA1XIUeQ" type="Class_OperationCompartment">
19+
<children xmi:type="notation:BasicCompartment" xmi:id="_zYHCRqvxEeaQUopA1XIUeQ" visible="false" type="Class_OperationCompartment">
2020
<styles xmi:type="notation:TitleStyle" xmi:id="_zYHCR6vxEeaQUopA1XIUeQ"/>
2121
<styles xmi:type="notation:SortingStyle" xmi:id="_zYHCSKvxEeaQUopA1XIUeQ"/>
2222
<styles xmi:type="notation:FilteringStyle" xmi:id="_zYHCSavxEeaQUopA1XIUeQ"/>
2323
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zYHCSqvxEeaQUopA1XIUeQ"/>
2424
</children>
25-
<children xmi:type="notation:BasicCompartment" xmi:id="_zYHCS6vxEeaQUopA1XIUeQ" type="Class_NestedClassifierCompartment">
25+
<children xmi:type="notation:BasicCompartment" xmi:id="_zYHCS6vxEeaQUopA1XIUeQ" visible="false" type="Class_NestedClassifierCompartment">
2626
<styles xmi:type="notation:TitleStyle" xmi:id="_zYHCTKvxEeaQUopA1XIUeQ"/>
2727
<styles xmi:type="notation:SortingStyle" xmi:id="_zYHCTavxEeaQUopA1XIUeQ"/>
2828
<styles xmi:type="notation:FilteringStyle" xmi:id="_zYHCTqvxEeaQUopA1XIUeQ"/>
@@ -74,13 +74,13 @@
7474
<styles xmi:type="notation:FilteringStyle" xmi:id="_4vcTWKvxEeaQUopA1XIUeQ"/>
7575
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4vcTWavxEeaQUopA1XIUeQ"/>
7676
</children>
77-
<children xmi:type="notation:BasicCompartment" xmi:id="_4vcTWqvxEeaQUopA1XIUeQ" type="Class_OperationCompartment">
77+
<children xmi:type="notation:BasicCompartment" xmi:id="_4vcTWqvxEeaQUopA1XIUeQ" visible="false" type="Class_OperationCompartment">
7878
<styles xmi:type="notation:TitleStyle" xmi:id="_4vcTW6vxEeaQUopA1XIUeQ"/>
7979
<styles xmi:type="notation:SortingStyle" xmi:id="_4vcTXKvxEeaQUopA1XIUeQ"/>
8080
<styles xmi:type="notation:FilteringStyle" xmi:id="_4vcTXavxEeaQUopA1XIUeQ"/>
8181
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4vcTXqvxEeaQUopA1XIUeQ"/>
8282
</children>
83-
<children xmi:type="notation:BasicCompartment" xmi:id="_4vcTX6vxEeaQUopA1XIUeQ" type="Class_NestedClassifierCompartment">
83+
<children xmi:type="notation:BasicCompartment" xmi:id="_4vcTX6vxEeaQUopA1XIUeQ" visible="false" type="Class_NestedClassifierCompartment">
8484
<styles xmi:type="notation:TitleStyle" xmi:id="_4vcTYKvxEeaQUopA1XIUeQ"/>
8585
<styles xmi:type="notation:SortingStyle" xmi:id="_4vcTYavxEeaQUopA1XIUeQ"/>
8686
<styles xmi:type="notation:FilteringStyle" xmi:id="_4vcTYqvxEeaQUopA1XIUeQ"/>
@@ -97,6 +97,40 @@
9797
<element xsi:nil="true"/>
9898
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4vfWoqvxEeaQUopA1XIUeQ" x="200"/>
9999
</children>
100+
<children xmi:type="notation:Shape" xmi:id="_sqQnwFxJEeeaovNgIyUZeA" type="Class_Shape">
101+
<children xmi:type="notation:DecorationNode" xmi:id="_sqQnwlxJEeeaovNgIyUZeA" type="Class_NameLabel"/>
102+
<children xmi:type="notation:DecorationNode" xmi:id="_sqQnw1xJEeeaovNgIyUZeA" type="Class_FloatingNameLabel">
103+
<layoutConstraint xmi:type="notation:Location" xmi:id="_sqQnxFxJEeeaovNgIyUZeA" y="5"/>
104+
</children>
105+
<children xmi:type="notation:BasicCompartment" xmi:id="_sqQnxVxJEeeaovNgIyUZeA" type="Class_AttributeCompartment">
106+
<styles xmi:type="notation:TitleStyle" xmi:id="_sqQnxlxJEeeaovNgIyUZeA"/>
107+
<styles xmi:type="notation:SortingStyle" xmi:id="_sqQnx1xJEeeaovNgIyUZeA"/>
108+
<styles xmi:type="notation:FilteringStyle" xmi:id="_sqQnyFxJEeeaovNgIyUZeA"/>
109+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sqQnyVxJEeeaovNgIyUZeA"/>
110+
</children>
111+
<children xmi:type="notation:BasicCompartment" xmi:id="_sqQnylxJEeeaovNgIyUZeA" visible="false" type="Class_OperationCompartment">
112+
<styles xmi:type="notation:TitleStyle" xmi:id="_sqQny1xJEeeaovNgIyUZeA"/>
113+
<styles xmi:type="notation:SortingStyle" xmi:id="_sqQnzFxJEeeaovNgIyUZeA"/>
114+
<styles xmi:type="notation:FilteringStyle" xmi:id="_sqQnzVxJEeeaovNgIyUZeA"/>
115+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sqQnzlxJEeeaovNgIyUZeA"/>
116+
</children>
117+
<children xmi:type="notation:BasicCompartment" xmi:id="_sqQnz1xJEeeaovNgIyUZeA" visible="false" type="Class_NestedClassifierCompartment">
118+
<styles xmi:type="notation:TitleStyle" xmi:id="_sqQn0FxJEeeaovNgIyUZeA"/>
119+
<styles xmi:type="notation:SortingStyle" xmi:id="_sqQn0VxJEeeaovNgIyUZeA"/>
120+
<styles xmi:type="notation:FilteringStyle" xmi:id="_sqQn0lxJEeeaovNgIyUZeA"/>
121+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sqQn01xJEeeaovNgIyUZeA"/>
122+
</children>
123+
<element xmi:type="uml:Class" href="model.uml#_qxaPwFxJEeeaovNgIyUZeA"/>
124+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sqQnwVxJEeeaovNgIyUZeA" x="15" y="225" width="196" height="61"/>
125+
</children>
126+
<children xmi:type="notation:Shape" xmi:id="_sqQn4lxJEeeaovNgIyUZeA" type="StereotypeComment">
127+
<styles xmi:type="notation:TitleStyle" xmi:id="_sqQn41xJEeeaovNgIyUZeA"/>
128+
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_sqQn5VxJEeeaovNgIyUZeA" name="BASE_ELEMENT">
129+
<eObjectValue xmi:type="uml:Class" href="model.uml#_qxaPwFxJEeeaovNgIyUZeA"/>
130+
</styles>
131+
<element xsi:nil="true"/>
132+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sqQn5FxJEeeaovNgIyUZeA" x="200"/>
133+
</children>
100134
<styles xmi:type="notation:DiagramStyle" xmi:id="_kUir8bQnEeOULris00pHLg"/>
101135
<styles xmi:type="notation:StringValueStyle" xmi:id="_x01VKCtFEeWoF5Z7Jotdrw" name="diagram_compatibility_version" stringValue="1.2.0"/>
102136
<element xmi:type="uml:Package" href="model.uml#_0wslELQWEeOIMOFxCilDfw"/>
@@ -120,6 +154,16 @@
120154
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4vfWp6vxEeaQUopA1XIUeQ"/>
121155
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4vfWqKvxEeaQUopA1XIUeQ"/>
122156
</edges>
157+
<edges xmi:type="notation:Connector" xmi:id="_sqaYwFxJEeeaovNgIyUZeA" type="StereotypeCommentLink" source="_sqQnwFxJEeeaovNgIyUZeA" target="_sqQn4lxJEeeaovNgIyUZeA">
158+
<styles xmi:type="notation:FontStyle" xmi:id="_sqaYwVxJEeeaovNgIyUZeA"/>
159+
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_sqaYxVxJEeeaovNgIyUZeA" name="BASE_ELEMENT">
160+
<eObjectValue xmi:type="uml:Class" href="model.uml#_qxaPwFxJEeeaovNgIyUZeA"/>
161+
</styles>
162+
<element xsi:nil="true"/>
163+
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sqaYwlxJEeeaovNgIyUZeA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
164+
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sqaYw1xJEeeaovNgIyUZeA"/>
165+
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sqaYxFxJEeeaovNgIyUZeA"/>
166+
</edges>
123167
</notation:Diagram>
124168
<notation:Diagram xmi:id="_xLm1QLQ4EeOQ5oJFa1i8cg" type="PapyrusUMLClassDiagram" name="model" measurementUnit="Pixel">
125169
<children xmi:type="notation:Shape" xmi:id="_gmJpcLQ5EeOQ5oJFa1i8cg" type="Class_Shape" lineColor="0">
@@ -2393,6 +2437,14 @@
23932437
<element xsi:nil="true"/>
23942438
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7G94luLEeeJNLUV4A8xUw" x="689" y="43"/>
23952439
</children>
2440+
<children xmi:type="notation:Shape" xmi:id="_x6jSI1xIEeeaovNgIyUZeA" type="StereotypeComment">
2441+
<styles xmi:type="notation:TitleStyle" xmi:id="_x6jSJFxIEeeaovNgIyUZeA"/>
2442+
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_x6jSJlxIEeeaovNgIyUZeA" name="BASE_ELEMENT">
2443+
<eObjectValue xmi:type="uml:Class" href="model.uml#_gLuoYLRnEeOfbtYsPp7Oyg"/>
2444+
</styles>
2445+
<element xsi:nil="true"/>
2446+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_x6jSJVxIEeeaovNgIyUZeA" x="689" y="43"/>
2447+
</children>
23962448
<styles xmi:type="notation:DiagramStyle" xmi:id="_WheIIfu5EeOmMdys2glKCA"/>
23972449
<styles xmi:type="notation:StringValueStyle" xmi:id="_yLdFZitFEeWoF5Z7Jotdrw" name="diagram_compatibility_version" stringValue="1.2.0"/>
23982450
<element xmi:type="uml:Package" href="model.uml#_B7Q5IPu5EeOmMdys2glKCA"/>
@@ -3061,6 +3113,16 @@
30613113
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7G951uLEeeJNLUV4A8xUw"/>
30623114
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7G96FuLEeeJNLUV4A8xUw"/>
30633115
</edges>
3116+
<edges xmi:type="notation:Connector" xmi:id="_x6jSJ1xIEeeaovNgIyUZeA" type="StereotypeCommentLink" source="_C0BfUHIBEeWqqJ8U6ttukA" target="_x6jSI1xIEeeaovNgIyUZeA">
3117+
<styles xmi:type="notation:FontStyle" xmi:id="_x6jSKFxIEeeaovNgIyUZeA"/>
3118+
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_x6jSLFxIEeeaovNgIyUZeA" name="BASE_ELEMENT">
3119+
<eObjectValue xmi:type="uml:Class" href="model.uml#_gLuoYLRnEeOfbtYsPp7Oyg"/>
3120+
</styles>
3121+
<element xsi:nil="true"/>
3122+
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x6jSKVxIEeeaovNgIyUZeA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
3123+
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x6jSKlxIEeeaovNgIyUZeA"/>
3124+
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x6jSK1xIEeeaovNgIyUZeA"/>
3125+
</edges>
30643126
</notation:Diagram>
30653127
<css:ModelStyleSheets xmi:id="_E8YBsE5jEeSEGaIVag_Y7g"/>
30663128
<notation:Diagram xmi:id="__-HggKvxEeaQUopA1XIUeQ" type="PapyrusUMLClassDiagram" name="backend.ini" measurementUnit="Pixel">
@@ -7258,7 +7320,7 @@
72587320
<layoutConstraint xmi:type="notation:Location" xmi:id="_867Le6prEeaGbp23C_zkpg" y="5"/>
72597321
</children>
72607322
<element xmi:type="uml:Class" href="model.uml#_86xZzqprEeaGbp23C_zkpg"/>
7261-
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_867Lj6prEeaGbp23C_zkpg" x="255" y="15" width="196" height="61"/>
7323+
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_867Lj6prEeaGbp23C_zkpg" x="465" y="750" width="196" height="61"/>
72627324
</children>
72637325
<children xmi:type="notation:Shape" xmi:id="_867LkKprEeaGbp23C_zkpg" type="Class_Shape" lineColor="0">
72647326
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_867LkaprEeaGbp23C_zkpg" source="ShadowFigure">

‎src/wcmf/test/model/model.uml

+4
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
<defaultValue xmi:type="uml:LiteralString" xmi:id="_H4XloluLEeeJNLUV4A8xUw" value="wcmf\lib\search\impl\DefaultIndexStrategy"/>
136136
</ownedAttribute>
137137
</packagedElement>
138+
<packagedElement xmi:type="uml:Class" xmi:id="_KntIYFxJEeeaovNgIyUZeA" name="PhpConfig"/>
138139
<packagedElement xmi:type="uml:Class" xmi:id="_86xZyaprEeaGbp23C_zkpg" name="Session">
139140
<ownedAttribute xmi:type="uml:Property" xmi:id="_86xZyqprEeaGbp23C_zkpg" name="__class" visibility="public" type="_agg3ALQwEeOLlbB2YLI0iw">
140141
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_86xZy6prEeaGbp23C_zkpg" value="1"/>
@@ -1741,6 +1742,7 @@
17411742
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MBFYqKvxEeaQUopA1XIUeQ" value="utf8"/>
17421743
</ownedAttribute>
17431744
</packagedElement>
1745+
<packagedElement xmi:type="uml:Class" xmi:id="_qxaPwFxJEeeaovNgIyUZeA" name="PhpConfig"/>
17441746
</packagedElement>
17451747
</packagedElement>
17461748
<packagedElement xmi:type="uml:Package" xmi:id="_nmqxoOj5EeOllcOTHGuLUw" name="src">
@@ -2420,4 +2422,6 @@
24202422
<Chronos:ChiSystem xmi:id="_XayrQEZOEeeLZa5OKBzA3A" plattform="wcmf" config="security.ini" base_Class="_XVX_wEZOEeeLZa5OKBzA3A"/>
24212423
<Chronos:ChiSystem xmi:id="_dVkAkEZOEeeLZa5OKBzA3A" plattform="wcmf" config="security.ini" base_Class="_dVhkUEZOEeeLZa5OKBzA3A"/>
24222424
<Chronos:ChiSystem xmi:id="_H4Za0FuLEeeJNLUV4A8xUw" plattform="wcmf" base_Class="_H4XloFuLEeeJNLUV4A8xUw"/>
2425+
<Chronos:ChiSystem xmi:id="_Kn25YFxJEeeaovNgIyUZeA" plattform="wcmf" base_Class="_KntIYFxJEeeaovNgIyUZeA"/>
2426+
<Chronos:ChiSystem xmi:id="_qxaPwVxJEeeaovNgIyUZeA" plattform="wcmf" config="server.ini" base_Class="_qxaPwFxJEeeaovNgIyUZeA"/>
24232427
</xmi:XMI>

0 commit comments

Comments
 (0)