Skip to content

Commit 7463119

Browse files
ehibesehibes
committed
PBX_BILLING && PBX_SHOPPINGCART
1 parent 8930f3a commit 7463119

12 files changed

+745
-145
lines changed

‎composer.json‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
"description": "Acme example plugin for Sylius.",
66
"license": "MIT",
77
"require": {
8-
"php": "^8.0",
9-
"sylius/sylius": "^1.9"
8+
"php": "^7.3 || ^8.0",
9+
10+
"sylius/sylius": "^1.8"
1011
},
1112
"require-dev": {
1213
"behat/behat": "^3.6.1",
@@ -20,17 +21,17 @@
2021
"friends-of-behat/suite-settings-extension": "^1.0",
2122
"friends-of-behat/symfony-extension": "^2.1",
2223
"friends-of-behat/variadic-extension": "^1.3",
23-
"lakion/mink-debug-extension": "^2.0",
24+
"lakion/mink-debug-extension": "^1.2.3 || ^2.0",
2425
"phpspec/phpspec": "^6.1",
2526
"phpstan/extension-installer": "^1.0",
26-
"phpstan/phpstan": "^1.0",
27-
"phpstan/phpstan-doctrine": "^1.0",
28-
"phpstan/phpstan-strict-rules": "^1.0",
29-
"phpstan/phpstan-webmozart-assert": "^1.0",
27+
"phpstan/phpstan": "0.12.25 || ^1.0",
28+
"phpstan/phpstan-doctrine": "0.12.13 || ^1.0",
29+
"phpstan/phpstan-strict-rules": "^0.12.0 || ^1.0",
30+
"phpstan/phpstan-webmozart-assert": "0.12.4 || ^1.0",
3031
"phpunit/phpunit": "^8.5",
3132
"rector/rector": "^0.13.10",
3233
"sensiolabs/security-checker": "^6.0",
33-
"sylius-labs/coding-standard": "^4.2",
34+
"sylius-labs/coding-standard": "^3.1 || ^4.2",
3435
"symfony/browser-kit": "^4.4",
3536
"symfony/debug-bundle": "^4.4|^5.0",
3637
"symfony/dotenv": "^4.4|^5.0",
@@ -54,11 +55,7 @@
5455
}
5556
},
5657
"config": {
57-
"sort-packages": true,
58-
"allow-plugins": {
59-
"dealerdirect/phpcodesniffer-composer-installer": true,
60-
"phpstan/extension-installer": true
61-
}
58+
"sort-packages": true
6259
},
6360
"scripts": {
6461
"post-install-cmd": [

‎src/Action/CaptureAction.php‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,29 @@ final class CaptureAction implements ActionInterface, ApiAwareInterface
3434
{
3535
use GatewayAwareTrait;
3636

37-
private array $api = [];
37+
private $api = [];
3838

39-
public function __construct(private Payum $payum, private EtransactionsBridgeInterface $etransactionsBridge)
39+
/**
40+
* @var Payum
41+
*/
42+
private $payum;
43+
44+
/**
45+
* @var EtransactionsBridgeInterface
46+
*/
47+
private $etransactionsBridge;
48+
49+
/**
50+
* @param Payum $payum
51+
* @param EtransactionsBridgeInterface $etransactionsBridge
52+
*/
53+
public function __construct(
54+
Payum $payum,
55+
EtransactionsBridgeInterface $etransactionsBridge
56+
)
4057
{
58+
$this->etransactionsBridge = $etransactionsBridge;
59+
$this->payum = $payum;
4160
}
4261

4362
/**
@@ -126,10 +145,12 @@ public function execute($request)
126145
$currencyCode,
127146
$transactionReference,
128147
$customerEmail,
129-
$automaticResponseUrl
148+
$automaticResponseUrl,
149+
$order
130150
);
131151

132152
$request->setModel($model);
153+
133154
$simplePayment->execute();
134155
}
135156

‎src/Action/NotifyAction.php‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,29 @@ final class NotifyAction implements ActionInterface, ApiAwareInterface
2929
{
3030
use GatewayAwareTrait;
3131

32-
private array $api = [];
32+
private $api = [];
3333

34-
public function __construct(private EtransactionsBridgeInterface $etransactionsBridge, private FactoryInterface $stateMachineFactory)
34+
/**
35+
* @var EtransactionsBridgeInterface
36+
*/
37+
private $etransactionsBridge;
38+
39+
/**
40+
* @var FactoryInterface
41+
*/
42+
private $stateMachineFactory;
43+
44+
/**
45+
* @param EtransactionsBridgeInterface $etransactionsBridge
46+
* @param FactoryInterface $stateMachineFactory
47+
*/
48+
public function __construct(
49+
EtransactionsBridgeInterface $etransactionsBridge,
50+
FactoryInterface $stateMachineFactory
51+
)
3552
{
53+
$this->etransactionsBridge = $etransactionsBridge;
54+
$this->stateMachineFactory = $stateMachineFactory;
3655
}
3756

3857
/**

‎src/Action/StatusAction.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,17 @@
2323
*/
2424
final class StatusAction implements ActionInterface
2525
{
26-
public function __construct(private RequestStack $requestStack)
26+
/**
27+
* @var RequestStack
28+
*/
29+
private $requestStack;
30+
31+
/**
32+
* @param RequestStack $requestStack
33+
*/
34+
public function __construct(RequestStack $requestStack)
2735
{
36+
$this->requestStack = $requestStack;
2837
}
2938

3039
/**

‎src/Bridge/EtransactionsBridge.php‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,17 @@
1818
*/
1919
final class EtransactionsBridge implements EtransactionsBridgeInterface
2020
{
21-
public function __construct(private RequestStack $requestStack)
21+
/**
22+
* @var RequestStack
23+
*/
24+
private $requestStack;
25+
26+
/**
27+
* @param RequestStack $requestStack
28+
*/
29+
public function __construct(RequestStack $requestStack)
2230
{
31+
$this->requestStack = $requestStack;
2332
}
2433

2534
/**
@@ -62,4 +71,14 @@ public function isGetMethod()
6271

6372
return $currentRequest->isMethod('GET');
6473
}
74+
75+
/**
76+
* {@inheritDoc}
77+
*/
78+
public function isPostMethod()
79+
{
80+
$currentRequest = $this->requestStack->getCurrentRequest();
81+
82+
return $currentRequest->isMethod('POST');
83+
}
6584
}

‎src/EtransactionsGatewayFactory.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@ protected function populateConfig(ArrayObject $config)
2121
]);
2222

2323
if (false == $config['payum.api']) {
24-
$config['payum.default_options'] = ['site' => '', 'rang' => '', 'identifiant' => '', 'hmac' => '', 'hash' => 'SHA512', 'retour' => 'Mt:M;Ref:R;Auto:A;error_code:E', 'sandbox' => false, 'type_paiement' => '', 'type_carte' => ''];
24+
$config['payum.default_options'] = array(
25+
'site' => '',
26+
'rang' => '',
27+
'identifiant' => '',
28+
'hmac' => '',
29+
'hash' => 'SHA512',
30+
'retour' => 'Mt:M;Ref:R;Auto:A;error_code:E',
31+
'sandbox' => false,
32+
'type_paiement' => '',
33+
'type_carte' => ''
34+
);
2535
$config->defaults($config['payum.default_options']);
26-
$config['payum.required_options'] = ['site', 'rang', 'identifiant', 'hmac'];
36+
$config['payum.required_options'] = array('site', 'rang', 'identifiant', 'hmac');
2737

2838
// $config['payum.api'] = function (ArrayObject $config) {
2939
// $config->validateNotEmpty($config['payum.required_options']);

‎src/Legacy/Etransactions.origin.php‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,45 @@ class Etransactions
1313
/**
1414
* Primary server.
1515
*/
16-
public const MAIN_SERVER = "tpeweb.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi";
16+
const MAIN_SERVER = "tpeweb.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi";
1717

1818
/**
1919
* Backup server.
2020
*/
21-
public const BACKUP_SERVER = "tpeweb1.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi";
21+
const BACKUP_SERVER = "tpeweb1.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi";
2222

2323
/**
2424
* Sandbox server.
2525
*/
26-
public const SANDBOX_SERVER = "preprod-tpeweb.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi";
26+
const SANDBOX_SERVER = "preprod-tpeweb.e-transactions.fr/cgi/MYchoix_pagepaiement.cgi";
2727

2828
/**
29+
* @var HttpClientInterface
30+
*/
31+
protected $client;
32+
33+
/**
34+
* @var MessageFactory
35+
*/
36+
protected $messageFactory;
37+
38+
/**
39+
* @var array
40+
*/
41+
protected $options = [];
42+
43+
/**
44+
* @param array $options
45+
* @param HttpClientInterface $client
46+
* @param MessageFactory $messageFactory
2947
*
3048
* @throws \Payum\Core\Exception\InvalidArgumentException if an option is invalid
3149
*/
32-
public function __construct(protected array $options, protected HttpClientInterface $client, protected MessageFactory $messageFactory)
50+
public function __construct(array $options, HttpClientInterface $client, MessageFactory $messageFactory)
3351
{
52+
$this->options = $options;
53+
$this->client = $client;
54+
$this->messageFactory = $messageFactory;
3455
}
3556

3657

@@ -50,6 +71,8 @@ public function doPayment(array $fields)
5071
}
5172

5273
/**
74+
* @param array $fields
75+
*
5376
* @return array
5477
*/
5578
protected function doRequest($method, array $fields)
@@ -74,11 +97,11 @@ protected function doRequest($method, array $fields)
7497
*/
7598
protected function getApiEndpoint()
7699
{
77-
$servers = [];
100+
$servers = array();
78101
if ($this->options['sandbox']) {
79102
$servers[] = self::SANDBOX_SERVER;
80103
} else {
81-
$servers = [self::MAIN_SERVER, self::BACKUP_SERVER];
104+
$servers = array(self::MAIN_SERVER, self::BACKUP_SERVER);
82105
}
83106

84107
foreach ($servers as $server) {
@@ -122,12 +145,13 @@ protected function computeHmac($hmac, $fields)
122145
/**
123146
* Makes an array of parameters become a querystring like string.
124147
*
148+
* @param array $array
125149
*
126150
* @return string
127151
*/
128152
static public function stringify(array $array)
129153
{
130-
$result = [];
154+
$result = array();
131155
foreach ($array as $key => $value) {
132156
$result[] = sprintf('%s=%s', $key, $value);
133157
}

0 commit comments

Comments
 (0)