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.

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

Merge release 2.36.0 into 3.0.x #143

Merged
merged 28 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
23e93d5
Add a `ForceUriScheme` filter to ease removal of `UriNormalize` filter
gsteel Apr 1, 2024
fffc9f2
Merge pull request #133 from gsteel/force-uri-scheme-filter
gsteel Apr 3, 2024
3089a4e
Deprecate the `UriNormalize` filter
gsteel Apr 1, 2024
ebeeb48
Amend deprecation notice in docs to reference the ForceUriScheme filter
gsteel Apr 3, 2024
883923e
Stop ignoring platform reqs and add BC Check to matrix
gsteel Mar 4, 2024
2d37e22
Merge pull request #135 from gsteel/ci-improvements
gsteel Apr 3, 2024
9cdf62c
Add preparing for v3 guide
gsteel Apr 3, 2024
6b571c2
Update deprecation notice to mention alternative filter
gsteel Apr 3, 2024
77fa3ce
Merge pull request #132 from gsteel/deprecate-uri-normalize
gsteel Apr 3, 2024
e3a2939
Adds installation page to documentation
froschdesign Apr 4, 2024
a03ad6a
Merge pull request #137 from froschdesign/hotfix/docs/installation-page
gsteel Apr 4, 2024
45f9a69
Merge pull request #138 from laminas/2.35.x-merge-up-into-2.36.x_0gN4…
gsteel Apr 4, 2024
0dfeacb
Add deprecation notice for StaticFilter to the docs
gsteel Apr 4, 2024
d6a2d35
Merge pull request #139 from gsteel/deprecate-static-filter
gsteel Apr 4, 2024
f98ddcf
Lock file maintenance
renovate[bot] Apr 8, 2024
ea501a5
Fixes regression, Allow callbacks to be a FilterInterface again.
baldwinagency-pieter Apr 11, 2024
3e821b3
Merge pull request #140 from hostep/fix-regression-with-filterinterfa…
Xerkus Apr 11, 2024
adeef98
Merge pull request #141 from laminas/2.35.x-merge-up-into-2.36.x_qFWC…
Xerkus Apr 11, 2024
a8fbf9c
Lock file maintenance
renovate[bot] Apr 15, 2024
cd3c902
Lock file maintenance
renovate[bot] Apr 22, 2024
a04f9e1
Lock file maintenance
renovate[bot] Apr 29, 2024
94b242f
Lock file maintenance
renovate[bot] May 6, 2024
91d797f
Bump dev deps, refresh lock
gsteel Jun 13, 2024
bc52584
Fix risky truthy/falsy comparison
gsteel Jun 13, 2024
307afc2
Merge pull request #142 from laminas/renovate/lock-file-maintenance
gsteel Jun 13, 2024
24692bb
Merge remote-tracking branch 'laminas/3.0.x' into merge-release-2.36.…
gsteel Jun 13, 2024
f5e8cf6
Update test asset to be compatible with `FilterInterface`
gsteel Jun 13, 2024
8860593
Refresh lock and baseline post merge-up
gsteel Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"ignore_php_platform_requirements": {
"8.3": true
}
"ignore_php_platform_requirements": {
"8.3": false
},
"backwardCompatibilityCheck": true
}
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"pear/archive_tar": "^1.4.14",
"phpunit/phpunit": "^10.5.11",
"pear/archive_tar": "^1.5.0",
"phpunit/phpunit": "^10.5.20",
"psalm/plugin-phpunit": "^0.19.0",
"psr/http-factory": "^1.0.2",
"vimeo/psalm": "^5.22.2"
"psr/http-factory": "^1.1.0",
"vimeo/psalm": "^5.24.0"
},
"conflict": {
"laminas/laminas-validator": "<2.10.1",
Expand Down
Loading