Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cakephp/migrations
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.5.0
Choose a base ref
...
head repository: cakephp/migrations
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.x
Choose a head ref

Commits on Mar 11, 2022

  1. Improve debugging messages

    Refs #533
    markstory committed Mar 11, 2022
    Copy the full SHA
    d209323 View commit details

Commits on Mar 12, 2022

  1. Improve fixture state mis-match logging further.

    Make the text more descriptive and broken out into sections. I've also
    fixed a few test case related errors I was getting locally related to
    caching. I still don't have a clean run on SQLite locally but I'll keep
    trying.
    markstory committed Mar 12, 2022
    Copy the full SHA
    f63a55d View commit details
  2. Fix phpcs

    markstory committed Mar 12, 2022
    Copy the full SHA
    6ca43c5 View commit details

Commits on Mar 14, 2022

  1. Merge pull request #534 from cakephp/improve-messages

    Improve debugging messages
    markstory authored Mar 14, 2022
    Copy the full SHA
    6b03a44 View commit details

Commits on Mar 19, 2022

  1. Fix some syntax errors.

    ndm2 committed Mar 19, 2022
    Copy the full SHA
    6ecff10 View commit details
  2. Merge pull request #536 from ndm2/3.x-search-upgrade-preparation

    3.x search upgrade preparation
    markstory authored Mar 19, 2022
    Copy the full SHA
    db59ebd View commit details

Commits on Mar 23, 2022

  1. Update source files path.

    ndm2 authored Mar 23, 2022
    Copy the full SHA
    ddcad38 View commit details
  2. Merge pull request #538 from cakephp/ndm2-patch-2

    3.x - Update source files path.
    markstory authored Mar 23, 2022
    Copy the full SHA
    93fc9db View commit details

Commits on Apr 3, 2022

  1. Copy the full SHA
    cd4c2c8 View commit details
  2. Copy the full SHA
    581d49d View commit details

Commits on Apr 4, 2022

  1. Merge pull request #539 from cakephp/improve-help

    Improve help text for migration commands.
    markstory authored Apr 4, 2022
    Copy the full SHA
    a48cfed View commit details
  2. Tweak wording.

    markstory committed Apr 4, 2022
    Copy the full SHA
    358aff3 View commit details

Commits on Apr 20, 2022

  1. Copy the full SHA
    269e3c6 View commit details
  2. Unique index sample

    Adds a unique index sample.
    cnizzardini authored Apr 20, 2022
    Copy the full SHA
    def9773 View commit details

Commits on Apr 21, 2022

  1. Merge pull request #542 from cakephp/othercorey-patch-1

    Fix branch name in docs config
    saeideng authored Apr 21, 2022
    Copy the full SHA
    17bc5d8 View commit details
  2. Copy the full SHA
    8f2c2fd View commit details
  3. Add dependabot config

    othercorey committed Apr 21, 2022
    Copy the full SHA
    18cae2a View commit details
  4. Bump codecov/codecov-action from 1 to 3

    Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1 to 3.
    - [Release notes](https://github.com/codecov/codecov-action/releases)
    - [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
    - [Commits](codecov/codecov-action@v1...v3)
    
    ---
    updated-dependencies:
    - dependency-name: codecov/codecov-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 21, 2022
    Copy the full SHA
    d2f9985 View commit details
  5. Bump actions/cache from 1 to 3

    Bumps [actions/cache](https://github.com/actions/cache) from 1 to 3.
    - [Release notes](https://github.com/actions/cache/releases)
    - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
    - [Commits](actions/cache@v1...v3)
    
    ---
    updated-dependencies:
    - dependency-name: actions/cache
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 21, 2022
    Copy the full SHA
    baf0761 View commit details
  6. Bump actions/checkout from 2 to 3

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v2...v3)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 21, 2022
    Copy the full SHA
    96d7a42 View commit details
  7. Merge pull request #547 from cakephp/dependabot/github_actions/action…

    …s/cache-3
    
    Bump actions/cache from 1 to 3
    othercorey authored Apr 21, 2022
    Copy the full SHA
    f8f0791 View commit details
  8. Merge pull request #546 from cakephp/dependabot/github_actions/codeco…

    …v/codecov-action-3
    
    Bump codecov/codecov-action from 1 to 3
    othercorey authored Apr 21, 2022
    Copy the full SHA
    99cc449 View commit details
  9. Merge pull request #548 from cakephp/dependabot/github_actions/action…

    …s/checkout-3
    
    Bump actions/checkout from 2 to 3
    othercorey authored Apr 21, 2022
    Copy the full SHA
    1496678 View commit details

Commits on Apr 24, 2022

  1. Merge pull request #543 from cnizzardini/patch-1

    Documentation: Unique index sample
    markstory authored Apr 24, 2022
    Copy the full SHA
    b2e52d4 View commit details
  2. Merge pull request #544 from cakephp/saeideng-patch-2

    [3.x] remove extra slash in docs config
    saeideng authored Apr 24, 2022
    Copy the full SHA
    5817464 View commit details

Commits on Apr 28, 2022

  1. Fix mistake in Migrator usage docs.

    Fixes #550
    markstory committed Apr 28, 2022
    Copy the full SHA
    9b12dcd View commit details

Commits on May 5, 2022

  1. #533 Up migrations should not be reported as problematic, and should …

    …not lead to migrations being re-run
    pabloelcolombiano committed May 5, 2022
    Copy the full SHA
    503805c View commit details
  2. #533 Adds tests

    pabloelcolombiano committed May 5, 2022
    Copy the full SHA
    94aa8b7 View commit details

Commits on May 10, 2022

  1. Style fix in tests/TestCase/TestSuite/MigratorTest.php

    Co-authored-by: Mark Story <mark@mark-story.com>
    pabloelcolombiano and markstory authored May 10, 2022
    Copy the full SHA
    956c8e9 View commit details
  2. Merge pull request #551 from pabloelcolombiano/3.x

    Fix migrations being run when nothing changes
    markstory authored May 10, 2022
    Copy the full SHA
    e1b03bf View commit details

Commits on May 18, 2022

  1. bake a valid drop migration

    LordSimal committed May 18, 2022
    Copy the full SHA
    7a8fb6c View commit details
  2. Merge pull request #554 from cakephp/3.x-bake-valid-drop-migration

    bake a valid drop migration
    markstory authored May 18, 2022
    Copy the full SHA
    cf27dab View commit details

Commits on May 27, 2022

  1. update phpstan and psalm

    LordSimal committed May 27, 2022
    Copy the full SHA
    69b9641 View commit details
  2. Merge pull request #555 from cakephp/3.x-update-stan

    update phpstan and psalm
    othercorey authored May 27, 2022
    Copy the full SHA
    271d697 View commit details

Commits on Jul 1, 2022

  1. Copy the full SHA
    bdab5fb View commit details

Commits on Jul 6, 2022

  1. Merge pull request #557 from CakeDC/3.x

    Remove single quotes from default value if present
    markstory authored Jul 6, 2022
    Copy the full SHA
    e0b0547 View commit details

Commits on Aug 26, 2022

  1. Change "Renaming a table" section to match Phinx documentation

    Original example doesn't work as it calls save() when update() is required.
    
    https://book.cakephp.org/phinx/0/en/migrations.html#renaming-a-table
    kalnado authored Aug 26, 2022
    Copy the full SHA
    178c7aa View commit details
  2. Copy the full SHA
    05478a5 View commit details

Commits on Sep 2, 2022

  1. Using another approach disabling casting. Removing isset to avoid psa…

    …lm/phpstan issues because of non-nullable property
    ajibarra committed Sep 2, 2022
    Copy the full SHA
    7c20c6d View commit details
  2. Fix unit tests

    ajibarra committed Sep 2, 2022
    Copy the full SHA
    e91de95 View commit details

Commits on Sep 6, 2022

  1. Merge pull request #560 from kalnado/patch-1

    Change "Renaming a table" section to match Phinx documentation
    markstory authored Sep 6, 2022
    Copy the full SHA
    b9c1eeb View commit details

Commits on Sep 9, 2022

  1. Copy the full SHA
    a992608 View commit details

Commits on Sep 16, 2022

  1. Copy the full SHA
    db48108 View commit details
  2. Copy the full SHA
    5d8a7dd View commit details
  3. Reapply change from #561 to avoid phpstan complain about isset and al…

    …ready initialized property
    ajibarra committed Sep 16, 2022
    Copy the full SHA
    bf10fd8 View commit details
  4. Copy the full SHA
    fac590e View commit details
  5. Copy the full SHA
    eb47296 View commit details

Commits on Sep 17, 2022

  1. Merge pull request #561 from CakeDC/3.x

    Map Date/Time types to string to avoid issues importing seeds
    markstory authored Sep 17, 2022
    Copy the full SHA
    a51e7d2 View commit details

Commits on Sep 19, 2022

  1. Copy the full SHA
    d5feb0c View commit details

Commits on Sep 20, 2022

  1. Apply suggestions from code review

    Co-authored-by: othercorey <corey.taylor.fl@gmail.com>
    markstory and othercorey authored Sep 20, 2022
    Copy the full SHA
    fddd6c8 View commit details
Showing with 1,751 additions and 963 deletions.
  1. +4 −4 .github/CONTRIBUTING.md
  2. +2 −2 .github/ISSUE_TEMPLATE.md
  3. +12 −0 .github/dependabot.yml
  4. +17 −18 .github/workflows/ci.yml
  5. +2 −1 .github/workflows/deploy_docs_3x.yml
  6. +0 −1 .gitignore
  7. +0 −79 .travis.yml
  8. +1 −1 LICENSE.txt
  9. +4 −4 README.md
  10. +8 −8 composer.json
  11. +3 −3 docs.Dockerfile
  12. +3 −3 docs/config/all.py
  13. +33 −4 docs/en/index.rst
  14. +11 −8 docs/fr/index.rst
  15. +9 −7 docs/ja/index.rst
  16. +8 −5 docs/pt/index.rst
  17. +10 −6 docs/ru/index.rst
  18. +6 −4 phpcs.xml.dist → phpcs.xml
  19. +3 −1 phpstan.neon
  20. +0 −53 psalm-baseline.xml
  21. +3 −2 psalm.xml
  22. +9 −6 src/AbstractMigration.php
  23. +4 −4 src/AbstractSeed.php
  24. +8 −7 src/CakeAdapter.php
  25. +34 −29 src/CakeManager.php
  26. +88 −6 src/Command/BakeMigrationCommand.php
  27. +17 −22 src/Command/BakeMigrationDiffCommand.php
  28. +9 −6 src/Command/BakeMigrationSnapshotCommand.php
  29. +9 −9 src/Command/BakeSeedCommand.php
  30. +16 −11 src/Command/BakeSimpleMigrationCommand.php
  31. +4 −4 src/Command/MigrationsCacheBuildCommand.php
  32. +4 −4 src/Command/MigrationsCacheClearCommand.php
  33. +11 −11 src/Command/MigrationsCommand.php
  34. +4 −4 src/Command/MigrationsCreateCommand.php
  35. +4 −4 src/Command/MigrationsDumpCommand.php
  36. +4 −4 src/Command/MigrationsMarkMigratedCommand.php
  37. +4 −4 src/Command/MigrationsMigrateCommand.php
  38. +4 −4 src/Command/MigrationsRollbackCommand.php
  39. +4 −4 src/Command/MigrationsSeedCommand.php
  40. +4 −4 src/Command/MigrationsStatusCommand.php
  41. +2 −2 src/Command/Phinx/CacheBuild.php
  42. +2 −2 src/Command/Phinx/CacheClear.php
  43. +8 −8 src/Command/Phinx/CommandTrait.php
  44. +25 −7 src/Command/Phinx/Create.php
  45. +6 −6 src/Command/Phinx/Dump.php
  46. +7 −6 src/Command/Phinx/MarkMigrated.php
  47. +7 −7 src/Command/Phinx/Migrate.php
  48. +7 −7 src/Command/Phinx/Rollback.php
  49. +7 −7 src/Command/Phinx/Seed.php
  50. +12 −9 src/Command/Phinx/Status.php
  51. +25 −16 src/Command/SnapshotTrait.php
  52. +90 −23 src/ConfigurationTrait.php
  53. +9 −6 src/Migrations.php
  54. +8 −8 src/MigrationsDispatcher.php
  55. +16 −15 src/Plugin.php
  56. +6 −6 src/Shell/Task/SimpleMigrationTask.php
  57. +6 −6 src/Table.php
  58. +12 −9 src/TableFinderTrait.php
  59. +56 −24 src/TestSuite/Migrator.php
  60. +2 −1 src/Util/ColumnParser.php
  61. +4 −4 src/Util/SchemaTrait.php
  62. +4 −4 src/Util/UtilTrait.php
  63. +10 −6 src/View/Helper/MigrationHelper.php
  64. +1 −1 templates/Phinx/create.php.template
  65. +6 −6 templates/bake/Seed/seed.twig
  66. +7 −7 templates/bake/config/diff.twig
  67. +7 −7 templates/bake/config/skeleton.twig
  68. +7 −7 templates/bake/config/snapshot.twig
  69. +2 −1 templates/bake/element/add-foreign-keys.twig
  70. +13 −9 templates/bake/element/create-tables.twig
  71. +10 −10 tests/CommandTester.php
  72. +4 −4 tests/ExampleCommand.php
  73. +5 −5 tests/Fixture/ArticlesFixture.php
  74. +5 −5 tests/Fixture/CategoriesFixture.php
  75. +5 −5 tests/Fixture/CompositePkFixture.php
  76. +5 −5 tests/Fixture/OrdersFixture.php
  77. +5 −5 tests/Fixture/PartsFixture.php
  78. +5 −5 tests/Fixture/ProductsFixture.php
  79. +5 −5 tests/Fixture/SpecialPkFixture.php
  80. +5 −5 tests/Fixture/SpecialTagsFixture.php
  81. +5 −5 tests/Fixture/UsersFixture.php
  82. +20 −5 tests/TestCase/Command/BakeMigrationCommandTest.php
  83. +32 −16 tests/TestCase/Command/BakeMigrationDiffCommandTest.php
  84. +4 −4 tests/TestCase/Command/BakeMigrationSnapshotCommandTest.php
  85. +8 −4 tests/TestCase/Command/BakeSeedCommandTest.php
  86. +5 −5 tests/TestCase/Command/CompletionTest.php
  87. +5 −0 tests/TestCase/Command/MigrationCommandTest.php
  88. +5 −1 tests/TestCase/Command/Phinx/CacheBuildTest.php
  89. +0 −1 tests/TestCase/Command/Phinx/CacheClearTest.php
  90. +0 −2 tests/TestCase/Command/Phinx/CreateTest.php
  91. +5 −8 tests/TestCase/Command/Phinx/DumpTest.php
  92. +21 −23 tests/TestCase/Command/Phinx/MarkMigratedTest.php
  93. +9 −13 tests/TestCase/Command/Phinx/SeedTest.php
  94. +9 −11 tests/TestCase/Command/Phinx/StatusTest.php
  95. +4 −4 tests/TestCase/Command/TestClassWithSnapshotTrait.php
  96. +173 −19 tests/TestCase/ConfigurationTraitTest.php
  97. +33 −33 tests/TestCase/MigrationsTest.php
  98. +6 −6 tests/TestCase/TestCase.php
  99. +137 −20 tests/TestCase/TestSuite/MigratorTest.php
  100. +4 −4 tests/TestCase/Util/ColumnParserTest.php
  101. +4 −7 tests/TestCase/View/Helper/MigrationHelperTest.php
  102. +12 −6 tests/bootstrap.php
  103. +1 −1 tests/comparisons/Create/TestCreateChange.php
  104. +2 −4 tests/comparisons/Diff/addremove/the_diff_add_remove_mysql.php
  105. +2 −4 tests/comparisons/Diff/addremove/the_diff_add_remove_pgsql.php
  106. +2 −2 tests/comparisons/Diff/simple/the_diff_simple_mysql.php
  107. +2 −2 tests/comparisons/Diff/simple/the_diff_simple_pgsql.php
  108. +2 −2 tests/comparisons/Diff/the_diff.php
  109. +2 −2 tests/comparisons/Diff/the_diff_mysql.php
  110. +2 −2 tests/comparisons/Diff/the_diff_pgsql.php
  111. +36 −6 tests/comparisons/Migration/pgsql/test_auto_id_disabled_snapshot_pgsql.php
  112. +36 −6 tests/comparisons/Migration/pgsql/test_not_empty_snapshot_pgsql.php
  113. +13 −3 tests/comparisons/Migration/pgsql/test_plugin_blog_pgsql.php
  114. +36 −6 tests/comparisons/Migration/sqlite/test_auto_id_disabled_snapshot_sqlite.php
  115. +36 −6 tests/comparisons/Migration/sqlite/test_not_empty_snapshot_sqlite.php
  116. +13 −3 tests/comparisons/Migration/sqlite/test_plugin_blog_sqlite.php
  117. +1 −1 tests/comparisons/Migration/testCreate.php
  118. +1 −1 tests/comparisons/Migration/testCreateDatetime.php
  119. +20 −0 tests/comparisons/Migration/testCreateDropMigration.php
  120. +1 −1 tests/comparisons/Migration/testCreateFieldLength.php
  121. +1 −1 tests/comparisons/Migration/testCreatePrimaryKey.php
  122. +1 −1 tests/comparisons/Migration/testCreatePrimaryKeyUuid.php
  123. +1 −1 tests/comparisons/Migration/testNoContents.php
  124. +36 −6 tests/comparisons/Migration/test_auto_id_disabled_snapshot.php
  125. +2 −2 tests/comparisons/Migration/test_auto_id_disabled_snapshot56.php
  126. +36 −6 tests/comparisons/Migration/test_not_empty_snapshot.php
  127. +2 −2 tests/comparisons/Migration/test_not_empty_snapshot56.php
  128. +13 −3 tests/comparisons/Migration/test_plugin_blog.php
  129. +2 −2 tests/comparisons/Migration/test_plugin_blog56.php
  130. +1 −1 tests/comparisons/Seeds/pgsql/testWithData.php
  131. +1 −1 tests/comparisons/Seeds/pgsql/testWithDataAndLimit.php
  132. +51 −0 tests/comparisons/Seeds/php81/testWithData.php
  133. +41 −0 tests/comparisons/Seeds/php81/testWithDataAndLimit.php
  134. +1 −1 tests/comparisons/Seeds/testBasicBaking.php
  135. +1 −1 tests/comparisons/Seeds/testPrettifyArray.php
  136. +4 −4 tests/comparisons/Seeds/testWithData.php
  137. +1 −1 tests/comparisons/Seeds/testWithDataAndFields.php
  138. +3 −3 tests/comparisons/Seeds/testWithDataAndLimit.php
  139. +1 −1 tests/schema.php
  140. +4 −4 tests/test_app/App/Model/Table/LettersTable.php
  141. +4 −4 tests/test_app/App/Model/Table/NumbersTable.php
  142. +4 −4 tests/test_app/App/Model/Table/SomeAbstractTable.php
  143. +1 −1 tests/test_app/Plugin/TestBlog/config/CallSeeds/PluginLettersSeed.php
  144. +1 −1 tests/test_app/Plugin/TestBlog/config/CallSeeds/PluginSubLettersSeed.php
  145. +1 −1 tests/test_app/config/AltSeeds/AnotherNumbersSeed.php
  146. +1 −1 tests/test_app/config/AltSeeds/NumbersAltSeed.php
  147. +1 −1 tests/test_app/config/CallSeeds/DatabaseSeed.php
  148. +1 −1 tests/test_app/config/CallSeeds/LettersSeed.php
  149. +1 −1 tests/test_app/config/CallSeeds/NumbersCallSeed.php
  150. +2 −2 tests/test_app/config/Migrations/20150416223600_mark_migrated_test.php
  151. +1 −1 tests/test_app/config/MigrationsDiff/20151218183450_CreateArticles.php
  152. +1 −1 tests/test_app/config/MigrationsDiff/20160128183623_AlterArticles.php
  153. +1 −1 tests/test_app/config/MigrationsDiff/20160128183652_AlterArticlesSlug.php
  154. +1 −1 tests/test_app/config/MigrationsDiff/20160128183952_CreateUsers.php
  155. +1 −1 tests/test_app/config/MigrationsDiff/20160128184109_AlterArticlesFk.php
  156. +1 −1 tests/test_app/config/MigrationsDiff/20160414193900_CreateTags.php
  157. +1 −1 tests/test_app/config/MigrationsDiffAddRemove/20151218183450_CreateArticlesAddRemove.php
  158. +1 −1 tests/test_app/config/MigrationsDiffSimple/20151218183450_CreateArticlesSimple.php
  159. +1 −1 tests/test_app/config/MigrationsDiffSimple/20160128183623_AlterArticlesSimple.php
  160. +1 −1 tests/test_app/config/Seeds/NumbersSeed.php
  161. +1 −1 tests/test_app/config/TestsMigrations/20150704160200_create_numbers_table.php
  162. +2 −2 tests/test_app/config/TestsMigrations/20150724233100_update_numbers_table.php
  163. +1 −1 tests/test_app/config/TestsMigrations/20150826191400_create_letters_table.php
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ Help us keep CakePHP open and inclusive. Please read and follow our [Code of Con
* Core test cases should continue to pass. You can run tests locally or enable
[travis-ci](https://travis-ci.org/) for your fork, so all tests and codesniffs
will be executed.
* Your work should apply the [CakePHP coding standards](http://book.cakephp.org/3.0/en/contributing/cakephp-coding-conventions.html).
* Your work should apply the [CakePHP coding standards](https://book.cakephp.org/3.0/en/contributing/cakephp-coding-conventions.html).

## Submitting Changes

@@ -48,7 +48,7 @@ Help us keep CakePHP open and inclusive. Please read and follow our [Code of Con

## Test cases and codesniffer

CakePHP tests requires [PHPUnit](http://www.phpunit.de/manual/current/en/installation.html).
CakePHP tests requires [PHPUnit](https://www.phpunit.de/manual/current/en/installation.html).
To install PHPUnit use composer:

php composer.phar require "phpunit/phpunit:*"
@@ -74,8 +74,8 @@ for the sniff and phpcs.

# Additional Resources

* [CakePHP coding standards](http://book.cakephp.org/3.0/en/contributing/cakephp-coding-conventions.html)
* [CakePHP coding standards](https://book.cakephp.org/3.0/en/contributing/cakephp-coding-conventions.html)
* [Existing issues](https://github.com/cakephp/migrations/issues)
* [General GitHub documentation](https://help.github.com/)
* [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
* `#cakephp` IRC channel on freenode.org
* `#cakephp` IRC channel on freenode.org
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ EXPLAIN WHAT IS TO BE EXPECTED, HERE.
### Actual Behavior
EXPLAIN WHAT IS ACTUALLY HAPPENING, HERE.

P.S. Remember, an issue is not the place to ask questions. You can use [Stack Overflow](http://stackoverflow.com/questions/tagged/cakephp)
P.S. Remember, an issue is not the place to ask questions. You can use [Stack Overflow](https://stackoverflow.com/questions/tagged/cakephp)
for that or join the #cakephp channel on irc.freenode.net, where we will be more than happy to help answer your questions.

Before you open an issue, please check if a similar issue already exists or has been closed before.
Before you open an issue, please check if a similar issue already exists or has been closed before.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
35 changes: 17 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -3,23 +3,24 @@ name: CI
on:
push:
branches:
- master
- 3.x
- 3.next
pull_request:
branches:
- '*'
workflow_dispatch:

jobs:
testsuite-linux:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
php-version: ['7.2', '8.0', '8.1']
php-version: ['7.4', '8.2']
db-type: [mysql, pgsql, sqlite]
prefer-lowest: ['']
include:
- php-version: '7.2'
- php-version: '7.4'
db-type: 'sqlite'
prefer-lowest: 'prefer-lowest'

@@ -33,7 +34,7 @@ jobs:
POSTGRES_DB: cakephp_test

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup MySQL
if: matrix.db-type == 'mysql'
@@ -51,26 +52,24 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Get date part for cache key
id: key-date
run: echo "::set-output name=date::$(date +'%Y-%m')"
run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT

- name: Cache composer dependencies
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}

- name: Composer install
run: |
if [[ ${{ matrix.php-version }} == '8.1' ]]; then
composer install --ignore-platform-reqs
elif ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
composer update --prefer-lowest --prefer-stable
else
composer update
composer install
fi
- name: Run PHPUnit
@@ -95,14 +94,14 @@ jobs:
- name: Code Coverage Report
if: success() && matrix.php-version == '7.4' && matrix.db-type == 'mysql'
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3

cs-stan:
name: Coding Standard & Static Analysis
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
@@ -121,7 +120,7 @@ jobs:
run: echo "::set-output name=date::$(date +'%Y-%m')"

- name: Cache composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
@@ -130,12 +129,12 @@ jobs:
run: composer stan-setup

- name: Run phpcs
run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr
run: vendor/bin/phpcs --report=checkstyle | cs2pr

- name: Run psalm
if: success() || failure()
run: vendor/bin/psalm.phar --output-format=github

- name: Run phpstan
if: success() || failure()
run: vendor/bin/phpstan analyse src/
run: vendor/bin/phpstan analyse
3 changes: 2 additions & 1 deletion .github/workflows/deploy_docs_3x.yml
Original file line number Diff line number Diff line change
@@ -5,13 +5,14 @@ on:
push:
branches:
- 3.x
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Cloning repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ dist/
tags/
composer.lock
phpunit.xml
phpcs.xml
vendor/
*.mo
debug.log
79 changes: 0 additions & 79 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
CakePHP(tm) : The Rapid Development PHP Framework (https://cakephp.org)
Copyright (c) 2005-present, Cake Software Foundation, Inc.

Permission is hereby granted, free of charge, to any person obtaining a
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Migrations plugin for CakePHP

[![CI](https://github.com/cakephp/migrations/actions/workflows/ci.yml/badge.svg)](https://github.com/cakephp/migrations/actions/workflows/ci.yml)
[![Coverage Status](https://img.shields.io/codecov/c/github/cakephp/migrations/master.svg?style=flat-square)](https://codecov.io/github/cakephp/migrations?branch=master)
[![Coverage Status](https://img.shields.io/codecov/c/github/cakephp/migrations/3.x.svg?style=flat-square)](https://app.codecov.io/github/cakephp/migrations/tree/3.x)
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.txt)
[![Total Downloads](https://img.shields.io/packagist/dt/cakephp/migrations.svg?style=flat-square)](https://packagist.org/packages/cakephp/migrations)

This is a Database Migrations system for CakePHP.

The plugin consists of a CakePHP shell wrapper for the [Phinx](https://book.cakephp.org/phinx/0/en/index.html) migrations library.
The plugin consists of a CakePHP CLI wrapper for the [Phinx](https://book.cakephp.org/phinx/0/en/index.html) migrations library.

This branch is for use with CakePHP **4.x**. See [version map](https://github.com/cakephp/migrations/wiki#version-map) for details.

## Installation

You can install this plugin into your CakePHP application using [Composer](http://getcomposer.org).
You can install this plugin into your CakePHP application using [Composer](https://getcomposer.org).

Run the following command
```sh
@@ -30,7 +30,7 @@ bin/cake plugin load Migrations

Or you can manually add the loading statement in the **src/Application.php** file of your application:
```php
public function bootstrap()
public function bootstrap(): void
{
parent::bootstrap();
$this->addPlugin('Migrations');
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -21,14 +21,14 @@
"source": "https://github.com/cakephp/migrations"
},
"require": {
"php": ">=7.2.0",
"robmorgan/phinx": "^0.12",
"php": ">=7.4.0",
"robmorgan/phinx": "^0.13.2",
"cakephp/orm": "^4.3.0",
"cakephp/cache": "^4.3.0"
},
"require-dev": {
"phpunit/phpunit": "^8.5.0 || ^9.5.0",
"cakephp/cakephp": "^4.3.0",
"phpunit/phpunit": "^9.5.0",
"cakephp/cakephp": "^4.5.0",
"cakephp/bake": "^2.6.0",
"cakephp/cakephp-codesniffer": "^4.1"
},
@@ -56,10 +56,10 @@
"@test",
"@stan"
],
"cs-check": "phpcs --colors -p -s src/ tests/",
"cs-fix": "phpcbf --colors -p src/ tests/",
"stan": "phpstan analyse src/ && psalm.phar --show-info=false",
"stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.4.0 psalm/phar:~4.19.0 && mv composer.backup composer.json",
"cs-check": "phpcs -p",
"cs-fix": "phpcbf -p",
"stan": "phpstan analyse && psalm.phar --show-info=false",
"stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.7.0 psalm/phar:~4.23.0 && mv composer.backup composer.json",
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover=clover.xml"
},
6 changes: 3 additions & 3 deletions docs.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generate the HTML output.
FROM markstory/cakephp-docs-builder as builder
FROM ghcr.io/cakephp/docs-builder as builder

COPY docs /data/docs

@@ -8,10 +8,10 @@ RUN cd /data/docs-builder && \
make website LANGS="en fr ja pt ru" SOURCE=/data/docs DEST=/data/website/

# Build a small nginx container with just the static site in it.
FROM markstory/cakephp-docs-builder:runtime as runtime
FROM ghcr.io/cakephp/docs-builder:runtime as runtime

ENV LANGS="en fr ja pt ru"
ENV SEARCH_SOURCE="/data/docs"
ENV SEARCH_SOURCE="/usr/share/nginx/html"
ENV SEARCH_URL_PREFIX="/migrations/3"

COPY --from=builder /data/docs /data/docs
6 changes: 3 additions & 3 deletions docs/config/all.py
Original file line number Diff line number Diff line change
@@ -23,16 +23,16 @@

# Other versions that display in the version picker menu.
version_list = [
{'name': '2.x', 'number': '/migrations/2', 'title': '2.x'},
{'name': '3.x', 'number': '/migrations/3', 'title': '3.x', 'current': True},
{'name': '2.x', 'number': 'migrations/2', 'title': '2.x'},
{'name': '3.x', 'number': 'migrations/3', 'title': '3.x', 'current': True},
]

# Languages available.
languages = ['en', 'fr', 'ja', 'pt', 'ru']

# The GitHub branch name for this version of the docs
# for edit links to point at.
branch = 'master'
branch = '3.x'

# Current version being built
version = '3.x'
Loading