Skip to content

Commit cf9314d

Browse files
Progi1984Progi1984
committed
#3 : Reader GanttProject (Fix PHPCS/MD issues)
1 parent 128bac3 commit cf9314d

File tree

5 files changed

+53
-50
lines changed

5 files changed

+53
-50
lines changed

‎src/PhpProject/PhpProject.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ public function getResource($pIndex = 0)
201201
*/
202202
public function getResourceFromIndex($pIndex)
203203
{
204-
foreach ($this->resourceCollection as $oResource){
205-
if($oResource->getIndex() == $pIndex) {
204+
foreach ($this->resourceCollection as $oResource) {
205+
if ($oResource->getIndex() == $pIndex) {
206206
return $oResource;
207207
}
208208
}
@@ -283,21 +283,21 @@ public function getTask($pIndex = 0)
283283
*/
284284
public function getTaskFromIndex($pIndex, Task $oTaskParent = null)
285285
{
286-
if(is_null($oTaskParent)){
287-
$arrayTask = $this->taskCollection;
288-
} else {
289-
$arrayTask = $oTaskParent->getTasks();
290-
}
291-
foreach ($arrayTask as $oTask){
292-
if($oTask->getIndex() == $pIndex) {
286+
if (is_null($oTaskParent)) {
287+
$arrayTask = $this->taskCollection;
288+
} else {
289+
$arrayTask = $oTaskParent->getTasks();
290+
}
291+
foreach ($arrayTask as $oTask) {
292+
if ($oTask->getIndex() == $pIndex) {
293293
return $oTask;
294294
} else {
295-
if($oTask->getTaskCount() > 0) {
296-
$return = $this->getTaskFromIndex($pIndex, $oTask);
297-
if($return instanceof Task) {
298-
return $return;
299-
}
300-
}
295+
if ($oTask->getTaskCount() > 0) {
296+
$return = $this->getTaskFromIndex($pIndex, $oTask);
297+
if ($return instanceof Task) {
298+
return $return;
299+
}
300+
}
301301
}
302302
}
303303
return null;

‎src/PhpProject/Reader/GanttProject.php‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,22 @@ public function load ($pFilename)
7373
$oXML = new XMLReader();
7474
$oXML->getDomFromString($content);
7575

76-
$readMethods = array(
77-
'description' => 'readNodeDescription',
78-
'tasks' => 'readNodeTasks',
79-
'resources' => 'readNodeResources',
80-
'allocations' => 'readNodeAllocations',
81-
);
82-
8376
$oNodes = $oXML->getElements('*');
8477
if ($oNodes->length > 0) {
8578
foreach ($oNodes as $oNode) {
86-
if (array_key_exists($oNode->nodeName, $readMethods)) {
87-
$readMethod = $readMethods[$oNode->nodeName];
88-
$this->$readMethod($oXML, $oNode);
79+
switch ($oNode->nodeName) {
80+
case 'allocations':
81+
$this->readNodeAllocations($oXML, $oNode);
82+
break;
83+
case 'description':
84+
$this->readNodeDescription($oNode);
85+
break;
86+
case 'resources':
87+
$this->readNodeResources($oXML, $oNode);
88+
break;
89+
case 'tasks':
90+
$this->readNodeTasks($oXML, $oNode);
91+
break;
8992
}
9093
}
9194
}
@@ -98,7 +101,7 @@ public function load ($pFilename)
98101
* @param XMLReader $oXML
99102
* @param \DOMElement $domNode
100103
*/
101-
private function readNodeDescription (XMLReader $oXML, \DOMElement $domNode)
104+
private function readNodeDescription (\DOMElement $domNode)
102105
{
103106
$this->phpProject->getProperties()->setDescription($domNode->nodeValue);
104107
}
@@ -159,7 +162,7 @@ private function readNodeResources (XMLReader $oXML, \DOMElement $domNode)
159162
foreach ($oNodes as $oNode) {
160163
if ($oNode->nodeName == 'resource') {
161164
$oResource = $this->phpProject->createResource();
162-
$this->readNodeResource($oXML, $oNode, $oResource);
165+
$this->readNodeResource($oNode, $oResource);
163166
}
164167
}
165168
}
@@ -169,7 +172,7 @@ private function readNodeResources (XMLReader $oXML, \DOMElement $domNode)
169172
* @param XMLReader $oXML
170173
* @param \DOMElement $domNode
171174
*/
172-
private function readNodeResource (XMLReader $oXML, \DOMElement $domNode, Resource $oResource)
175+
private function readNodeResource (\DOMElement $domNode, Resource $oResource)
173176
{
174177
// Attributes
175178
$oResource->setIndex($domNode->getAttribute('id'));
@@ -187,7 +190,7 @@ private function readNodeAllocations (XMLReader $oXML, \DOMElement $domNode)
187190
if ($oNodes->length > 0) {
188191
foreach ($oNodes as $oNode) {
189192
if ($oNode->nodeName == 'allocation') {
190-
$this->readNodeAllocation($oXML, $oNode);
193+
$this->readNodeAllocation($oNode);
191194
}
192195
}
193196
}
@@ -197,7 +200,7 @@ private function readNodeAllocations (XMLReader $oXML, \DOMElement $domNode)
197200
* @param XMLReader $oXML
198201
* @param \DOMElement $domNode
199202
*/
200-
private function readNodeAllocation (XMLReader $oXML, \DOMElement $domNode)
203+
private function readNodeAllocation (\DOMElement $domNode)
201204
{
202205
// Attributes
203206
$idTask = $domNode->getAttribute('task-id');

‎src/PhpProject/Shared/XMLReader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,4 @@ public function elementExists($path, \DOMElement $contextNode = null)
183183
{
184184
return $this->getElements($path, $contextNode)->length > 0;
185185
}
186-
}
186+
}

‎tests/PhpProject/Tests/PhpProjectTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ public function testResource()
7979

8080
public function testResourceFromIndex()
8181
{
82-
$object = new PhpProject();
83-
$oResource1 = $object->createResource();
84-
$oResource1->setIndex(2);
85-
$oResource2 = $object->createResource();
86-
$oResource2->setIndex(4);
87-
88-
$this->assertInstanceOf('PhpOffice\\PhpProject\\Resource', $object->getResourceFromIndex(2));
89-
$this->assertNull($object->getResourceFromIndex(1));
82+
$object = new PhpProject();
83+
$oResource1 = $object->createResource();
84+
$oResource1->setIndex(2);
85+
$oResource2 = $object->createResource();
86+
$oResource2->setIndex(4);
87+
88+
$this->assertInstanceOf('PhpOffice\\PhpProject\\Resource', $object->getResourceFromIndex(2));
89+
$this->assertNull($object->getResourceFromIndex(1));
9090
}
9191

9292
/**
@@ -143,16 +143,16 @@ public function testTask()
143143

144144
public function testTaskFromIndex()
145145
{
146-
$object = new PhpProject();
147-
$oTask1 = $object->createTask();
148-
$oTask1->setIndex(2);
149-
$oTask11 = $oTask1->createTask();
150-
$oTask11->setIndex(22);
151-
$oTask2 = $object->createTask();
152-
$oTask2->setIndex(4);
153-
154-
$this->assertInstanceOf('PhpOffice\\PhpProject\\Task', $object->getTaskFromIndex(2));
155-
$this->assertNull($object->getTaskFromIndex(1));
146+
$object = new PhpProject();
147+
$oTask1 = $object->createTask();
148+
$oTask1->setIndex(2);
149+
$oTask11 = $oTask1->createTask();
150+
$oTask11->setIndex(22);
151+
$oTask2 = $object->createTask();
152+
$oTask2->setIndex(4);
153+
154+
$this->assertInstanceOf('PhpOffice\\PhpProject\\Task', $object->getTaskFromIndex(2));
155+
$this->assertNull($object->getTaskFromIndex(1));
156156
}
157157

158158
/**

‎tests/PhpProject/Tests/Shared/XMLReaderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ public function testElementExists()
152152
$this->assertTrue($object->elementExists('w:body/w:p/w:r/w:t'));
153153
$this->assertFalse($object->elementExists('w:body/w:p/w:r/w:tNotExists'));
154154
}
155-
}
155+
}

0 commit comments

Comments
 (0)