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 release 2.28.0 into 3.0.x #206

Merged
merged 9 commits into from
May 30, 2023
Merged

Merge release 2.28.0 into 3.0.x #206

merged 9 commits into from
May 30, 2023

Commits on Feb 14, 2023

  1. Lock file maintenance 

    Signed-off-by: Renovate Bot <[email protected]>
    @renovate
    renovate[bot] authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    198f594 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Lock file maintenance 

    Signed-off-by: Renovate Bot <[email protected]>
    @renovate
    renovate[bot] authored Feb 20, 2023
    Configuration menu
    Copy the full SHA
    0b48370 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. qa: Fix minor psalm issues to keep CI green and bump dev deps 

    Signed-off-by: George Steel <[email protected]>
    @gsteel
    gsteel committed May 29, 2023
    Configuration menu
    Copy the full SHA
    3d6c02a View commit details
    Browse the repository at this point in the history

  2. Remove support for PHP 8.0. Bump ServiceManager to 3.21.x 

    Includes commits from #201

Works around a BC break relating to tests introduced in `laminas-servicemanager` 3.21 where a protected method was made static.

Resolves SA issues introduced by the PHP upgrade and baselines other (currently) unfixable SA issues

Signed-off-by: George Steel <[email protected]>
    @gsteel
    gsteel committed May 29, 2023
    Configuration menu
    Copy the full SHA
    1f6aa86 View commit details
    Browse the repository at this point in the history

  3. Bump dev deps for 8.1 and refresh lock 

    Signed-off-by: George Steel <[email protected]>
    @gsteel
    gsteel committed May 29, 2023
    Configuration menu
    Copy the full SHA
    375dad3 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Revert potential BC break in protected method 

    Signed-off-by: George Steel <[email protected]>
    @gsteel
    gsteel committed May 30, 2023
    Configuration menu
    Copy the full SHA
    2e7b60d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #205 from gsteel/drop-php-8.0 

    Remove support for PHP 8.0. Bump ServiceManager to 3.21.x
    @Ocramius
    Ocramius authored May 30, 2023
    Configuration menu
    Copy the full SHA
    c43dd9f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/3.0.x' into 2.28.x-merge-up-in… 

    …to-3.0.x_7RmPQ6T1

# Conflicts:
#	composer.lock
#	psalm-baseline.xml
    @gsteel
    gsteel committed May 30, 2023
    Configuration menu
    Copy the full SHA
    5c07ceb View commit details
    Browse the repository at this point in the history

  4. Refresh lock and baseline post merge-up 

    Signed-off-by: George Steel <[email protected]>
    @gsteel
    gsteel committed May 30, 2023
    Configuration menu
    Copy the full SHA
    3c2426a View commit details
    Browse the repository at this point in the history