From 8a80bf21498cfcfda63665d83ad5eb928d73f559 Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Wed, 23 Oct 2024 18:34:32 +0400 Subject: [PATCH] Normalize DB passwords in tests; fix style in cs-fix workflow --- .github/workflows/cs-fix.yml | 6 +++++- composer.json | 2 +- composer.lock | 2 +- tests/bootstrap.php | 12 ++++++------ tests/docker-compose.yml | 6 +++--- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cs-fix.yml b/.github/workflows/cs-fix.yml index 0395b27b..db5860c9 100644 --- a/.github/workflows/cs-fix.yml +++ b/.github/workflows/cs-fix.yml @@ -1,4 +1,6 @@ -on: +--- + +on: # yamllint disable-line rule:truthy push: branches: - '*' @@ -10,3 +12,5 @@ jobs: permissions: contents: write uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master + +... diff --git a/composer.json b/composer.json index d814d4f2..18ea43e3 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "infection/infection": "^0.26.10", "mockery/mockery": "^1.5", "phpunit/phpunit": "^9.5", - "spiral/code-style": "~2.2", + "spiral/code-style": "~2.2.0", "spiral/tokenizer": "^2.14 || ^3.0", "vimeo/psalm": "^5.18" }, diff --git a/composer.lock b/composer.lock index 96b1dbd6..d7fb8039 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d13323e81a91551bb18d62f2afb016b4", + "content-hash": "5cd7f7db679e84f1898f43a240241103", "packages": [ { "name": "psr/container", diff --git a/tests/bootstrap.php b/tests/bootstrap.php index cd77bd21..2b734b89 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -24,7 +24,7 @@ host: '127.0.0.1', port: 13306, user: 'root', - password: 'SSpaSS__1', + password: 'YourStrong!Passw0rd', ), queryCache: true ), @@ -34,7 +34,7 @@ host: '127.0.0.1', port: 15432, user: 'postgres', - password: 'SSpaSS__1', + password: 'YourStrong!Passw0rd', ), schema: 'public', queryCache: true, @@ -45,7 +45,7 @@ host: '127.0.0.1', port: 11433, user: 'SA', - password: 'SSpaSS__1' + password: 'YourStrong!Passw0rd' ), queryCache: true ), @@ -60,7 +60,7 @@ host: '127.0.0.1', port: 15432, user: 'postgres', - password: 'SSpaSS__1', + password: 'YourStrong!Passw0rd', ), schema: 'public', driver: Database\Tests\Stub\Driver\PostgresWrapDriver::class, @@ -72,7 +72,7 @@ host: '127.0.0.1', port: 13306, user: 'root', - password: 'root', + password: 'YourStrong!Passw0rd', ), driver: Database\Tests\Stub\Driver\MysqlWrapDriver::class, queryCache: true, @@ -83,7 +83,7 @@ host: '127.0.0.1', port: 11433, user: 'SA', - password: 'SSpaSS__1' + password: 'YourStrong!Passw0rd' ), driver: Database\Tests\Stub\Driver\MSSQLWrapDriver::class, queryCache: true, diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index a66519ce..58f3ad7b 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - "11433:1433" environment: - SA_PASSWORD: "SSpaSS__1" + SA_PASSWORD: "YourStrong!Passw0rd" ACCEPT_EULA: "Y" mysql_latest: @@ -17,7 +17,7 @@ services: - "13306:3306" environment: MYSQL_DATABASE: "spiral" - MYSQL_ROOT_PASSWORD: "SSpaSS__1" + MYSQL_ROOT_PASSWORD: "YourStrong!Passw0rd" MYSQL_ROOT_HOST: "%" postgres: @@ -27,6 +27,6 @@ services: environment: POSTGRES_DB: "spiral" POSTGRES_USER: "postgres" - POSTGRES_PASSWORD: "SSpaSS__1" + POSTGRES_PASSWORD: "YourStrong!Passw0rd" ...