Skip to content
Permalink
Browse files Browse the repository at this point in the history
Update vendor libs
  • Loading branch information
aheinze committed Feb 22, 2023
1 parent 22290b5 commit 6900162
Show file tree
Hide file tree
Showing 26 changed files with 349 additions and 271 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,7 @@

- Add additional security check editing php files in finder
- Fix base64 encoding data not in latin char range
- Update vendor libs

## 2.3.9 (2023-02-13)

Expand Down
16 changes: 8 additions & 8 deletions lib/vendor/composer/InstalledVersions.php
Expand Up @@ -29,7 +29,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '08c9fa4b32e0071aaa3a41a0b48ad733e6bc91bd',
'reference' => '22290b5db4763f53019046ae79b49974c8769dd5',
'name' => 'cockpit-hq/cockpit',
),
'versions' =>
Expand Down Expand Up @@ -59,7 +59,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '08c9fa4b32e0071aaa3a41a0b48ad733e6bc91bd',
'reference' => '22290b5db4763f53019046ae79b49974c8769dd5',
),
'colinodell/json5' =>
array (
Expand Down Expand Up @@ -153,12 +153,12 @@ class InstalledVersions
),
'league/flysystem' =>
array (
'pretty_version' => '3.12.2',
'version' => '3.12.2.0',
'pretty_version' => '3.12.3',
'version' => '3.12.3.0',
'aliases' =>
array (
),
'reference' => 'f6377c709d2275ed6feaf63e44be7a7162b0e77f',
'reference' => '81e87e74dd5213795c7846d65089712d2dda90ce',
),
'league/mime-type-detection' =>
array (
Expand Down Expand Up @@ -431,12 +431,12 @@ class InstalledVersions
),
'zircote/swagger-php' =>
array (
'pretty_version' => '4.6.1',
'version' => '4.6.1.0',
'pretty_version' => '4.7.0',
'version' => '4.7.0.0',
'aliases' =>
array (
),
'reference' => 'e449670473d7ecaff75dff744e8e9be68a79a44c',
'reference' => 'f2bcbd5aa9d838d28bf5665c70f88eda6adc22cb',
),
),
);
Expand Down
28 changes: 14 additions & 14 deletions lib/vendor/composer/installed.json
Expand Up @@ -943,17 +943,17 @@
},
{
"name": "league/flysystem",
"version": "3.12.2",
"version_normalized": "3.12.2.0",
"version": "3.12.3",
"version_normalized": "3.12.3.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "f6377c709d2275ed6feaf63e44be7a7162b0e77f"
"reference": "81e87e74dd5213795c7846d65089712d2dda90ce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f6377c709d2275ed6feaf63e44be7a7162b0e77f",
"reference": "f6377c709d2275ed6feaf63e44be7a7162b0e77f",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/81e87e74dd5213795c7846d65089712d2dda90ce",
"reference": "81e87e74dd5213795c7846d65089712d2dda90ce",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -983,7 +983,7 @@
"phpunit/phpunit": "^9.5.11",
"sabre/dav": "^4.3.1"
},
"time": "2023-01-19T12:02:19+00:00",
"time": "2023-02-18T15:32:41+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -1017,7 +1017,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.12.2"
"source": "https://github.com/thephpleague/flysystem/tree/3.12.3"
},
"funding": [
{
Expand Down Expand Up @@ -2919,17 +2919,17 @@
},
{
"name": "zircote/swagger-php",
"version": "4.6.1",
"version_normalized": "4.6.1.0",
"version": "4.7.0",
"version_normalized": "4.7.0.0",
"source": {
"type": "git",
"url": "https://github.com/zircote/swagger-php.git",
"reference": "e449670473d7ecaff75dff744e8e9be68a79a44c"
"reference": "f2bcbd5aa9d838d28bf5665c70f88eda6adc22cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zircote/swagger-php/zipball/e449670473d7ecaff75dff744e8e9be68a79a44c",
"reference": "e449670473d7ecaff75dff744e8e9be68a79a44c",
"url": "https://api.github.com/repos/zircote/swagger-php/zipball/f2bcbd5aa9d838d28bf5665c70f88eda6adc22cb",
"reference": "f2bcbd5aa9d838d28bf5665c70f88eda6adc22cb",
"shasum": ""
},
"require": {
Expand All @@ -2948,7 +2948,7 @@
"phpunit/phpunit": ">=8",
"vimeo/psalm": "^4.23"
},
"time": "2023-02-03T01:25:00+00:00",
"time": "2023-02-20T23:05:35+00:00",
"bin": [
"bin/openapi"
],
Expand Down Expand Up @@ -2994,7 +2994,7 @@
],
"support": {
"issues": "https://github.com/zircote/swagger-php/issues",
"source": "https://github.com/zircote/swagger-php/tree/4.6.1"
"source": "https://github.com/zircote/swagger-php/tree/4.7.0"
},
"install-path": "../zircote/swagger-php"
}
Expand Down
16 changes: 8 additions & 8 deletions lib/vendor/composer/installed.php
Expand Up @@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => '08c9fa4b32e0071aaa3a41a0b48ad733e6bc91bd',
'reference' => '22290b5db4763f53019046ae79b49974c8769dd5',
'name' => 'cockpit-hq/cockpit',
),
'versions' =>
Expand Down Expand Up @@ -36,7 +36,7 @@
'aliases' =>
array (
),
'reference' => '08c9fa4b32e0071aaa3a41a0b48ad733e6bc91bd',
'reference' => '22290b5db4763f53019046ae79b49974c8769dd5',
),
'colinodell/json5' =>
array (
Expand Down Expand Up @@ -130,12 +130,12 @@
),
'league/flysystem' =>
array (
'pretty_version' => '3.12.2',
'version' => '3.12.2.0',
'pretty_version' => '3.12.3',
'version' => '3.12.3.0',
'aliases' =>
array (
),
'reference' => 'f6377c709d2275ed6feaf63e44be7a7162b0e77f',
'reference' => '81e87e74dd5213795c7846d65089712d2dda90ce',
),
'league/mime-type-detection' =>
array (
Expand Down Expand Up @@ -408,12 +408,12 @@
),
'zircote/swagger-php' =>
array (
'pretty_version' => '4.6.1',
'version' => '4.6.1.0',
'pretty_version' => '4.7.0',
'version' => '4.7.0.0',
'aliases' =>
array (
),
'reference' => 'e449670473d7ecaff75dff744e8e9be68a79a44c',
'reference' => 'f2bcbd5aa9d838d28bf5665c70f88eda6adc22cb',
),
),
);
83 changes: 83 additions & 0 deletions lib/vendor/zircote/swagger-php/CONTRIBUTING.md
@@ -0,0 +1,83 @@
## Contributing

Contributions of any kind are welcome.

Feel free to submit [Github Issues](https://github.com/zircote/swagger-php/issues)
or [pull requests](https://github.com/zircote/swagger-php/pulls).


## Quick Guide

The documentation site has [some details](https://zircote.github.io/swagger-php/guide/under-the-hood.html#documentation) about internals.

### How-To

* [Fork](https://help.github.com/articles/fork-a-repo/) the repo.
* [Checkout](https://git-scm.com/docs/git-checkout) the branch you want to make changes on.
* Typically, this will be `master`. Note that most of the time, `master` represents the next release of swagger-php, so Pull Requests that break backwards compatibility might be postponed.
* Install dependencies: `composer install`.
* Create a new branch, e.g. `feature-foo` or `bugfix-bar`.
* Make changes.
* If you are adding functionality or fixing a bug - add a test!

Prefer adding new test cases over modifying existing ones.
* Update documentation: `composer docs:gen`.
* Run static analysis using PHPStan/Psalm: `composer analyse`.
* Check if tests pass: `composer test`.
* Fix code style issues: `composer cs`.


## Documentation

The documentation website is build from the [docs](docs/) folder with [vitepress](https://vitepress.vuejs.org).
This process involves converting the existing markdown (`.md`) files into static HTML pages and publishing them.

Some reference content is based on the existing code, so changes to annotations, attributes and processors will require to re-generate those markdown files: `composer docs:gen`.

The actual published content is managed in the [gh-pages](https://github.com/zircote/swagger-php/tree/gh-pages) branch and driven by a [publish action](https://github.com/zircote/swagger-php/actions/workflows/gh-pages.yml).


## Useful commands

### To run both unit tests and linting execute
```shell
composer test
```

### To run static-analysis execute
```shell
composer analyse
```

### Running unit tests only
```shell
./bin/phpunit
```

### Regenerate reference markup docs
```shell
composer docs:gen
```

### Running linting only
```shell
composer lint
```

### To make `php-cs-fixer` fix linting errors
```shell
composer cs
```

### Run dev server for local development of `gh-pages`
```shell
composer docs:dev
```


## Project's Standards

* [PSR-1: Basic Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md)
* [PSR-2: Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
* [PSR-4: Autoloading Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md)
* [PSR-5: PHPDoc (draft)](https://github.com/phpDocumentor/fig-standards/blob/master/proposed/phpdoc.md)
54 changes: 4 additions & 50 deletions lib/vendor/zircote/swagger-php/README.md
Expand Up @@ -31,13 +31,13 @@ Programmatically, the method `Generator::setVersion()` can be used to change the

## Installation (with [Composer](https://getcomposer.org))

```bash
```shell
composer require zircote/swagger-php
```

For cli usage from anywhere install swagger-php globally and make sure to place the `~/.composer/vendor/bin` directory in your PATH so the `openapi` executable can be located by your system.

```bash
```shell
composer global require zircote/swagger-php
```

Expand Down Expand Up @@ -77,7 +77,7 @@ Documentation of how to use the `Generator` class can be found in the [Generator

The `openapi` command line interface can be used to generate the documentation to a static yaml/json file.

```bash
```shell
./vendor/bin/openapi --help
```
Starting with version 4 the default analyser used on the command line is the new `ReflectionAnalyser`.
Expand All @@ -98,13 +98,7 @@ $openapi = $serializer->deserialize($jsonString, 'OpenApi\Annotations\OpenApi');
echo $openapi->toJson();
```

### Usage from [docker](https://docker.com)

Generate the swagger documentation to a static json file.

```
docker run -v "$PWD":/app -it tico/swagger-php --help
```
## [Contributing](CONTRIBUTING.md)

## More on OpenApi & Swagger

Expand All @@ -113,43 +107,3 @@ docker run -v "$PWD":/app -it tico/swagger-php --help
- [OpenApi Documentation](https://swagger.io/docs/)
- [OpenApi Specification](http://swagger.io/specification/)
- [Related projects](docs/related-projects.md)

## Contributing

Feel free to submit [Github Issues](https://github.com/zircote/swagger-php/issues)
or pull requests.

The documentation website is build from the [docs](docs/) folder with [vitepress](https://vitepress.vuejs.org).

Make sure pull requests pass [PHPUnit](https://phpunit.de/)
and [PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) (PSR-2) tests.

### To run both unit tests and linting execute:
```bash
composer test
```

### To run static-analysis execute:
```bash
composer analyse
```

### Running unit tests only:
```bash
./bin/phpunit
```

### Regenerate reference markup docs
```bash
composer docs:gen
```

### Running linting only:
```bash
composer lint
```

### To make `php-cs-fixer` fix linting errors:
```bash
composer cs
```
8 changes: 3 additions & 5 deletions lib/vendor/zircote/swagger-php/composer.json
Expand Up @@ -82,7 +82,7 @@
"testall": "Run all tests (test + testlegacy)",
"analyse": "Run static analysis (phpstan/psalm)",
"spectral": "Run spectral lint over all .yaml files in the Examples folder",
"docs:refgen": "Rebuild the annotations/attributes reference markup files",
"docs:gen": "Rebuild reference documentation",
"docs:dev": "Run dev server for local development of gh-pages",
"docs:build": "Re-build static gh-pages"
},
Expand All @@ -103,11 +103,9 @@
"export XDEBUG_MODE=off && psalm"
],
"spectral": "for ff in `find Examples -name '*.yaml'`; do spectral lint $ff; done",
"docs:refgen": "php tools/refgen.php",
"docs:procgen": "php tools/procgen.php",
"docs:gen": [
"@docs:refgen",
"@docs:procgen"
"@php tools/refgen.php",
"@php tools/procgen.php"
],
"docs:dev": "cd docs && npm run dev",
"docs:build": [
Expand Down
2 changes: 1 addition & 1 deletion lib/vendor/zircote/swagger-php/src/Analysis.php
Expand Up @@ -338,7 +338,7 @@ public function getSchemaForSource(string $fqdn): ?OA\Schema
$definition = $definitions[$fqdn];
if (is_iterable($definition['context']->annotations)) {
foreach (array_reverse($definition['context']->annotations) as $annotation) {
if ($annotation->isRoot(OA\Schema::class) && !$annotation->_context->is('generated')) {
if ($annotation instanceof OA\Schema && $annotation->isRoot(OA\Schema::class) && !$annotation->_context->is('generated')) {
return $annotation;
}
}
Expand Down

0 comments on commit 6900162

Please sign in to comment.