Skip to content

Commit

Permalink
Merge pull request #502 from alexislefebvre/2.x-remove-fixtures-loading
Browse files Browse the repository at this point in the history
2.x: Remove fixtures loading
  • Loading branch information
lsmith77 authored Mar 26, 2019
2 parents 76c3fd3 + d627aa9 commit cb1ff65
Show file tree
Hide file tree
Showing 53 changed files with 97 additions and 3,650 deletions.
12 changes: 1 addition & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ cache:
directories:
- $HOME/.composer/cache

services:
- mysql

matrix:
include:
- php: 7.1
Expand All @@ -24,8 +21,6 @@ matrix:
env: SYMFONY_VERSION="3.4.*"
- php: 7.2
env: SYMFONY_VERSION="^4.1"
- php: 7.2
env: EXTRA_PACKAGES="doctrine/phpcr-bundle:^1.3 brianium/paratest:^1.0 doctrine/phpcr-odm:^1.3"
- php: 7.3
env: SYMFONY_VERSION="^4.1"
allow_failures:
Expand All @@ -36,15 +31,10 @@ matrix:
before_install:
- echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi
- if [ "$EXTRA_PACKAGES" != "" ]; then composer require --no-update $EXTRA_PACKAGES; fi

install:
# use "update" instead of "install" since it allows using the "--prefer-lowest" option
- composer update $COMPOSER_FLAGS

# In phpunit.xml.dist, tests annotated with "@group mysql" are excluded,
# revert this.
# Run tests twice to ensure that tests are idempotent even if database caching is enabled
script:
- php ./vendor/bin/phpunit --exclude-group ""
- php ./vendor/bin/phpunit --exclude-group ""
- php ./vendor/bin/phpunit
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 3.0 [TBA]
This new major version introduces a number of breaking changes; see the [upgrade guide](UPGRADE-3.0.md) for more details.

### Removed
* Removed fixtures loading in favor of https://github.com/liip/LiipTestFixturesBundle

## 2.0 [TBA]
This new major version introduces a number of breaking changes; see the [upgrade guide](UPGRADE-2.0.md) for more details.

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
Introduction
============

This Bundle provides base classes for functional tests to assist in setting up
test-databases and loading fixtures. It also provides a DI
aware mock builder for unit tests.
This Bundle provides base classes for functional tests.
It also provides a DI aware mock builder for unit tests.

Documentation
------------

* [Installation](doc/installation.md)
* [Basic usage](doc/basic.md)
* [Command test](doc/command.md)
* [Database test](doc/database.md)
* [Logged client](doc/logged.md)
* [Query counter](doc/query.md)
* [Examples](doc/examples.md)
Expand Down
11 changes: 11 additions & 0 deletions UPGRADE-3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Upgrade guide from 2.x to 3.x

## Needed actions
This is the list of actions that you need to take when upgrading this bundle from the 2.x to the 3.x version:

* Fixtures loading has been moved to a separate bundle named [LiipTestFixturesBundle](LiipTestFixturesBundle)
If you need to load fixtures, follow the [install guide for LiipTestFixturesBundle](LiipTestFixturesBundle installation)
And use `Liip\TestFixturesBundle\Test\FixturesTrait;` in tests classes

[LiipTestFixturesBundle]: https://github.com/liip/LiipTestFixturesBundle
[LiipTestFixturesBundle installation]: https://github.com/liip/LiipTestFixturesBundle/blob/master/doc/installation.md
10 changes: 2 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "liip/functional-test-bundle",
"description": "This bundles provides additional functional test-cases for Symfony applications",
"keywords": ["symfony", "testing", "fixtures"],
"keywords": ["symfony", "testing"],
"type": "symfony-bundle",
"license": "MIT",
"authors": [
Expand All @@ -21,25 +21,19 @@
"symfony/framework-bundle": "^3.4 || ^4.1"
},
"require-dev": {
"doctrine/data-fixtures": "^1.3",
"doctrine/doctrine-bundle": "^1.8",
"doctrine/doctrine-fixtures-bundle": "^3.0.2",
"doctrine/orm": "^2.6",
"jackalope/jackalope-doctrine-dbal": "^1.3",
"phpunit/phpunit": "^6.1 || ^7.0",
"symfony/monolog-bundle": "^3.1",
"symfony/phpunit-bridge": "^3.4 || ^4.1",
"symfony/symfony": "^3.4 || ^4.1",
"theofidry/alice-data-fixtures": "^1.0.1",
"twig/twig": "^2.0"
},
"suggest": {
"brianium/paratest": "Required when using paratest to parallelize tests",
"doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite",
"doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality",
"doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite",
"hautelook/alice-bundle": "Required when using loadFixtureFiles functionality with custom providers",
"theofidry/alice-data-fixtures": "Required when using loadFixtureFiles functionality"
"doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit cb1ff65

Please sign in to comment.