Skip to content

Commit f824363

Browse files
authored
Merge pull request #23 from chris-pleint/master
DEV-2801
2 parents 6404b65 + 9697c06 commit f824363

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

src/Service/CertificateService.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function create(Certificate $certificate)
4040
Domainrobot::setLastDomainrobotResult($domainrobotResult);
4141

4242
return new ObjectJob([
43-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
43+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
4444
]);
4545
}
4646

@@ -269,7 +269,7 @@ public function delete($id)
269269
Domainrobot::setLastDomainrobotResult($domainrobotResult);
270270

271271
return new ObjectJob([
272-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
272+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
273273
]);
274274
}
275275

@@ -306,7 +306,7 @@ public function reissue(Certificate $body)
306306
Domainrobot::setLastDomainrobotResult($domainrobotResult);
307307

308308
return new ObjectJob([
309-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
309+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
310310
]);
311311
}
312312

@@ -349,7 +349,7 @@ public function renew(Certificate $body)
349349
Domainrobot::setLastDomainrobotResult($domainrobotResult);
350350

351351
return new ObjectJob([
352-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
352+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
353353
]);
354354
}
355355

@@ -430,7 +430,7 @@ private function prepareCsr($body)
430430
);
431431

432432
if (!empty($matches)) {
433-
$body->$setMethod(implode("\n", [
433+
$body->$setMethod(implode("\r\n", [
434434
$matches[1],
435435
$matches[2],
436436
$matches[3]

src/Service/DomainService.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ public function create(Domain $body)
3737

3838
Domainrobot::setLastDomainrobotResult($domainrobotResult);
3939

40+
// return $domainrobotResult->getResult();
41+
4042
return new ObjectJob([
41-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
43+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
4244
]);
4345
}
4446

@@ -131,7 +133,7 @@ public function renew(Domain $body)
131133
Domainrobot::setLastDomainrobotResult($domainrobotResult);
132134

133135
return new ObjectJob([
134-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
136+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
135137
]);
136138
}
137139

@@ -167,7 +169,7 @@ public function transfer(Domain $body)
167169
Domainrobot::setLastDomainrobotResult($domainrobotResult);
168170

169171
return new ObjectJob([
170-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
172+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
171173
]);
172174
}
173175

@@ -473,7 +475,7 @@ public function update(Domain $body)
473475
Domainrobot::setLastDomainrobotResult($domainrobotResult);
474476

475477
return new ObjectJob([
476-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
478+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
477479
]);
478480
}
479481

@@ -509,7 +511,7 @@ public function restore(DomainRestore $body)
509511
Domainrobot::setLastDomainrobotResult($domainrobotResult);
510512

511513
return new ObjectJob([
512-
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0.id', '')
514+
"job" => ArrayHelper::getValueFromArray($domainrobotResult->getResult(), 'data.0', '')
513515
]);
514516
}
515517

src/Service/TransferOutService.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Domainrobot\Model\TransferAnswer;
1111
use Domainrobot\Model\TransferOut;
1212
use Domainrobot\Service\DomainrobotService;
13+
use InvalidArgumentException;
1314

1415
class TransferOutService extends DomainrobotService
1516
{

0 commit comments

Comments
 (0)