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
29 changes: 2 additions & 27 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ jobs:
- test_eloquent_bridge
- test_symfony_bridge
- test_symfony_doctrine_bridge
- test_symfony_doctrine_bridge_proxy_manager
- test_symfony_eloquent_bridge
- test_symfony_eloquent_bridge_proxy_manager
symfony-versions:
- false
- '7.4.*'
Expand Down Expand Up @@ -169,39 +167,16 @@ jobs:
composer-options: "${{ matrix.composer-flags }}"
working-directory: vendor-bin/eloquent

- name: Install ProxyManager Composer bin dependencies
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # 3.1.1
if: "matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager'"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ matrix.composer-flags }}"
working-directory: vendor-bin/proxy-manager
- name: Repeat "Install ProxyManager Composer bin dependencies"
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # 3.1.1
if: "matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager'"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ matrix.composer-flags }}"
working-directory: vendor-bin/proxy-manager

- name: Install Symfony for ProxyManager Composer bin dependencies
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # 3.1.1
if: "matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager'"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ matrix.composer-flags }}"
working-directory: vendor-bin/proxy-manager

- name: Install Symfony Composer bin dependencies
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # 3.1.1
if: "matrix.make-test == 'test_symfony_bridge' || matrix.make-test == 'test_symfony_doctrine_bridge' || matrix.make-test == 'test_symfony_eloquent_bridge' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager' || matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager'"
if: "matrix.make-test == 'test_symfony_bridge' || matrix.make-test == 'test_symfony_doctrine_bridge' || matrix.make-test == 'test_symfony_eloquent_bridge'"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ matrix.composer-flags }}"
working-directory: vendor-bin/symfony
- name: Repeat "Install Symfony Composer bin dependencies"
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # 3.1.1
if: "matrix.make-test == 'test_symfony_bridge' || matrix.make-test == 'test_symfony_doctrine_bridge' || matrix.make-test == 'test_symfony_eloquent_bridge' || matrix.make-test == 'test_symfony_eloquent_bridge_proxy_manager' || matrix.make-test == 'test_symfony_doctrine_bridge_proxy_manager'"
if: "matrix.make-test == 'test_symfony_bridge' || matrix.make-test == 'test_symfony_doctrine_bridge' || matrix.make-test == 'test_symfony_eloquent_bridge'"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ matrix.composer-flags }}"
Expand Down
38 changes: 1 addition & 37 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ test: test_core \
test_eloquent_bridge \
test_symfony_bridge \
test_symfony_doctrine_bridge \
test_symfony_doctrine_bridge_proxy_manager \
test_symfony_eloquent_bridge \
test_symfony_eloquent_bridge_proxy_manager
test_symfony_eloquent_bridge

.PHONY: test_core
test_core: ## Run the tests for the core library
Expand Down Expand Up @@ -176,32 +174,6 @@ test_symfony_eloquent_bridge: vendor/bamarni \

vendor-bin/symfony/bin/phpunit -c phpunit_symfony_eloquent.xml.dist

.PHONY: test_symfony_doctrine_bridge_proxy_manager
test_symfony_doctrine_bridge_proxy_manager: ## Run the tests for the Symfony Doctrine bridge with Proxy Manager
test_symfony_doctrine_bridge_proxy_manager: vendor/bamarni \
bin/console \
vendor-bin/proxy-manager/vendor/phpunit
$(MAKE) remove_sf_cache
$(MAKE) refresh_mysql_db
$(MAKE) refresh_mongodb_db
$(MAKE) refresh_phpcr

php bin/console doctrine:schema:create --kernel=DoctrineKernel

vendor-bin/proxy-manager/bin/phpunit -c phpunit_symfony_proxy_manager_with_doctrine.xml.dist

.PHONY: test_symfony_eloquent_bridge_proxy_manager
test_symfony_eloquent_bridge_proxy_manager: ## Run the tests for the Symfony Eloquent bridge with Proxy Manager
test_symfony_eloquent_bridge_proxy_manager: vendor/bamarni \
bin/console \
vendor-bin/proxy-manager/vendor/phpunit
$(MAKE) remove_sf_cache
$(MAKE) refresh_mysql_db

php bin/console eloquent:migrate:install --kernel=EloquentKernel

vendor-bin/proxy-manager/bin/phpunit -c phpunit_symfony_proxy_manager_with_eloquent.xml.dist


#
# Rules from files
Expand Down Expand Up @@ -279,14 +251,6 @@ bin/console: vendor-bin/symfony/composer.lock
touch $@


vendor-bin/proxy-manager/composer.lock: vendor-bin/proxy-manager/composer.json
@echo vendor-bin/proxy-manager/composer.lock is not up to date.

vendor-bin/proxy-manager/vendor/phpunit: vendor-bin/proxy-manager/composer.lock
composer bin proxy-manager update $(COMPOSER_FLAGS) || true
composer bin proxy-manager update $(COMPOSER_FLAGS)
touch $@

.PHONY: rector_install
rector_install: $(RECTOR_BIN)

Expand Down
2 changes: 0 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
"jackalope/jackalope-doctrine-dbal": "To use Doctrine with the PHPCR flavour",

"illuminate/database": "To use Eloquent",

"ocramius/proxy-manager": "To avoid database connection on kernel boot"
},

"autoload": {
Expand Down
33 changes: 0 additions & 33 deletions phpunit_symfony_proxy_manager_with_doctrine.xml.dist

This file was deleted.

33 changes: 0 additions & 33 deletions phpunit_symfony_proxy_manager_with_eloquent.xml.dist

This file was deleted.

41 changes: 0 additions & 41 deletions vendor-bin/proxy-manager/composer.json

This file was deleted.

Loading