From 6e2a3ac936263670348a22de65b9991bb7a4290e Mon Sep 17 00:00:00 2001 From: Thomas GASC Date: Wed, 20 Sep 2017 12:04:21 +0200 Subject: [PATCH] fix minor issues --- examples/account-creation.php | 2 +- examples/account-update.php | 2 +- examples/bootstrap.php | 63 +++++++++++++++++------------------ examples/verification.php | 5 +-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/examples/account-creation.php b/examples/account-creation.php index 0bb4093..5b00316 100644 --- a/examples/account-creation.php +++ b/examples/account-creation.php @@ -10,7 +10,7 @@ use Mediapart\LaPresseLibre\Operation\AccountCreation; -$handle(AccountCreation::class, function ($data, $is_testing) use ($public_key) { +$handle(AccountCreation::class, function($data) use ($public_key) { return [ 'IsValid' => true, 'PartenaireID' => $public_key, diff --git a/examples/account-update.php b/examples/account-update.php index 18f0da8..3ba070e 100644 --- a/examples/account-update.php +++ b/examples/account-update.php @@ -10,7 +10,7 @@ use Mediapart\LaPresseLibre\Operation\AccountUpdate; -$handle(AccountUpdate::class, function ($data, $is_testing) use ($public_key) { +$handle(AccountUpdate::class, function($data) use ($public_key) { return [ 'IsValid' => true, 'PartenaireID' => $public_key, diff --git a/examples/bootstrap.php b/examples/bootstrap.php index eeed3b2..92e1403 100644 --- a/examples/bootstrap.php +++ b/examples/bootstrap.php @@ -2,14 +2,14 @@ require '../vendor/autoload.php'; -use Zend\Diactoros\ServerRequestFactory; -use Zend\Diactoros\Response; +use Zend\Diactoros\ServerRequestFactory; +use Zend\Diactoros\Response; use Zend\Diactoros\Response\SapiEmitter; use Mediapart\LaPresseLibre\Security\Identity; use Mediapart\LaPresseLibre\Security\Encryption; use Mediapart\LaPresseLibre\Subscription\Type as SubscriptionType; -use Mediapart\LaPresseLibre\Transaction; -use Mediapart\LaPresseLibre\Endpoint; +use Mediapart\LaPresseLibre\Transaction; +use Mediapart\LaPresseLibre\Endpoint; /* Configuration : @@ -29,33 +29,32 @@ * @param string $operation * @param callable $callback */ -$handle = function($operation, $callback) use ($identity, $encryption, $public_key) -{ - try { - $request = ServerRequestFactory::fromGlobals(); - $transaction = new Transaction($identity, $encryption, $request); - $endpoint = Endpoint::answer($operation, $callback); - $result = $transaction->process($endpoint); - $status = 200; - } catch (\InvalidArgumentException $e) { - $result = $e->getMessage(); - $status = 400; - } catch (\UnexpectedValueException $e) { - $result = $e->getMessage(); - $status = 401; - } catch (\Exception $e) { - $result = 'Internal Error'; - $status = 500; - } finally { - $response = (new Response()) - ->withStatus($status) - ->withHeader('X-PART', (string) $public_key) - ->withHeader('X-LPL', $identity->sign($public_key)) - ->withHeader('X-TS', (string) $identity->getDatetime()->getTimestamp()) - ; - $response->getBody()->write(200 != $status ? json_encode(['error' => $result]) : $result); - } +$handle = function ($operation, $callback) use ($identity, $encryption, $public_key) { + try { + $request = ServerRequestFactory::fromGlobals(); + $transaction = new Transaction($identity, $encryption, $request); + $endpoint = Endpoint::answer($operation, $callback); + $result = $transaction->process($endpoint); + $status = 200; + } catch (\InvalidArgumentException $e) { + $result = $e->getMessage(); + $status = 400; + } catch (\UnexpectedValueException $e) { + $result = $e->getMessage(); + $status = 401; + } catch (\Exception $e) { + $result = 'Internal Error'; + $status = 500; + } finally { + $response = (new Response()) + ->withStatus($status) + ->withHeader('X-PART', (string) $public_key) + ->withHeader('X-LPL', $identity->sign($public_key)) + ->withHeader('X-TS', (string) $identity->getDatetime()->getTimestamp()) + ; + $response->getBody()->write(200 != $status ? json_encode(['error' => $result]) : $result); + } - $emitter = new SapiEmitter(); - $emitter->emit($response); + $emitter = new SapiEmitter(); + $emitter->emit($response); }; diff --git a/examples/verification.php b/examples/verification.php index 00f9da9..a89e2a4 100644 --- a/examples/verification.php +++ b/examples/verification.php @@ -8,9 +8,10 @@ require 'bootstrap.php'; -use Mediapart\LaPresseLibre\Operation\Verification; +use Mediapart\LaPresseLibre\Operation\Verification; +use Mediapart\LaPresseLibre\Subscription\Type as SubscriptionType; -$handle(Verification::class, function ($data, $is_testing) use ($public_key) { +$handle(Verification::class, function($data) use ($public_key) { $now = new DateTime('next year'); return [