From 45bea291f1f7324572c6983add71750d5f14901b Mon Sep 17 00:00:00 2001
From: Nicolas Mugnier <6680190+NicolasMugnier@users.noreply.github.com>
Date: Tue, 25 Nov 2025 15:49:48 +0100
Subject: [PATCH 1/5] wip
---
.idea/php.xml | 18 +++++++++++++++---
composer.json | 4 ++--
.../Loader/OpenApiDefinitionLoader.php | 10 ++++------
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/.idea/php.xml b/.idea/php.xml
index 631724e..3e9102e 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -154,7 +154,6 @@
-
@@ -190,8 +189,6 @@
-
-
@@ -236,6 +233,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/composer.json b/composer.json
index cd14edf..6f987b0 100644
--- a/composer.json
+++ b/composer.json
@@ -53,16 +53,16 @@
"firebase/php-jwt": "^6.0.0",
"guzzlehttp/promises": "^1.4.0",
"illuminate/collections": "^8.0",
+ "league/openapi-psr7-validator": "^0.18",
"monolog/monolog": "^1.25.1 || ^2.8.0 || ^3.0.0",
"myclabs/deep-copy": "^1.11",
"nesbot/carbon": "^2.48",
"nyholm/psr7": "1.*",
- "league/openapi-psr7-validator": "^0.18",
"openclassrooms/openapi-psr7-validator": "dev-master",
"opis/json-schema": "^2.3",
"php-http/httplug": "^2.2",
"phpdocumentor/reflection-docblock": "^5.3",
- "phpstan/phpdoc-parser": "^1.2",
+ "phpstan/phpdoc-parser": "^2.3",
"phpunit/phpunit": "^9.5",
"psr/http-client": "^1.0",
"psr/http-message": "1.*",
diff --git a/src/Definition/Loader/OpenApiDefinitionLoader.php b/src/Definition/Loader/OpenApiDefinitionLoader.php
index 8aff352..c73a01e 100644
--- a/src/Definition/Loader/OpenApiDefinitionLoader.php
+++ b/src/Definition/Loader/OpenApiDefinitionLoader.php
@@ -42,7 +42,7 @@
use cebe\openapi\spec\PathItem;
use cebe\openapi\spec\RequestBody;
use cebe\openapi\spec\Schema;
-use cebe\openapi\spec\SecurityRequirement;
+use cebe\openapi\spec\SecurityRequirements;
use cebe\openapi\spec\SecurityScheme;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
@@ -117,7 +117,7 @@ private function getOperations(array $paths, array $securitySchemes, array $filt
/** @var RequestBody $requestBody */
$requestBody = $operation->requestBody;
$responses = $operation->responses;
- $requirements = $this->getSecurityRequirementsScopes($operation->security ?? []);
+ $requirements = $this->getSecurityRequirementsScopes($operation->security ?? new SecurityRequirements([]));
$operations->add(
Operation::create(
@@ -174,14 +174,12 @@ private function getTags(array $tags): Tags
}
/**
- * @param SecurityRequirement[] $securityRequirements
- *
* @return array
*/
- private function getSecurityRequirementsScopes(array $securityRequirements): array
+ private function getSecurityRequirementsScopes(SecurityRequirements $securityRequirements): array
{
$requirements = [];
- foreach ($securityRequirements as $requirement) {
+ foreach ($securityRequirements->getRequirements() as $requirement) {
/**
* @var string $name
* @var string[] $data
From 80df533bf8f3a0a55c746b7a5b03fdddb3e24528 Mon Sep 17 00:00:00 2001
From: Nicolas Mugnier <6680190+NicolasMugnier@users.noreply.github.com>
Date: Tue, 25 Nov 2025 16:14:20 +0100
Subject: [PATCH 2/5] wip
---
.idea/php.xml | 312 ++++++++----------
.../Loader/OpenApiDefinitionLoader.php | 10 +-
2 files changed, 152 insertions(+), 170 deletions(-)
diff --git a/.idea/php.xml b/.idea/php.xml
index 3e9102e..d933fa7 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -32,163 +32,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -233,21 +76,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Definition/Loader/OpenApiDefinitionLoader.php b/src/Definition/Loader/OpenApiDefinitionLoader.php
index c73a01e..8aff352 100644
--- a/src/Definition/Loader/OpenApiDefinitionLoader.php
+++ b/src/Definition/Loader/OpenApiDefinitionLoader.php
@@ -42,7 +42,7 @@
use cebe\openapi\spec\PathItem;
use cebe\openapi\spec\RequestBody;
use cebe\openapi\spec\Schema;
-use cebe\openapi\spec\SecurityRequirements;
+use cebe\openapi\spec\SecurityRequirement;
use cebe\openapi\spec\SecurityScheme;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
@@ -117,7 +117,7 @@ private function getOperations(array $paths, array $securitySchemes, array $filt
/** @var RequestBody $requestBody */
$requestBody = $operation->requestBody;
$responses = $operation->responses;
- $requirements = $this->getSecurityRequirementsScopes($operation->security ?? new SecurityRequirements([]));
+ $requirements = $this->getSecurityRequirementsScopes($operation->security ?? []);
$operations->add(
Operation::create(
@@ -174,12 +174,14 @@ private function getTags(array $tags): Tags
}
/**
+ * @param SecurityRequirement[] $securityRequirements
+ *
* @return array
*/
- private function getSecurityRequirementsScopes(SecurityRequirements $securityRequirements): array
+ private function getSecurityRequirementsScopes(array $securityRequirements): array
{
$requirements = [];
- foreach ($securityRequirements->getRequirements() as $requirement) {
+ foreach ($securityRequirements as $requirement) {
/**
* @var string $name
* @var string[] $data
From eb728a35e8e7aba986112562c92d0e8a2de4664a Mon Sep 17 00:00:00 2001
From: Nicolas Mugnier <6680190+NicolasMugnier@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:06:33 +0100
Subject: [PATCH 3/5] chore(illuminate-collection): bump to version ^10.0
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 6f987b0..4128d23 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
"fakerphp/faker": "^1.9",
"firebase/php-jwt": "^6.0.0",
"guzzlehttp/promises": "^1.4.0",
- "illuminate/collections": "^8.0",
+ "illuminate/collections": "^10.0",
"league/openapi-psr7-validator": "^0.18",
"monolog/monolog": "^1.25.1 || ^2.8.0 || ^3.0.0",
"myclabs/deep-copy": "^1.11",
From 6cfdd3880d2d780707f881ed35f603c7164dbac0 Mon Sep 17 00:00:00 2001
From: Nicolas Mugnier <6680190+NicolasMugnier@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:14:22 +0100
Subject: [PATCH 4/5] wip
---
.idea/php.xml | 1 +
src/Definition/Loader/OpenApiDefinitionLoader.php | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.idea/php.xml b/.idea/php.xml
index d933fa7..f085a6d 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -228,6 +228,7 @@
+
diff --git a/src/Definition/Loader/OpenApiDefinitionLoader.php b/src/Definition/Loader/OpenApiDefinitionLoader.php
index 8aff352..525368a 100644
--- a/src/Definition/Loader/OpenApiDefinitionLoader.php
+++ b/src/Definition/Loader/OpenApiDefinitionLoader.php
@@ -43,6 +43,7 @@
use cebe\openapi\spec\RequestBody;
use cebe\openapi\spec\Schema;
use cebe\openapi\spec\SecurityRequirement;
+use cebe\openapi\spec\SecurityRequirements;
use cebe\openapi\spec\SecurityScheme;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
@@ -117,7 +118,7 @@ private function getOperations(array $paths, array $securitySchemes, array $filt
/** @var RequestBody $requestBody */
$requestBody = $operation->requestBody;
$responses = $operation->responses;
- $requirements = $this->getSecurityRequirementsScopes($operation->security ?? []);
+ $requirements = $this->getSecurityRequirementsScopes($operation->security ?? new SecurityRequirements([]));
$operations->add(
Operation::create(
@@ -174,14 +175,12 @@ private function getTags(array $tags): Tags
}
/**
- * @param SecurityRequirement[] $securityRequirements
- *
* @return array
*/
- private function getSecurityRequirementsScopes(array $securityRequirements): array
+ private function getSecurityRequirementsScopes(SecurityRequirements $securityRequirements): array
{
$requirements = [];
- foreach ($securityRequirements as $requirement) {
+ foreach ($securityRequirements->getRequirements() as $requirement) {
/**
* @var string $name
* @var string[] $data
From 929fcd1a3c3d107dc50a3a65b2ceb157457b303e Mon Sep 17 00:00:00 2001
From: Nicolas Mugnier <6680190+NicolasMugnier@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:23:21 +0100
Subject: [PATCH 5/5] wip
---
composer.json | 4 ----
1 file changed, 4 deletions(-)
diff --git a/composer.json b/composer.json
index 4128d23..3356f3b 100644
--- a/composer.json
+++ b/composer.json
@@ -100,10 +100,6 @@
"veewee/composer-run-parallel": "^1.1"
},
"repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/sidux/collections"
- },
{
"type": "vcs",
"url": "https://github.com/OpenClassrooms/openapi-psr7-validator"