Skip to content

Commit b4d4ad3

Browse files
Merge branch '5.0' into upmerge/4.1_5.0
2 parents 57b1b74 + 1a1fbb0 commit b4d4ad3

File tree

3,946 files changed

+47226
-87750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,946 files changed

+47226
-87750
lines changed

.allowed-licenses.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Lendable\ComposerLicenseChecker\LicenseConfigurationBuilder;
6+
7+
return (new LicenseConfigurationBuilder())
8+
->addLicenses(
9+
'MIT',
10+
'BSD-2-Clause',
11+
'BSD-3-Clause',
12+
'Apache-2.0',
13+
'OSL-3.0',
14+
'Artistic-1.0',
15+
'ISC',
16+
)
17+
->addAllowedVendor('pimcore')
18+
->build();

.docker/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# }
55

66
upstream php-pimcore11 {
7-
server coreshop4.1-php:9000;
7+
server coreshop50-php-1:9000;
88
}
99

1010
server {

.github/ci/patches/Payment.php

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
<?php
2+
namespace Payum\Core\Model;
3+
4+
class Payment implements PaymentInterface, DirectDebitPaymentInterface
5+
{
6+
/**
7+
* @var string
8+
*/
9+
protected $number;
10+
11+
/**
12+
* @var string
13+
*/
14+
protected $description;
15+
16+
/**
17+
* @var string
18+
*/
19+
protected $clientEmail;
20+
21+
/**
22+
* @var string
23+
*/
24+
protected $clientId;
25+
26+
/**
27+
* @var int
28+
*/
29+
protected $totalAmount;
30+
31+
/**
32+
* @var string
33+
*/
34+
protected $currencyCode;
35+
36+
/**
37+
* @var array
38+
*/
39+
protected $details;
40+
41+
/**
42+
* @var CreditCardInterface|null
43+
*/
44+
protected $creditCard;
45+
46+
/**
47+
* @var BankAccountInterface|null
48+
*/
49+
protected $bankAccount;
50+
51+
public function __construct()
52+
{
53+
$this->details = [];
54+
}
55+
56+
/**
57+
* {@inheritDoc}
58+
*/
59+
public function getNumber()
60+
{
61+
return $this->number;
62+
}
63+
64+
/**
65+
* @param string $number
66+
*/
67+
public function setNumber($number)
68+
{
69+
$this->number = $number;
70+
}
71+
72+
/**
73+
* {@inheritDoc}
74+
*/
75+
public function getDescription()
76+
{
77+
return $this->description;
78+
}
79+
80+
/**
81+
* @param string $description
82+
*/
83+
public function setDescription($description)
84+
{
85+
$this->description = $description;
86+
}
87+
88+
/**
89+
* {@inheritDoc}
90+
*/
91+
public function getClientEmail()
92+
{
93+
return $this->clientEmail;
94+
}
95+
96+
/**
97+
* @param string $clientEmail
98+
*/
99+
public function setClientEmail($clientEmail)
100+
{
101+
$this->clientEmail = $clientEmail;
102+
}
103+
104+
/**
105+
* {@inheritDoc}
106+
*/
107+
public function getClientId()
108+
{
109+
return $this->clientId;
110+
}
111+
112+
/**
113+
* @param string $clientId
114+
*/
115+
public function setClientId($clientId)
116+
{
117+
$this->clientId = $clientId;
118+
}
119+
120+
/**
121+
* {@inheritDoc}
122+
*/
123+
public function getTotalAmount()
124+
{
125+
return $this->totalAmount;
126+
}
127+
128+
/**
129+
* @param int $totalAmount
130+
*/
131+
public function setTotalAmount($totalAmount)
132+
{
133+
$this->totalAmount = $totalAmount;
134+
}
135+
136+
/**
137+
* {@inheritDoc}
138+
*/
139+
public function getCurrencyCode()
140+
{
141+
return $this->currencyCode;
142+
}
143+
144+
/**
145+
* @param string $currencyCode
146+
*/
147+
public function setCurrencyCode($currencyCode)
148+
{
149+
$this->currencyCode = $currencyCode;
150+
}
151+
152+
/**
153+
* {@inheritDoc}
154+
*/
155+
public function getDetails()
156+
{
157+
return $this->details;
158+
}
159+
160+
/**
161+
* {@inheritDoc}
162+
*
163+
* @param array|\Traversable $details
164+
*/
165+
public function setDetails($details)
166+
{
167+
if ($details instanceof \Traversable) {
168+
$details = iterator_to_array($details);
169+
}
170+
171+
$this->details = $details;
172+
}
173+
174+
/**
175+
* @return CreditCardInterface|null
176+
*/
177+
public function getCreditCard()
178+
{
179+
return $this->creditCard;
180+
}
181+
182+
/**
183+
* @param CreditCardInterface|null $creditCard
184+
*/
185+
public function setCreditCard(?CreditCardInterface $creditCard = null)
186+
{
187+
$this->creditCard = $creditCard;
188+
}
189+
190+
/**
191+
* @return BankAccountInterface|null
192+
*/
193+
public function getBankAccount()
194+
{
195+
return $this->bankAccount;
196+
}
197+
198+
/**
199+
* @param BankAccountInterface|null $bankAccount
200+
*/
201+
public function setBankAccount(?BankAccountInterface $bankAccount = null)
202+
{
203+
$this->bankAccount = $bankAccount;
204+
}
205+
}

0 commit comments

Comments
 (0)