diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index de2747b..e9bf1b5 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -22,7 +22,7 @@ jobs: run: git clone --depth 1 https://github.com/OXID-eSales/docker-eshop-sdk.git --branch master --single-branch . - name: Clone Migration Wrapper (on default branch - ${{ github.event.repository.default_branch }}) - run: git clone --branch b-7.1.x-odmw-phpunit10-OXDEV-7518 https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper.git source/$INSTALL_DIR + run: git clone --branch ${{ github.ref_name }} https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper.git source/$INSTALL_DIR - name: Prepare container configuration run: | @@ -52,7 +52,7 @@ jobs: composer config allow-plugins.oxid-esales/oxideshop-unified-namespace-generator true docker-compose exec -T -w /var/www/$INSTALL_DIR php \ composer config allow-plugins.oxid-esales/oxideshop-composer-plugin true - docker-compose exec -T -w /var/www/$INSTALL_DIR -e COMPOSER_ROOT_VERSION=dev-b-7.1.x-odmw-phpunit10-OXDEV-7518 php \ + docker-compose exec -T -w /var/www/$INSTALL_DIR php \ composer install --no-interaction - name: Install Shop diff --git a/CHANGELOG-5.x.md b/CHANGELOG-5.x.md new file mode 100644 index 0000000..b802fb1 --- /dev/null +++ b/CHANGELOG-5.x.md @@ -0,0 +1,29 @@ +# Change Log for OXID eShop doctrine migration integration + +## v5.1.0 - unreleased + +### Added +- PHPUnit v10 support + +### Removed +- PHPUnit v9 support + +## v5.1.0 - 2023-04-20 + +### Fixed +- Executing Doctrine commands with migration version argument +- Doctrine Migrations help output is not compatible with the custom Suite_Type argument + +### Changed +- License updated + +### Removed +- Dependency to webmozart/path-util + +## v5.0.0 - 2022-10-06 + +### Changed +- Switched to `doctrine/migrations` v3 + +### Removed +- PHP v7 support diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 3472694..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,100 +0,0 @@ -# Change Log for OXID eShop doctrine migration integration - -## v5.1.0 - unreleased - -### Added -- PHPUnit v10 support - -### Removed -- PHPUnit v9 support - -## v5.1.0 - 2023-04-20 - -### Fixed -- Executing Doctrine commands with migration version argument -- Doctrine Migrations help output is not compatible with the custom Suite_Type argument - -### Changed -- License updated - -### Removed -- Dependency to webmozart/path-util - -## v5.0.0 - 2022-10-06 - -### Changed -- Switched to `doctrine/migrations` v3 - -### Removed -- PHP v7 support - -## v4.1.0 - 2022-02-25 - -### Added -- Enable doctrine flags for CLI usage - -## v4.0.0 - 2021-07-06 - -### Changed -- Update symfony components to version 5 - -## v3.4.0 - Unreleased - -### Fixed -- Remove useless dependency on composer/package-versions-deprecated [PR-7](https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper/pull/7) - -## v3.3.0 - 2021-11-26 - -### Removed -- Support for PHP 7.3 - -### Fixed -- Update tests - -## v3.2.0 - 2021-04-12 - -### Added -- Support PHP 8.0 - -### Removed -- Support PHP 7.1 and 7.2 - -## v3.1.1 - 2020-11-12 - -### Fixed -- Ensure Composer V2 compatibility for PHP 7.1-7.3 via composer/package-versions-deprecated - -## v3.1.0 - 2020-07-03 - -### Added - -- Add module migrations - -## v3.0.0 - 2020-04-24 - -### Changed -- Minimum PHP version to v7.1 -- Minimum PHPUnit version to v6.* - -### Fixed -- Made composer.json compatible with composer v2 -- Running command without arguments - -## v2.1.3 - 2019-01-18 - -### Changed -- Exclude non-essential files from dist package [PR-5](https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper/pull/5) -- Allow different output types as output handler [PR-4](https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper/pull/4) - -## v2.1.2 - 2018-03-29 - -### Fixed -- Database port is used now when creating database connection for migrations. - -## v2.1.1 - 2018-03-12 - -### Changed -- Pdo_mysql is used instead of mysqli as a database driver. - -### Fixed -- No more illegal mix of collation errors if collation_server was configured to something else than utf8_general_ci. [Bug 6782](https://bugs.oxid-esales.com/view.php?id=6782) diff --git a/README.rst b/README.rst index d90efbc..d795bbc 100755 --- a/README.rst +++ b/README.rst @@ -6,15 +6,6 @@ OXID eShop doctrine migration integration Document: https://docs.oxid-esales.com/developer/en/6.2/development/modules_components_themes/module/database_migration/index.html -Branch Compatibility --------------------- - -* master branch is compatible with OXID eShop compilation master -* b-6.4.x branch is compatible with OXID eShop compilation 6.4.x -* b-6.3.x branch is compatible with OXID eShop compilation 6.3.x -* b-3.x branch is compatible with OXID eShop compilation 6.2.x -* b-1.x branch is compatible with OXID eShop compilations before 6.2.x - Description ----------- diff --git a/composer.json b/composer.json index a99e5b9..dc2a715 100755 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require-dev": { "ext-pdo": "*", "mikey179/vfsstream": "^1.6", - "oxid-esales/oxideshop-ce": "dev-b-7.1.x-phpunit10-OXDEV-7513", + "oxid-esales/oxideshop-ce": "^7.1", "phpspec/prophecy-phpunit": "^v2.0", "phpunit/phpunit": "^10.4", "symfony/filesystem": "*",