Skip to content

Commit 70c9361

Browse files
YumeChaanYumeChaan
committed
rest-client-php upgraded
1 parent 3caf920 commit 70c9361

9 files changed

Lines changed: 102 additions & 37 deletions

File tree

‎modules/registrars/openprovider/composer.lock‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/registrars/openprovider/vendor/autoload.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
echo $err;
1515
}
1616
}
17-
trigger_error(
18-
$err,
19-
E_USER_ERROR
20-
);
17+
throw new RuntimeException($err);
2118
}
2219

2320
require_once __DIR__ . '/composer/autoload_real.php';

‎modules/registrars/openprovider/vendor/composer/InstalledVersions.php‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,23 @@
2626
*/
2727
class InstalledVersions
2828
{
29+
/**
30+
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
31+
* @internal
32+
*/
33+
private static $selfDir = null;
34+
2935
/**
3036
* @var mixed[]|null
3137
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
3238
*/
3339
private static $installed;
3440

41+
/**
42+
* @var bool
43+
*/
44+
private static $installedIsLocalDir;
45+
3546
/**
3647
* @var bool|null
3748
*/
@@ -309,6 +320,24 @@ public static function reload($data)
309320
{
310321
self::$installed = $data;
311322
self::$installedByVendor = array();
323+
324+
// when using reload, we disable the duplicate protection to ensure that self::$installed data is
325+
// always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
326+
// so we have to assume it does not, and that may result in duplicate data being returned when listing
327+
// all installed packages for example
328+
self::$installedIsLocalDir = false;
329+
}
330+
331+
/**
332+
* @return string
333+
*/
334+
private static function getSelfDir()
335+
{
336+
if (self::$selfDir === null) {
337+
self::$selfDir = strtr(__DIR__, '\\', '/');
338+
}
339+
340+
return self::$selfDir;
312341
}
313342

314343
/**
@@ -322,19 +351,27 @@ private static function getInstalled()
322351
}
323352

324353
$installed = array();
354+
$copiedLocalDir = false;
325355

326356
if (self::$canGetVendors) {
357+
$selfDir = self::getSelfDir();
327358
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
359+
$vendorDir = strtr($vendorDir, '\\', '/');
328360
if (isset(self::$installedByVendor[$vendorDir])) {
329361
$installed[] = self::$installedByVendor[$vendorDir];
330362
} elseif (is_file($vendorDir.'/composer/installed.php')) {
331363
/** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
332364
$required = require $vendorDir.'/composer/installed.php';
333-
$installed[] = self::$installedByVendor[$vendorDir] = $required;
334-
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335-
self::$installed = $installed[count($installed) - 1];
365+
self::$installedByVendor[$vendorDir] = $required;
366+
$installed[] = $required;
367+
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
368+
self::$installed = $required;
369+
self::$installedIsLocalDir = true;
336370
}
337371
}
372+
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
373+
$copiedLocalDir = true;
374+
}
338375
}
339376
}
340377

@@ -350,7 +387,7 @@ private static function getInstalled()
350387
}
351388
}
352389

353-
if (self::$installed !== array()) {
390+
if (self::$installed !== array() && !$copiedLocalDir) {
354391
$installed[] = self::$installed;
355392
}
356393

‎modules/registrars/openprovider/vendor/composer/autoload_psr4.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'phpmock\\mockery\\' => array($vendorDir . '/php-mock/php-mock-mockery/classes'),
1010
'phpmock\\integration\\' => array($vendorDir . '/php-mock/php-mock-integration/classes'),
1111
'phpmock\\' => array($vendorDir . '/php-mock/php-mock/classes', $vendorDir . '/php-mock/php-mock/tests'),
12-
'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src'),
12+
'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-common/src'),
1313
'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
1414
'WeDevelopCoffee\\wPower\\' => array($vendorDir . '/wedevelopcoffee/wpower/src'),
1515
'VIISON\\AddressSplitter\\' => array($vendorDir . '/viison/address-splitter/src'),

‎modules/registrars/openprovider/vendor/composer/autoload_static.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ class ComposerStaticInit9a29979374213b4116ca45940115c24f
125125
),
126126
'phpDocumentor\\Reflection\\' =>
127127
array (
128-
0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
129-
1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
130-
2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
128+
0 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
129+
1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
130+
2 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src',
131131
),
132132
'Webmozart\\Assert\\' =>
133133
array (

‎modules/registrars/openprovider/vendor/composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -777,17 +777,17 @@
777777
},
778778
{
779779
"name": "openprovider/rest-client-php",
780-
"version": "v2.2.1-beta",
781-
"version_normalized": "2.2.1.0-beta",
780+
"version": "v2.2.2-beta",
781+
"version_normalized": "2.2.2.0-beta",
782782
"source": {
783783
"type": "git",
784784
"url": "https://github.com/openprovider/rest-client-php.git",
785-
"reference": "aacd391672e8a1e2d724c6f0cbcc221e06e7b2a8"
785+
"reference": "fd6217899a7c4c97e2cfd2731e2b74557a5cad2e"
786786
},
787787
"dist": {
788788
"type": "zip",
789-
"url": "https://api.github.com/repos/openprovider/rest-client-php/zipball/aacd391672e8a1e2d724c6f0cbcc221e06e7b2a8",
790-
"reference": "aacd391672e8a1e2d724c6f0cbcc221e06e7b2a8",
789+
"url": "https://api.github.com/repos/openprovider/rest-client-php/zipball/fd6217899a7c4c97e2cfd2731e2b74557a5cad2e",
790+
"reference": "fd6217899a7c4c97e2cfd2731e2b74557a5cad2e",
791791
"shasum": ""
792792
},
793793
"require": {
@@ -797,7 +797,7 @@
797797
"guzzlehttp/guzzle": "^7.4",
798798
"php": ">=7.1"
799799
},
800-
"time": "2026-06-01T09:08:04+00:00",
800+
"time": "2026-06-22T11:36:40+00:00",
801801
"type": "library",
802802
"installation-source": "dist",
803803
"autoload": {
@@ -824,7 +824,7 @@
824824
],
825825
"description": "HTTP client for Openprovider API",
826826
"support": {
827-
"source": "https://github.com/openprovider/rest-client-php/tree/v2.2.1-beta",
827+
"source": "https://github.com/openprovider/rest-client-php/tree/v2.2.2-beta",
828828
"issues": "https://github.com/openprovider/rest-client-php/issues"
829829
},
830830
"install-path": "../openprovider/rest-client-php"

‎modules/registrars/openprovider/vendor/composer/installed.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => '150d0de72398bd5a6718e72de03935f7545834d7',
6+
'reference' => '79767d0097ff62de76956aee52bafd01eada068f',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-master',
1515
'version' => 'dev-master',
16-
'reference' => '150d0de72398bd5a6718e72de03935f7545834d7',
16+
'reference' => '79767d0097ff62de76956aee52bafd01eada068f',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -134,9 +134,9 @@
134134
'dev_requirement' => true,
135135
),
136136
'openprovider/rest-client-php' => array(
137-
'pretty_version' => 'v2.2.1-beta',
138-
'version' => '2.2.1.0-beta',
139-
'reference' => 'aacd391672e8a1e2d724c6f0cbcc221e06e7b2a8',
137+
'pretty_version' => 'v2.2.2-beta',
138+
'version' => '2.2.2.0-beta',
139+
'reference' => 'fd6217899a7c4c97e2cfd2731e2b74557a5cad2e',
140140
'type' => 'library',
141141
'install_path' => __DIR__ . '/../openprovider/rest-client-php',
142142
'aliases' => array(),

‎modules/registrars/openprovider/vendor/composer/platform_check.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
2020
}
2121
}
22-
trigger_error(
23-
'Composer detected issues in your platform: ' . implode(' ', $issues),
24-
E_USER_ERROR
22+
throw new \RuntimeException(
23+
'Composer detected issues in your platform: ' . implode(' ', $issues)
2524
);
2625
}

‎modules/registrars/openprovider/vendor/openprovider/rest-client-php/src/Person/Model/CustomerExtensionData.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ class CustomerExtensionData implements ModelInterface, ArrayAccess
110110
'postal_address_region' => 'string',
111111
'postal_address_street' => 'string',
112112
'social_security_number' => 'string',
113+
'sole_proprietorship' => 'string',
113114
'tax_payer_number' => 'string',
114115
'uin' => 'string',
115116
'user_type' => 'string',
@@ -176,6 +177,7 @@ class CustomerExtensionData implements ModelInterface, ArrayAccess
176177
'postal_address_region' => null,
177178
'postal_address_street' => null,
178179
'social_security_number' => null,
180+
'sole_proprietorship' => null,
179181
'tax_payer_number' => null,
180182
'uin' => null,
181183
'user_type' => null,
@@ -263,6 +265,7 @@ public static function openAPIFormats()
263265
'postal_address_region' => 'postal_address_region',
264266
'postal_address_street' => 'postal_address_street',
265267
'social_security_number' => 'social_security_number',
268+
'sole_proprietorship' => 'sole_proprietorship',
266269
'tax_payer_number' => 'tax_payer_number',
267270
'uin' => 'uin',
268271
'user_type' => 'user_type',
@@ -329,6 +332,7 @@ public static function openAPIFormats()
329332
'postal_address_region' => 'setPostalAddressRegion',
330333
'postal_address_street' => 'setPostalAddressStreet',
331334
'social_security_number' => 'setSocialSecurityNumber',
335+
'sole_proprietorship' => 'setSoleProprietorship',
332336
'tax_payer_number' => 'setTaxPayerNumber',
333337
'uin' => 'setUin',
334338
'user_type' => 'setUserType',
@@ -395,6 +399,7 @@ public static function openAPIFormats()
395399
'postal_address_region' => 'getPostalAddressRegion',
396400
'postal_address_street' => 'getPostalAddressStreet',
397401
'social_security_number' => 'getSocialSecurityNumber',
402+
'sole_proprietorship' => 'getSoleProprietorship',
398403
'tax_payer_number' => 'getTaxPayerNumber',
399404
'uin' => 'getUin',
400405
'user_type' => 'getUserType',
@@ -519,6 +524,7 @@ public function __construct(array $data = null)
519524
$this->container['postal_address_region'] = isset($data['postal_address_region']) ? $data['postal_address_region'] : null;
520525
$this->container['postal_address_street'] = isset($data['postal_address_street']) ? $data['postal_address_street'] : null;
521526
$this->container['social_security_number'] = isset($data['social_security_number']) ? $data['social_security_number'] : null;
527+
$this->container['sole_proprietorship'] = isset($data['sole_proprietorship']) ? $data['sole_proprietorship'] : null;
522528
$this->container['tax_payer_number'] = isset($data['tax_payer_number']) ? $data['tax_payer_number'] : null;
523529
$this->container['uin'] = isset($data['uin']) ? $data['uin'] : null;
524530
$this->container['user_type'] = isset($data['user_type']) ? $data['user_type'] : null;
@@ -1905,6 +1911,32 @@ public function setSocialSecurityNumber($social_security_number)
19051911
return $this;
19061912
}
19071913

1914+
/**
1915+
* Gets sole_proprietorship
1916+
*
1917+
* @return string|null
1918+
*/
1919+
#[\ReturnTypeWillChange]
1920+
public function getSoleProprietorship()
1921+
{
1922+
return $this->container['sole_proprietorship'];
1923+
}
1924+
1925+
/**
1926+
* Sets sole_proprietorship
1927+
*
1928+
* @param string|null $sole_proprietorship sole_proprietorship
1929+
*
1930+
* @return $this
1931+
*/
1932+
#[\ReturnTypeWillChange]
1933+
public function setSoleProprietorship($sole_proprietorship)
1934+
{
1935+
$this->container['sole_proprietorship'] = $sole_proprietorship;
1936+
1937+
return $this;
1938+
}
1939+
19081940
/**
19091941
* Gets tax_payer_number
19101942
*

0 commit comments

Comments
 (0)