Skip to content

Commit 795e9c4

Browse files
MGatnerMGatner
authored
Merge pull request #4776 from codeigniter4/release-4.1.3
4.1.3 Ready code
2 parents 10067eb + 714049f commit 795e9c4

File tree

105 files changed

+1162
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1162
-433
lines changed

‎.github/workflows/test-phpunit.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,15 @@ jobs:
4242
matrix:
4343
php-versions: ['7.3', '7.4', '8.0']
4444
db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
45+
mysql-versions: ['5.7']
46+
include:
47+
- php-versions: 7.4
48+
db-platforms: MySQLi
49+
mysql-versions: 8.0
4550

4651
services:
4752
mysql:
48-
image: mysql:5.7
53+
image: mysql:${{ matrix.mysql-versions }}
4954
env:
5055
MYSQL_ALLOW_EMPTY_PASSWORD: yes
5156
MYSQL_DATABASE: test
@@ -100,9 +105,8 @@ jobs:
100105

101106
- name: Install latest ImageMagick
102107
run: |
103-
sudo apt-get remove ghostscript
104-
sudo apt-get update
105-
sudo apt-get install -y imagemagick ghostscript-x gsfonts
108+
sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback ttf-dejavu-core
109+
sudo apt-get install -y imagemagick
106110
107111
- name: Get composer cache directory
108112
id: composercache
@@ -133,7 +137,7 @@ jobs:
133137
DB: ${{ matrix.db-platforms }}
134138
TERM: xterm-256color
135139

136-
- if: matrix.php-versions == '7.4'
140+
- if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '7.4'
137141
name: Run Coveralls
138142
run: |
139143
composer global require php-coveralls/php-coveralls:^2.4
@@ -144,6 +148,7 @@ jobs:
144148
COVERALLS_FLAG_NAME: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
145149

146150
coveralls-finish:
151+
if: github.repository_owner == 'codeigniter4'
147152
needs: [tests]
148153
runs-on: ubuntu-20.04
149154
steps:

‎CHANGELOG.md

+57-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,63 @@
44

55
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.2...HEAD)
66

7-
## [v4.1.2](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.2) (2021-05-17)
7+
**Fixed bugs:**
8+
9+
- Bug: Error using SQLITE3 strftime in CodeIgniter 4.1.2 [\#4760](https://github.com/codeigniter4/CodeIgniter4/issues/4760)
10+
- Bug: Caching something through cron, is not accessible in the web application [\#4751](https://github.com/codeigniter4/CodeIgniter4/issues/4751)
11+
- Bug: SQLite Drop Column [\#4746](https://github.com/codeigniter4/CodeIgniter4/issues/4746)
12+
- Bug: CURL Class - BaseURI options notworking [\#4713](https://github.com/codeigniter4/CodeIgniter4/issues/4713)
13+
- Bug: autorouting [\#4711](https://github.com/codeigniter4/CodeIgniter4/issues/4711)
14+
- Bug: curlrequest not using baseURI on localhost [\#4707](https://github.com/codeigniter4/CodeIgniter4/issues/4707)
15+
- Bug: cli not working with cron [\#4699](https://github.com/codeigniter4/CodeIgniter4/issues/4699)
16+
17+
**Closed issues:**
18+
19+
- Bug: Class 'Locale' not found [\#4775](https://github.com/codeigniter4/CodeIgniter4/issues/4775)
20+
- Bug: deprecated notice on CodeIgniter\HTTP\RequestInterface::getMethod\(\) [\#4717](https://github.com/codeigniter4/CodeIgniter4/issues/4717)
21+
- Allow to join models between primary keys and foreign keys [\#4714](https://github.com/codeigniter4/CodeIgniter4/issues/4714)
22+
- DateTime::\_\_construct\(\): Failed to parse time string \(\) at position 0 \(�\): Unexpected character [\#4708](https://github.com/codeigniter4/CodeIgniter4/issues/4708)
23+
- Bug: Query Builder breaks with SQL function LENGTH\(\) and column name "row" [\#4687](https://github.com/codeigniter4/CodeIgniter4/issues/4687)
24+
25+
**Merged pull requests:**
26+
27+
- Expand Query named binds recognition [\#4769](https://github.com/codeigniter4/CodeIgniter4/pull/4769) ([paulbalandan](https://github.com/paulbalandan))
28+
- \[Rector\] Remove @var from class constant [\#4766](https://github.com/codeigniter4/CodeIgniter4/pull/4766) ([samsonasik](https://github.com/samsonasik))
29+
- Set WarningsReturnAsErrors = 0 before connection [\#4762](https://github.com/codeigniter4/CodeIgniter4/pull/4762) ([obelisk-services](https://github.com/obelisk-services))
30+
- \[Rector\] Apply Rector: VarConstantCommentRector [\#4759](https://github.com/codeigniter4/CodeIgniter4/pull/4759) ([samsonasik](https://github.com/samsonasik))
31+
- \[Autoloader\] include\_once is not needed on Autoloader::loadClass\(\) with no namespace [\#4756](https://github.com/codeigniter4/CodeIgniter4/pull/4756) ([samsonasik](https://github.com/samsonasik))
32+
- Fix imagemagick build [\#4755](https://github.com/codeigniter4/CodeIgniter4/pull/4755) ([michalsn](https://github.com/michalsn))
33+
- \[Rector\] Apply Rector: MoveVariableDeclarationNearReferenceRector [\#4752](https://github.com/codeigniter4/CodeIgniter4/pull/4752) ([samsonasik](https://github.com/samsonasik))
34+
- SQLite3 "nullable" [\#4749](https://github.com/codeigniter4/CodeIgniter4/pull/4749) ([MGatner](https://github.com/MGatner))
35+
- Remove $response variable at ControllerResponse::\_\_construct\(\) as never defined [\#4747](https://github.com/codeigniter4/CodeIgniter4/pull/4747) ([samsonasik](https://github.com/samsonasik))
36+
- Use variable for Config/Paths config to reduce repetitive definition [\#4745](https://github.com/codeigniter4/CodeIgniter4/pull/4745) ([samsonasik](https://github.com/samsonasik))
37+
- \[Rector\] Apply Rector : ListToArrayDestructRector [\#4743](https://github.com/codeigniter4/CodeIgniter4/pull/4743) ([samsonasik](https://github.com/samsonasik))
38+
- Add default TTL [\#4742](https://github.com/codeigniter4/CodeIgniter4/pull/4742) ([MGatner](https://github.com/MGatner))
39+
- update return sample of `dot array\_search\(\)` [\#4740](https://github.com/codeigniter4/CodeIgniter4/pull/4740) ([totoprayogo1916](https://github.com/totoprayogo1916))
40+
- Additional check for `$argv` variable when detecting CLI [\#4739](https://github.com/codeigniter4/CodeIgniter4/pull/4739) ([paulbalandan](https://github.com/paulbalandan))
41+
- Ensure variable declarations [\#4737](https://github.com/codeigniter4/CodeIgniter4/pull/4737) ([jeromegamez](https://github.com/jeromegamez))
42+
- Fix setting of value in Cookie's flag attributes [\#4736](https://github.com/codeigniter4/CodeIgniter4/pull/4736) ([paulbalandan](https://github.com/paulbalandan))
43+
- Add missing imports [\#4735](https://github.com/codeigniter4/CodeIgniter4/pull/4735) ([jeromegamez](https://github.com/jeromegamez))
44+
- Add environment spark command [\#4734](https://github.com/codeigniter4/CodeIgniter4/pull/4734) ([paulbalandan](https://github.com/paulbalandan))
45+
- Remove explicit condition that is always true [\#4731](https://github.com/codeigniter4/CodeIgniter4/pull/4731) ([jeromegamez](https://github.com/jeromegamez))
46+
- Deduplicate code [\#4730](https://github.com/codeigniter4/CodeIgniter4/pull/4730) ([jeromegamez](https://github.com/jeromegamez))
47+
- Replace `isset\(\)` with the `??` null coalesce operator [\#4729](https://github.com/codeigniter4/CodeIgniter4/pull/4729) ([jeromegamez](https://github.com/jeromegamez))
48+
- Remove unused imports [\#4728](https://github.com/codeigniter4/CodeIgniter4/pull/4728) ([jeromegamez](https://github.com/jeromegamez))
49+
- Fix truncated SCRIPT\_NAME [\#4726](https://github.com/codeigniter4/CodeIgniter4/pull/4726) ([MGatner](https://github.com/MGatner))
50+
- Expand CLI detection [\#4725](https://github.com/codeigniter4/CodeIgniter4/pull/4725) ([paulbalandan](https://github.com/paulbalandan))
51+
- \[Rector\] Add custom Rector Rule: RemoveErrorSuppressInTryCatchStmtsRector rector rule [\#4724](https://github.com/codeigniter4/CodeIgniter4/pull/4724) ([samsonasik](https://github.com/samsonasik))
52+
- Test with MySQL 8 [\#4721](https://github.com/codeigniter4/CodeIgniter4/pull/4721) ([jeromegamez](https://github.com/jeromegamez))
53+
- Replace URI string casts [\#4716](https://github.com/codeigniter4/CodeIgniter4/pull/4716) ([MGatner](https://github.com/MGatner))
54+
- Format URI directly [\#4715](https://github.com/codeigniter4/CodeIgniter4/pull/4715) ([MGatner](https://github.com/MGatner))
55+
- Additional File functions [\#4712](https://github.com/codeigniter4/CodeIgniter4/pull/4712) ([MGatner](https://github.com/MGatner))
56+
- Remove unused private rowOffset property in Database/SQLSRV/Result.php [\#4709](https://github.com/codeigniter4/CodeIgniter4/pull/4709) ([samsonasik](https://github.com/samsonasik))
57+
- Check for configured instead of hard-coded database in DbUtilsTest [\#4705](https://github.com/codeigniter4/CodeIgniter4/pull/4705) ([jeromegamez](https://github.com/jeromegamez))
58+
- Revert UG margins [\#4704](https://github.com/codeigniter4/CodeIgniter4/pull/4704) ([MGatner](https://github.com/MGatner))
59+
- Create .git/hooks directory if not already present [\#4703](https://github.com/codeigniter4/CodeIgniter4/pull/4703) ([jeromegamez](https://github.com/jeromegamez))
60+
- Annotate specifically designed slow tests with custom limits [\#4698](https://github.com/codeigniter4/CodeIgniter4/pull/4698) ([paulbalandan](https://github.com/paulbalandan))
61+
- Cache robustness [\#4697](https://github.com/codeigniter4/CodeIgniter4/pull/4697) ([MGatner](https://github.com/MGatner))
62+
63+
## [v4.1.2](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.2) (2021-05-18)
864

965
[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.1...v4.1.2)
1066

‎admin/RELEASE.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@ See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHA
5757
* Build the HTML version of the User Guide: `make html`
5858
* Build the ePub version of the User Guide: `make epub`
5959
* Switch to the **userguide** repo and create a new branch `release-4.x.x`
60-
* Copy the contents of **CodeIgniter4/user_guide_src/build/html** into **docs/**
60+
* Replace **docs/** with **CodeIgniter4/user_guide_src/build/html**
61+
* Ensure the file **docs/.nojekyll** exists or GitHub Pages will ignore folders with an underscore prefix
6162
* Copy **CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub** to **./CodeIgniter4.x.x.epub**
6263
* Commit the changes with "Update for 4.x.x" and push to origin
6364
* Create a new PR from `release-4.x.x` to `develop`:
6465
* Title: "Update for 4.x.x"
6566
* Description: blank
66-
* Merge the PR then fast-forward `develop` to catch the merge commit
67+
* Merge the PR
6768
* Create a new Release:
6869
* Version: "v4.x.x"
6970
* Title: "CodeIgniter 4.x.x User Guide"
@@ -74,7 +75,7 @@ See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHA
7475

7576
Currently the User Guide on the website has to be updated manually. Visit Jim's user home
7677
where the served directory **codeigniter.com** exists. Copy the latest **docs** folder from
77-
the User Guide repo into **public** and updated the symlink.
78+
the User Guide repo to **public/userguide4** and browse to the website to make sure it works.
7879

7980
## Announcement
8081

‎admin/setup.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
# Install a pre-commit hook that
44
# automatically runs phpcs to fix styles
5+
mkdir -p .git/hooks
56
cp admin/pre-commit .git/hooks/pre-commit
67
chmod +x .git/hooks/pre-commit

‎app/Config/Cache.php

+15
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,21 @@ class Cache extends BaseConfig
8282
*/
8383
public $prefix = '';
8484

85+
/**
86+
* --------------------------------------------------------------------------
87+
* Default TTL
88+
* --------------------------------------------------------------------------
89+
*
90+
* The default number of seconds to save items when none is specified.
91+
*
92+
* WARNING: This is not used by framework handlers where 60 seconds is
93+
* hard-coded, but may be useful to projects and modules. This will replace
94+
* the hard-coded value in a future release.
95+
*
96+
* @var integer
97+
*/
98+
public $ttl = 60;
99+
85100
/**
86101
* --------------------------------------------------------------------------
87102
* File settings

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"fakerphp/faker": "^1.9",
2020
"mikey179/vfsstream": "^1.6",
2121
"nexusphp/tachycardia": "^1.0",
22-
"phpstan/phpstan": "0.12.86",
22+
"phpstan/phpstan": "0.12.88",
2323
"phpunit/phpunit": "^9.1",
2424
"predis/predis": "^1.1",
25-
"rector/rector": "0.11.2",
25+
"rector/rector": "0.11.8",
2626
"squizlabs/php_codesniffer": "^3.3",
2727
"symplify/package-builder": "^9.3"
2828
},

0 commit comments

Comments
 (0)