Skip to content

Remove @internal from MapperEvent #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roxblnfk merged 5 commits into from
Aug 9, 2024
Merged

Remove @internal from MapperEvent #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89dc094
[psalm level 4 fix] MapperEvent remove @internal annotation
gam6itko Aug 8, 2024
868aa6d
docker compose
gam6itko Aug 8, 2024
0a932e5
mysql 8
gam6itko Aug 8, 2024
12c8d58
try to fix mssql
gam6itko Aug 8, 2024
ceb4db6
try to fix mssql
gam6itko Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-mssql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/Event/MapperEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
use Cycle\ORM\Select\SourceInterface;

/**
* @internal
*
* Don't listen to this event
*/
abstract class MapperEvent
Expand Down
10 changes: 3 additions & 7 deletions tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
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:
SA_PASSWORD: "SSpaSS__1"
ACCEPT_EULA: "Y"

mysql_latest:
image: mysql:latest
restart: always
image: mysql:8.0
command: --default-authentication-plugin=mysql_native_password
ports:
- "13306:3306"
Expand All @@ -22,10 +19,9 @@ services:

postgres:
image: postgres:12
restart: always
ports:
- "15432:5432"
environment:
POSTGRES_DB: "spiral"
POSTGRES_USER: "postgres"
POSTGRES_PASSWORD: "postgres"
POSTGRES_PASSWORD: "postgres"