Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge 2.next -> 3.x #655

Merged
merged 11 commits into from
Dec 26, 2023
Merged

merge 2.next -> 3.x #655

merged 11 commits into from
Dec 26, 2023

Commits on Sep 11, 2023

  1. Bump actions/checkout from 3 to 4 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
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
    dependabot[bot] committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    a6f2dc5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #633 from cakephp/dependabot/github_actions/action… 

    …s/checkout-4

Bump actions/checkout from 3 to 4
    @othercorey
    othercorey committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    3dc8af2 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Fix deprecated method usage 

    We didn't need to use query() here as find() will do the same work and
is compatible with 4.5 as well.
    @markstory
    markstory committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    9ff4df7 View commit details
    Browse the repository at this point in the history

  2. Fix dynamic property warnings

    @markstory
    markstory committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    46e801f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #641 from cakephp/fix-deprecation 

    Fix deprecations
    @ADmad
    ADmad committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    64964e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. add authentication service to DIC by default

    @LordSimal
    LordSimal committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    bdbe04b View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Merge pull request #647 from cakephp/2.next-service-di 

    2.next: add authentication service to DIC by default
    @markstory
    markstory committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    17d941e View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Merge branch '2.x' into 2.next-merge 

    # Conflicts:
#	.github/workflows/ci.yml
#	src/Identifier/Resolver/OrmResolver.php
    @LordSimal
    LordSimal committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    8f576e9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #654 from cakephp/2.next-merge 

    merge 2.x -> 2.next
    @LordSimal
    LordSimal committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    a5dc587 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.next' into 3.x-merge 

    # Conflicts:
#	.github/workflows/ci.yml
#	src/Middleware/AuthenticationMiddleware.php
#	tests/TestCase/Middleware/AuthenticationMiddlewareTest.php
    @LordSimal
    LordSimal committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    b25ec67 View commit details
    Browse the repository at this point in the history

  4. fix tests

    @LordSimal
    LordSimal committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    9be055c View commit details
    Browse the repository at this point in the history