From 89dc094bdf22e02985b16826af496495d9e2c1cf Mon Sep 17 00:00:00 2001 From: gam6itko Date: Thu, 8 Aug 2024 11:46:41 +0300 Subject: [PATCH 1/5] [psalm level 4 fix] MapperEvent remove @internal annotation --- src/Event/MapperEvent.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Event/MapperEvent.php b/src/Event/MapperEvent.php index 7200860..9510af2 100644 --- a/src/Event/MapperEvent.php +++ b/src/Event/MapperEvent.php @@ -10,8 +10,6 @@ use Cycle\ORM\Select\SourceInterface; /** - * @internal - * * Don't listen to this event */ abstract class MapperEvent From 868aa6d9abd71a262f1b8ef61e2876b273ae6ad8 Mon Sep 17 00:00:00 2001 From: gam6itko Date: Thu, 8 Aug 2024 12:00:57 +0300 Subject: [PATCH 2/5] docker compose --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 454e516..83536a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - name: Setup DB services run: | cd tests - docker-compose up -d + docker compose up -d cd .. - name: Setup PHP ${{ matrix.php-version }} uses: shivammathur/setup-php@v2 From 0a932e55f474cfb665df31d591437c6ff43dda95 Mon Sep 17 00:00:00 2001 From: gam6itko Date: Thu, 8 Aug 2024 15:11:21 +0300 Subject: [PATCH 3/5] mysql 8 --- tests/docker-compose.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 82baff9..1ec4a64 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - services: sqlserver: image: mcr.microsoft.com/mssql/server:2019-latest @@ -10,8 +8,7 @@ services: ACCEPT_EULA: "Y" mysql_latest: - image: mysql:latest - restart: always + image: mysql:8.0 command: --default-authentication-plugin=mysql_native_password ports: - "13306:3306" @@ -22,10 +19,9 @@ services: postgres: image: postgres:12 - restart: always ports: - "15432:5432" environment: POSTGRES_DB: "spiral" POSTGRES_USER: "postgres" - POSTGRES_PASSWORD: "postgres" \ No newline at end of file + POSTGRES_PASSWORD: "postgres" From 12c8d580cdd5c97d90422dfd04e879021130171f Mon Sep 17 00:00:00 2001 From: gam6itko Date: Thu, 8 Aug 2024 15:18:23 +0300 Subject: [PATCH 4/5] try to fix mssql --- tests/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 1ec4a64..fcabddc 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -1,6 +1,6 @@ services: sqlserver: - image: mcr.microsoft.com/mssql/server:2019-latest + image: mcr.microsoft.com/mssql/server:2019-CU25-ubuntu-20.04 ports: - "11433:1433" environment: From ceb4db62457ad3fcba80b9df1e22b9e8a262535f Mon Sep 17 00:00:00 2001 From: gam6itko Date: Thu, 8 Aug 2024 15:52:34 +0300 Subject: [PATCH 5/5] try to fix mssql --- .github/workflows/ci-mssql.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml index b0f24a6..8ce0c28 100644 --- a/.github/workflows/ci-mssql.yml +++ b/.github/workflows/ci-mssql.yml @@ -24,16 +24,16 @@ jobs: mssql: 'server:2017-latest' - php: '8.0' extensions: pdo, pdo_sqlsrv - mssql: 'server:2019-latest' + mssql: 'server:2019-CU25-ubuntu-20.04' - php: '8.1' extensions: pdo, pdo_sqlsrv - mssql: 'server:2019-latest' + mssql: 'server:2019-CU25-ubuntu-20.04' - php: '8.2' extensions: pdo, pdo_sqlsrv - mssql: 'server:2019-latest' + mssql: 'server:2019-CU25-ubuntu-20.04' - php: '8.3' extensions: pdo, pdo_sqlsrv - mssql: 'server:2019-latest' + mssql: 'server:2019-CU25-ubuntu-20.04' services: mssql: