Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
67 changes: 67 additions & 0 deletions .github/workflows/functional-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Functional Tests (Real DB)

on:
push:
branches: [master]
pull_request:
branches: [master, dev]

jobs:
functional-tests:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- db: mysql
db_image: mysql:8.0
db_port: 3306
db_user: root
db_password: root
db_driver: pdo_mysql
server_version: '8.0'
- db: postgres
db_image: postgres:15
db_port: 5432
db_user: postgres
db_password: postgres
db_driver: pdo_pgsql
server_version: '15'

name: Functional (${{ matrix.db }})

services:
database:
image: ${{ matrix.db_image }}
env:
MYSQL_ROOT_PASSWORD: root
POSTGRES_PASSWORD: postgres
ports:
- ${{ matrix.db_port }}:${{ matrix.db_port }}
options: >-
--health-cmd "${{ matrix.db == 'mysql' && 'mysqladmin ping -h 127.0.0.1' || 'pg_isready' }}"
--health-interval 10s
--health-timeout 5s
--health-retries 5

steps:
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
php-version: '8.4'
extensions: pdo_mysql, pdo_pgsql
coverage: none

- name: Install dependencies
run: composer install --no-ansi --no-interaction --no-progress --prefer-dist

- name: Run functional tests
env:
TENANT_DB_DRIVER: ${{ matrix.db_driver }}
TENANT_DB_HOST: 127.0.0.1
TENANT_DB_PORT: ${{ matrix.db_port }}
TENANT_DB_USER: ${{ matrix.db_user }}
TENANT_DB_PASSWORD: ${{ matrix.db_password }}
TENANT_DB_SERVER_VERSION: ${{ matrix.server_version }}
run: vendor/bin/phpunit --testsuite functional --no-coverage
6 changes: 6 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
<env name="APP_DEBUG" value="1"/>
<env name="DATABASE_URL" value="mysql://root:@localhost:3306/main_db"/>
<env name="TENANT_DB_DRIVER" value=""/>
<env name="TENANT_DB_HOST" value=""/>
<env name="TENANT_DB_PORT" value=""/>
<env name="TENANT_DB_USER" value=""/>
<env name="TENANT_DB_PASSWORD" value=""/>
<env name="TENANT_DB_SERVER_VERSION" value=""/>
</php>
<testsuites>
<testsuite name="unit">
Expand Down
93 changes: 0 additions & 93 deletions src/Command/UpdateSchemaCommand.php

This file was deleted.

8 changes: 0 additions & 8 deletions src/Resources/config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
<service id="Hakam\MultiTenancyBundle\Services\TenantFixtureLoader"
alias="hakam_tenant_fixtures_loader.service" public="false"/>

<service id="Hakam\MultiTenancyBundle\Services\DbService" public="false" autowire="true"/>

<service id="Hakam\MultiTenancyBundle\Adapter\DefaultDsnGenerator" public="false" autowire="true"/>

<service id="Hakam\MultiTenancyBundle\Adapter\Doctrine\TenantDBALConnectionGenerator" public="false" autowire="true" autoconfigure="true"/>
Expand Down Expand Up @@ -77,12 +75,6 @@
<argument type="iterator" index-by="alias" tag="doctrine.fixtures.purger_factory" />
</service>

<service id="Hakam\MultiTenancyBundle\Command\UpdateSchemaCommand">
<tag name="console.command"/>
<argument type="service" id="service_container"/>
<argument type="service" id="event_dispatcher"/>
<argument type="service" id="Doctrine\ORM\EntityManagerInterface"/>
</service>
<service id="tenant_db_interface" class="Hakam\MultiTenancyBundle\Services\TenantDbConfigurationInterface"
public="true"/>

Expand Down
158 changes: 0 additions & 158 deletions src/Services/DbService.php

This file was deleted.

Loading
Loading