Skip to content

Commit dac61ac

Browse files
committed
Adding nodes returns the node now
It made more sense to do so
1 parent cf7ee92 commit dac61ac

File tree

2 files changed

+25
-31
lines changed

2 files changed

+25
-31
lines changed

src/PE/nodes/EncoderNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static function addNode(EncoderNode $node) {
117117
}
118118

119119
self::softCleanNodeCache();
120-
return true;
120+
return $node;
121121
}
122122

123123
/**
@@ -198,7 +198,7 @@ public static function addNodeType(EncoderNode $nodeType) {
198198
self::$nodesTypes[$nodeTypeId] = $nodeType;
199199

200200
self::softCleanNodeTypeCache();
201-
return true;
201+
return $nodeType;
202202
}
203203

204204
/**

tests/PE/Tests/Samples.php

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -114,105 +114,99 @@ public function addFarmNodes() {
114114
$this->addAnimalNodes();
115115
}
116116
public function addFarmNode() {
117-
EncoderNode::addNode(new FarmNode());
117+
return EncoderNode::addNode(new FarmNode());
118118
}
119119

120120
public function addBuildingNode() {
121-
$node = new BuildingNode();
122-
EncoderNode::addNode(new BuildingNode());
123-
return $node;
121+
return EncoderNode::addNode(new BuildingNode());
124122
}
125123
public function getBuildingHouse() {
126124
return new House();
127125
}
128126
public function addBuildingHouseNode() {
129-
$node = new HouseNode();
130-
EncoderNode::addNodeType($node);
131-
return $node;
127+
return EncoderNode::addNodeType(new HouseNode());
132128
}
133129
public function addBuildingGreenhouseNode() {
134-
EncoderNode::addNodeType(new GreenhouseNode());
130+
return EncoderNode::addNodeType(new GreenhouseNode());
135131
}
136132
public function addBuildingBarnNode() {
137-
EncoderNode::addNodeType(new BarnNode());
133+
return EncoderNode::addNodeType(new BarnNode());
138134
}
139135

140136
public function addAnimalNodes($children = true) {
141-
EncoderNode::addNode(new AnimalNode());
137+
$animalNode = EncoderNode::addNode(new AnimalNode());
142138
if ($children) {
143139
$this->addAnimalCatNode();
144140
$this->addAnimalChickenNode();
145141
$this->addAnimalCowNode();
146142
$this->addAnimalSheepNode();
147143
}
144+
return $animalNode;
148145
}
149146

150147
public function addAnimalCatNode() {
151-
EncoderNode::addNodeType(new CatNode());
148+
return EncoderNode::addNodeType(new CatNode());
152149
}
153150
public function addAnimalChickenNode() {
154-
EncoderNode::addNodeType(new ChickenNode());
151+
return EncoderNode::addNodeType(new ChickenNode());
155152
}
156153
public function addAnimalCowNode() {
157-
EncoderNode::addNodeType(new CowNode());
154+
return EncoderNode::addNodeType(new CowNode());
158155
}
159156
public function addAnimalSheepNode() {
160-
EncoderNode::addNodeType(new SheepNode());
157+
return EncoderNode::addNodeType(new SheepNode());
161158
}
162159

163160

164161
public function getThings() {
165162
return new Things();
166163
}
167164
public function addThingsNode() {
168-
$thingsNode = new ThingsNode();
169-
EncoderNode::addNode($thingsNode);
170-
return $thingsNode;
165+
return EncoderNode::addNode(new ThingsNode());
171166
}
172167
public function getThing() {
173168
return new Thing();
174169
}
175170
public function addThingNode() {
176-
EncoderNode::addNode(new ThingNode());
171+
return EncoderNode::addNode(new ThingNode());
177172
}
178173

179174

180175
public function getNoGetterMethod() {
181176
return new NoGetterMethod();
182177
}
183178
public function addNoGetterMethodNode() {
184-
EncoderNode::addNode(new NoGetterMethodNode());
179+
return EncoderNode::addNode(new NoGetterMethodNode());
185180
}
186181

187182
public function getVariableNoGetterMethod() {
188183
return new NoVariableGetterMethod();
189184
}
190185
public function addVariableNoGetterMethodNode() {
191-
EncoderNode::addNode(new NoVariableGetterMethodNode());
186+
return EncoderNode::addNode(new NoVariableGetterMethodNode());
192187
}
193188

194189
public function getNonArrayGetterMethod() {
195190
return new NonArrayGetterMethod();
196191
}
197-
public function addNonArrayGetterMethodNode()
198-
{
199-
EncoderNode::addNode(new NonArrayGetterMethodNode());
192+
public function addNonArrayGetterMethodNode() {
193+
return EncoderNode::addNode(new NonArrayGetterMethodNode());
200194
}
201195

202196

203197
public function getNonArrayGetterMethodOnPurpose() {
204198
return new NonArrayGetterMethodOnPurpose();
205199
}
206200
public function addNonArrayGetterMethodOnPurposeNode() {
207-
EncoderNode::addNode(new NonArrayGetterMethodOnPurposeNode());
201+
return EncoderNode::addNode(new NonArrayGetterMethodOnPurposeNode());
208202
}
209203

210204

211205
public function getSingleChild() {
212206
return new SingleChild();
213207
}
214208
public function addSingleChildNode() {
215-
EncoderNode::addNode(new SingleChildNode());
209+
return EncoderNode::addNode(new SingleChildNode());
216210
}
217211

218212

@@ -223,7 +217,7 @@ public function getAccessorMethodActionTypeNodeNode() {
223217
return new AccessorMethodActionTypeNodeNode();
224218
}
225219
public function addAccessorMethodActionTypeNodeNode() {
226-
EncoderNode::addNode(new AccessorMethodActionTypeNodeNode());
220+
return EncoderNode::addNode(new AccessorMethodActionTypeNodeNode());
227221
}
228222

229223
public function getEncoderNodeVariableApplyToSetter() {
@@ -233,15 +227,15 @@ public function getEncoderNodeVariableApplyToSetterNode() {
233227
return new EncoderNodeVariableApplyToSetterNode();
234228
}
235229
public function addEncoderNodeVariableApplyToSetterNodeNode() {
236-
EncoderNode::addNode(new EncoderNodeVariableApplyToSetterNode());
230+
return EncoderNode::addNode(new EncoderNodeVariableApplyToSetterNode());
237231
}
238232

239233
public function addRequiredConstructorVariablesNode($addVariables = true) {
240-
EncoderNode::addNode(new RequiredConstructorVariablesNode($addVariables));
234+
return EncoderNode::addNode(new RequiredConstructorVariablesNode($addVariables));
241235
}
242236

243237
public function addClassLoaderNode($setupLoader) {
244-
EncoderNode::addNode(new ClassLoaderNode($setupLoader));
238+
return EncoderNode::addNode(new ClassLoaderNode($setupLoader));
245239
}
246240

247241
public function addAddAfterDecodeNodes($addAfterAttributes = true) {

0 commit comments

Comments
 (0)