Skip to content

Commit ee6b7af

Browse files
authored
Merge pull request #135 from jolicode/update-jane-v7
Update Jane to v7
2 parents e776949 + 1a6c8a6 commit ee6b7af

File tree

452 files changed

+4484
-459
lines changed

Some content is hidden

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

452 files changed

+4484
-459
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
* Drop support for PHP <7.4
66
* Add support for PHP 8.1
7+
* Upgrade Jane from 6.3 to v7.1, add compatibility with Symfony v6
78

89
## 4.3.0 (2021-05-31)
910

@@ -17,7 +18,7 @@
1718

1819
## 4.1.1 (2021-03-16)
1920

20-
* Upgrade Jane to from 6.3.3 to v6.3.5, fix an error with very long string / payload
21+
* Upgrade Jane from 6.3.3 to v6.3.5, fix an error with very long string / payload
2122

2223
## 4.1.0 (2021-02-26)
2324

composer.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,21 @@
2727
},
2828
"require": {
2929
"php": ">=7.4",
30-
"jane-php/open-api-runtime": "~6.3.0",
30+
"jane-php/open-api-runtime": "~7.1",
3131
"psr/http-client-implementation": "*",
3232
"php-http/client-common": "^1.9 || ^2.0",
3333
"php-http/discovery": "^1.7",
3434
"php-http/multipart-stream-builder": "^1.1"
3535
},
3636
"require-dev": {
37-
"jane-php/open-api-2": "~6.3.0",
38-
"symfony/http-client": "^4.3.3 || ^5.1",
37+
"jane-php/open-api-2": "~7.1.5",
38+
"symfony/http-client": "^5.4 || ^6.0",
3939
"nyholm/psr7": "^1.2",
4040
"friendsofphp/php-cs-fixer": "^3.2.2",
41-
"symfony/phpunit-bridge": "^5.2",
41+
"symfony/phpunit-bridge": "^5.4 || ^6.0",
4242
"opis/json-schema": "^1.0",
43-
"symfony/console": "^5.1",
44-
"symfony/contracts": "^2.1",
45-
"symfony/process": "^5.1",
46-
"symfony/string": "^5.1"
43+
"symfony/console": "^5.4 || ^6.0",
44+
"symfony/process": "^5.4 || ^6.0"
4745
},
4846
"conflict": {
4947
"php-http/httplug": "< 2.0"

generated/Normalizer/AdminAppsApprovePostResponse200Normalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsApprovePostResponse200Normalizer implements DenormalizerInterface
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovePostResponse200' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovePostResponse200' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsApprovePostResponsedefaultNormalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsApprovePostResponsedefaultNormalizer implements DenormalizerInter
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovePostResponsedefault' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovePostResponsedefault' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsApprovedListGetResponse200Normalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsApprovedListGetResponse200Normalizer implements DenormalizerInter
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovedListGetResponse200' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovedListGetResponse200' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsApprovedListGetResponsedefaultNormalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsApprovedListGetResponsedefaultNormalizer implements DenormalizerI
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovedListGetResponsedefault' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsApprovedListGetResponsedefault' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsRequestsListGetResponse200Normalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsRequestsListGetResponse200Normalizer implements DenormalizerInter
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsRequestsListGetResponse200' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsRequestsListGetResponse200' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsRequestsListGetResponsedefaultNormalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsRequestsListGetResponsedefaultNormalizer implements DenormalizerI
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsRequestsListGetResponsedefault' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsRequestsListGetResponsedefault' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsRestrictPostResponse200Normalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsRestrictPostResponse200Normalizer implements DenormalizerInterfac
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsRestrictPostResponse200' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsRestrictPostResponse200' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsRestrictPostResponsedefaultNormalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsRestrictPostResponsedefaultNormalizer implements DenormalizerInte
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsRestrictPostResponsedefault' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsRestrictPostResponsedefault' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

generated/Normalizer/AdminAppsRestrictedListGetResponse200Normalizer.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace JoliCode\Slack\Api\Normalizer;
1515

16-
use Jane\JsonSchemaRuntime\Reference;
16+
use Jane\Component\JsonSchemaRuntime\Reference;
1717
use JoliCode\Slack\Api\Runtime\Normalizer\CheckArray;
1818
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
1919
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -28,6 +28,9 @@ class AdminAppsRestrictedListGetResponse200Normalizer implements DenormalizerInt
2828
use DenormalizerAwareTrait;
2929
use NormalizerAwareTrait;
3030

31+
/**
32+
* @return bool
33+
*/
3134
public function supportsDenormalization($data, $type, $format = null)
3235
{
3336
return 'JoliCode\\Slack\\Api\\Model\\AdminAppsRestrictedListGetResponse200' === $type;
@@ -38,6 +41,9 @@ public function supportsNormalization($data, $format = null)
3841
return \is_object($data) && 'JoliCode\\Slack\\Api\\Model\\AdminAppsRestrictedListGetResponse200' === \get_class($data);
3942
}
4043

44+
/**
45+
* @return mixed
46+
*/
4147
public function denormalize($data, $class, $format = null, array $context = [])
4248
{
4349
if (isset($data['$ref'])) {
@@ -65,6 +71,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
6571
return $object;
6672
}
6773

74+
/**
75+
* @return array|string|int|float|bool|\ArrayObject|null
76+
*/
6877
public function normalize($object, $format = null, array $context = [])
6978
{
7079
$data = [];

0 commit comments

Comments
 (0)