Skip to content

Merge 4.4 into develop #7851

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
Merged
merged 678 commits into from
Aug 25, 2023
Merged

Merge 4.4 into develop #7851

merged 678 commits into from
Aug 25, 2023

Conversation

@kenjis
Copy link
Member

@kenjis kenjis commented Aug 25, 2023

To release v4.4.0.

iRedds and others added 30 commits June 29, 2023 08:42
@iRedds @kenjis
Update user_guide_src/source/general/errors.rst
9de0717 
Version of the new functionality.

Co-authored-by: kenjis <[email protected]>
@iRedds
rebase
abb921a
@kenjis
config: change the default value of $shareOptions to false
6c3b6c4
@kenjis
docs: update user guide
15677c3
@kenjis
fix: change Services::security() param type
713db9e
@kenjis
docs: add instruction in upgrade note
24e9cad
@kenjis
Merge pull request #7610 from iRedds/rework-redirect-exception
aab7037 
[4.4] Rework redirect exception
@kenjis
Merge pull request #7638 from kenjis/config-CURLRequest-shareOptions
1df1034 
config: change default value of CURLRequest::$shareOptions
@kenjis
Merge pull request #7630 from kenjis/remove-config-app-CSRF-items-4.4
d9c7f06 
Remove Config\App Security items
@kenjis
Merge pull request #7632 from kenjis/feat-curlrequest-proxy
b241ca8 
feat: [CURLRequest] add option for Proxy
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
e3bc5e9 
 Conflicts:
	user_guide_src/source/database/configuration.rst
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
bbc64f3
@kenjis
refactor: extract PageCache class
f6435c3
@kenjis
fix: [BC] fix wrong types for Requests
28f4a88 
Fixes the following errors:
 ------ ------------------------------------------------------------------
  Line   system/CodeIgniter.php
 ------ ------------------------------------------------------------------
  529    Parameter #1 $request of method
         CodeIgniter\Cache\PageCache::cachePage() expects
         CodeIgniter\HTTP\CLIRequest|CodeIgniter\HTTP\IncomingRequest,
         CodeIgniter\HTTP\Request|null given.
  685    Parameter #1 $request of method
         CodeIgniter\Cache\PageCache::getCachedResponse() expects
         CodeIgniter\HTTP\CLIRequest|CodeIgniter\HTTP\IncomingRequest,
         CodeIgniter\HTTP\Request|null given.
 ------ ------------------------------------------------------------------
@kenjis
chore: add exemptions for CodeIgniter\Cache\PageCache
3971941
@kenjis
refactor: rename PageCache to ResponseCache
b2afd71
@kenjis
refactor: rename cachePage() to make()
d0b9868
@kenjis
refactor: rename getCachedResponse() to get()
8b0230a
@kenjis
refactor: add ResponseCache::$ttl and use it
f0748dd
@kenjis
test: set $_SERVER['SCRIPT_NAME']
fd4e951
@kenjis
refactor: don't make cahce if $ttl is 0
cd5b817
@kenjis
docs: group items of the same class
eb288ec
@kenjis
docs: add "Parameter Type Changes" and "Deprecations"
7d31f52
@kenjis
Merge pull request #7422 from kenjis/fix-auto-routing-improved-setTra…
8e08820 
…nslateURIDashes-4.4

fix: [Auto Routing Improved] one controller method has more than one URI when $translateURIDashes is true
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
6c09f35
@kenjis @MGatner
docs: fix by proofreading
42ea493 
Co-authored-by: MGatner <[email protected]>
@kenjis
feat: add DefinedRouteCollector
d19a393
@kenjis
refactor: use DefinedRouteCollector in spark routes
d1224cc
@kenjis
refactor: use DefinedRouteCollector in DebugBar
06faf73
@kenjis
refactor: use DefinedRouteCollector in spark routes
6f0d950
kenjis and others added 17 commits August 16, 2023 14:24
@kenjis
test: fix out-of-dated test code
c78f8dd
@kenjis
docs: add docs
8de664f
@kenjis @MGatner
docs: fix by proofreading
82328c4 
Co-authored-by: MGatner <[email protected]>
@kenjis
Merge pull request #7282 from kenjis/refactor-URI-creation
d73b455 
rework: URI creation and URL helper
@kenjis
refactor: early return
ef045ce
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
aeaebf6
@kenjis
docs: improve description
8d2d9f1
@kenjis @MGatner
docs: fix by proofreading
5ba1b9c 
Co-authored-by: MGatner <[email protected]>
@kenjis
Merge pull request #7696 from kenjis/feat-Factories-config-cache
f4c17e8 
feat: [Factories] Config caching
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
f66ccb6 
 Conflicts:
	system/Exceptions/FrameworkException.php
@kenjis
style: composer cs-fix
27ade01
@kenjis
docs: add @return
f02979b
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
e80b66f
@kenjis
Merge pull request #7841 from kenjis/fix-ga-check-fail
015b7d9 
[4.4] update cs and add missing `@return`
@kenjis
Merge pull request #7840 from kenjis/fix-docs-changelog-4.4-factories
c0029f9 
[4.4] docs: improve description for Factories BC
@kenjis
Merge remote-tracking branch 'upstream/develop' into 4.4
8e1db37
@kenjis
Merge remote-tracking branch 'origin/develop' into 4.4
d3b10e7
@kenjis kenjis mentioned this pull request Aug 25, 2023
Closed
22 tasks
@neznaika0
Copy link
Contributor

neznaika0 commented Aug 25, 2023 •
edited
Loading

https://codeigniter.com/user_guide/index.html

Probably need to update the documentation on the site along with this release. The 4.3.7 branch is not available now either.

@kenjis
Copy link
Member Author

kenjis commented Aug 25, 2023

Screenshot 2023-08-25 13 25 05
Why merging is blocked?
It seems all commits are "Verified".

@kenjis
Copy link
Member Author

kenjis commented Aug 25, 2023

Ah,

This pull request is big! We’re only showing the most recent 250 commits.

@kenjis kenjis merged commit ae7630b into develop Aug 25, 2023
@kenjis
Copy link
Member Author

kenjis commented Aug 25, 2023

@neznaika0
What do you mean?
The 4.3.7 branch does not exist from the beginning.

@kenjis kenjis deleted the 4.4 branch August 25, 2023 04:45
@neznaika0
Copy link
Contributor

neznaika0 commented Aug 25, 2023

Shouldn't it be published?

@kenjis
Copy link
Member Author

kenjis commented Aug 25, 2023

The user guide is already updated.
https://codeigniter.com/user_guide/changelogs/v4.3.8.html
I'm not sure, but Lonnie did it?

@lonnieezell
Copy link
Member

lonnieezell commented Aug 25, 2023

@kenjis yeah I updated it. Now that 4.4 is released looks like I should update it again.

@lonnieezell
Copy link
Member

lonnieezell commented Aug 25, 2023

Well, after the package is created I can. Will check back in a little bit.

@neznaika0
Copy link
Contributor

neznaika0 commented Aug 25, 2023

Thanks

@kenjis
Copy link
Member Author

kenjis commented Aug 25, 2023

4.4 branch was merged into develop.
So now develop is for 4.4.x.
And 4.5 branch will be created after releasing v4.4.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@kenjis @neznaika0 @lonnieezell @iRedds @samsonasik @paulbalandan