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: 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 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 diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 82baff9..fcabddc 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -1,8 +1,6 @@ -version: "3" - 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: @@ -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"