Skip to content

Commit 7be6b60

Browse files
authored
Merge pull request #992 from codeigniter4/develop
1.0.0 Ready code
2 parents 434e5a0 + 5218ff4 commit 7be6b60

File tree

25 files changed

+224
-155
lines changed

25 files changed

+224
-155
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616
- name: Setup Python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: 3.x
2020
- name: Install Dependencies

UPGRADING.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Upgrade Guide
22

3+
## Version 1.0.0-beta.8 to 1.0.0
4+
5+
## Removed Deprecated Items
6+
7+
The [$supportOldDangerousPassword](#if-you-want-to-allow-login-with-existing-passwords)
8+
feature for backward compatiblity has been removed. The old passwords saved in
9+
Shield v1.0.0-beta.3 or earlier are no longer supported.
10+
311
## Version 1.0.0-beta.7 to 1.0.0-beta.8
412

513
### Mandatory Config Changes

admin/RELEASE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ the changelog.
3838

3939
* [ ] Clone **codeigniter4/shield** and resolve any necessary PRs
4040
```console
41+
rm -rf shield.bk
42+
mv shield shield.bk
4143
git clone [email protected]:codeigniter4/shield.git
4244
```
4345
* [ ] Merge any Security Advisory PRs in private forks

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"mockery/mockery": "^1.0",
3838
"phpstan/extension-installer": "^1.3",
3939
"phpstan/phpstan-strict-rules": "^1.5",
40-
"rector/rector": "0.18.10"
40+
"rector/rector": "0.18.13"
4141
},
4242
"provide": {
4343
"codeigniter4/authentication-implementation": "1.0"

docs/CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shield.codeigniter.com

docs/assets/css/codeigniter.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[data-md-color-scheme="codeigniter"] {
2+
--md-primary-fg-color: #dd4814;
3+
--md-primary-fg-color--light: #ECB7B7;
4+
--md-primary-fg-color--dark: #90030C;
5+
6+
--md-default-bg-color: #fcfcfc;
7+
8+
--md-typeset-a-color: #e74c3c;
9+
--md-accent-fg-color: #97310e;
10+
11+
--md-accent-fg-color--transparent: #ECB7B7;
12+
13+
--md-code-bg-color: #ffffff;
14+
15+
.md-typeset code {
16+
border: 1px solid #e1e4e5;
17+
}
18+
}

docs/assets/css/dark_mode.css renamed to docs/assets/css/codeigniter_dark_mode.css

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
[data-md-color-scheme="slate"] {
2-
--md-primary-fg-color: #6a290d;
2+
--md-primary-fg-color: #b13a10;
33
--md-primary-fg-color--light: #8d7474;
44
--md-primary-fg-color--dark: #6d554d;
55

6+
--md-default-bg-color: #1e2129;
7+
8+
--md-typeset-a-color: #ed6436;
9+
--md-accent-fg-color: #f18a67;
10+
11+
--md-accent-fg-color--transparent: #625151;
12+
13+
--md-code-bg-color: #282b2d;
14+
615
.hljs-title,
716
.hljs-title.class_,
817
.hljs-title.class_.inherited__,
@@ -43,31 +52,30 @@
4352
color: #ddba52
4453
}
4554

46-
.md-typeset .note > .admonition-title,
47-
.md-typeset .note > summary {
48-
background-color: #0000001a;
55+
.md-typeset code {
56+
border: 1px solid #3f4547;
4957
}
5058

5159
.md-typeset .admonition.note,
5260
.md-typeset details.note {
53-
border-color: #675647;
61+
border-color: #2c5293;
5462
}
5563

5664
.md-typeset .note > .admonition-title:before,
5765
.md-typeset .note > summary:before {
58-
background-color: #65686d;
66+
background-color: #2c5293;
5967
-webkit-mask-image: var(--md-admonition-icon--note);
6068
mask-image: var(--md-admonition-icon--note);
6169
}
6270

6371
.md-typeset .admonition.warning,
6472
.md-typeset details.warning {
65-
border-color: #776144;
73+
border-color: #97631e;
6674
}
6775

6876
.md-typeset .warning > .admonition-title:before,
6977
.md-typeset .warning > summary:before {
70-
background-color: #d9913bc2;
78+
background-color: #97631e;
7179
-webkit-mask-image: var(--md-admonition-icon--warning);
7280
mask-image: var(--md-admonition-icon--warning);
7381
}

docs/assets/js/hljs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
document.addEventListener('DOMContentLoaded', (event) => {
1+
window.document$.subscribe(() => {
22
hljs.highlightAll();
33
});

docs/customization/adding_attributes_to_users.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ php spark db:table users
7474

7575
See [Customizing User Provider](./user_provider.md).
7676

77+
Don't forget to add the added attributes to the `$allowedFields` property.
78+
7779
## Update Validation Rules
7880

7981
You need to update the [validation rules](./validation_rules.md) for registration.

docs/customization/route_config.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ $routes->get('register', '\App\Controllers\Auth\RegisterController::registerView
1919

2020
After customization, check your routes with the [spark routes](https://codeigniter.com/user_guide/incoming/routing.html#spark-routes) command.
2121

22+
## Change Namespace
23+
24+
If you are overriding all of the auth controllers, you can specify the namespace as an option to the `routes()` helper:
25+
26+
```php
27+
service('auth')->routes($routes, ['namespace' => '\App\Controllers\Auth']);
28+
```
29+
30+
This will generate the routes with the specified namespace instead of the default Shield namespace. This can be combined with any other options, like `except`.
31+
2232
## Use Locale Routes
2333

2434
You can use the `{locale}` placeholder in your routes

0 commit comments

Comments
 (0)