From 9a03850828c8ac0fd457ec5f3005d7655605dc3d Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Sun, 16 Aug 2020 19:13:50 +0300 Subject: [PATCH] [php] Exclude composer.lock in root gitignore (#7224) * Add samples composer.lock to root .gitignore composer.lock may produce CI errors when you need to test build against different PHP versions. However users most likely want to commit this file, so I think it's better to exclude it only in root .gitignore. * Commit composer.lock in default PHP templates * Refresh samples --- .gitignore | 7 +++++++ .../src/main/resources/php-laravel/gitignore | 2 +- .../src/main/resources/php-slim4-server/gitignore | 2 +- .../src/main/resources/php-symfony/gitignore | 2 +- modules/openapi-generator/src/main/resources/php/gitignore | 2 +- samples/client/petstore/php/OpenAPIClient-php/.gitignore | 2 +- samples/server/petstore/php-laravel/lib/.gitignore | 2 +- samples/server/petstore/php-slim4/.gitignore | 2 +- .../petstore/php-symfony/SymfonyBundle-php/.gitignore | 2 +- 9 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 14b5a330802..e24cf380cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -174,7 +174,14 @@ samples/client/petstore/python-asyncio/.pytest_cache/ samples/client/petstore/python-tornado/.venv/ # PHP +samples/client/petstore/php/OpenAPIClient-php/composer.lock +samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock +samples/openapi3/server/petstore/php-ze-ph/composer.lock +samples/server/petstore/php-laravel/lib/composer.lock samples/server/petstore/php-lumen/lib/composer.lock +samples/server/petstore/php-slim4/composer.lock +samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock +samples/server/petstore/php-ze-ph/composer.lock # ts samples/client/petstore/typescript-angular2/npm/npm-debug.log diff --git a/modules/openapi-generator/src/main/resources/php-laravel/gitignore b/modules/openapi-generator/src/main/resources/php-laravel/gitignore index 932493f1124..dbf0a436db5 100644 --- a/modules/openapi-generator/src/main/resources/php-laravel/gitignore +++ b/modules/openapi-generator/src/main/resources/php-laravel/gitignore @@ -13,4 +13,4 @@ yarn-error.log # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore b/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore index 2424ad0dc92..f55680b5277 100644 --- a/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore +++ b/modules/openapi-generator/src/main/resources/php-slim4-server/gitignore @@ -5,7 +5,7 @@ composer.phar # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock # phplint tool creates cache file which is not necessary in a codebase /.phplint-cache diff --git a/modules/openapi-generator/src/main/resources/php-symfony/gitignore b/modules/openapi-generator/src/main/resources/php-symfony/gitignore index 0bac519d3e8..3f90ef253e2 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/gitignore +++ b/modules/openapi-generator/src/main/resources/php-symfony/gitignore @@ -31,7 +31,7 @@ # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock # Assets and user uploads /web/bundles/ diff --git a/modules/openapi-generator/src/main/resources/php/gitignore b/modules/openapi-generator/src/main/resources/php/gitignore index e2316dd486c..92f7fdeff58 100644 --- a/modules/openapi-generator/src/main/resources/php/gitignore +++ b/modules/openapi-generator/src/main/resources/php/gitignore @@ -5,7 +5,7 @@ composer.phar # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock # php-cs-fixer cache .php_cs.cache diff --git a/samples/client/petstore/php/OpenAPIClient-php/.gitignore b/samples/client/petstore/php/OpenAPIClient-php/.gitignore index e2316dd486c..92f7fdeff58 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/.gitignore +++ b/samples/client/petstore/php/OpenAPIClient-php/.gitignore @@ -5,7 +5,7 @@ composer.phar # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock # php-cs-fixer cache .php_cs.cache diff --git a/samples/server/petstore/php-laravel/lib/.gitignore b/samples/server/petstore/php-laravel/lib/.gitignore index 932493f1124..dbf0a436db5 100644 --- a/samples/server/petstore/php-laravel/lib/.gitignore +++ b/samples/server/petstore/php-laravel/lib/.gitignore @@ -13,4 +13,4 @@ yarn-error.log # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock diff --git a/samples/server/petstore/php-slim4/.gitignore b/samples/server/petstore/php-slim4/.gitignore index 2424ad0dc92..f55680b5277 100644 --- a/samples/server/petstore/php-slim4/.gitignore +++ b/samples/server/petstore/php-slim4/.gitignore @@ -5,7 +5,7 @@ composer.phar # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock # phplint tool creates cache file which is not necessary in a codebase /.phplint-cache diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore index 0bac519d3e8..3f90ef253e2 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore @@ -31,7 +31,7 @@ # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -composer.lock +# composer.lock # Assets and user uploads /web/bundles/