Skip to content

Commit d7a47e1

Browse files
committed
Merge branch 'develop' into 1.2
# Conflicts: # composer.json
2 parents a1d5f5c + d2c1d59 commit d7a47e1

File tree

226 files changed

+5501
-3447
lines changed

Some content is hidden

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

226 files changed

+5501
-3447
lines changed

.github/ISSUE_TEMPLATE/1_BUG_REPORT.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ body:
2727
label: PHP Version
2828
description: Please provide us the branch of PHP version. For example, for PHP version 7.4.9, select `7.4`, or for PHP version 8.0.1, select `8.0`.
2929
options:
30+
- 8.4
31+
- 8.3
32+
- 8.2
3033
- 8.1
3134
- 8.0
3235
- 7.4

.github/workflows/code-quality.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install PHP and PHP Code Sniffer
2828
uses: shivammathur/setup-php@v2
2929
with:
30-
php-version: 8.0
30+
php-version: 8.2
3131
extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
3232
tools: phpcs
3333

.github/workflows/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Update manifest
1212
runs-on: ubuntu-latest
1313
env:
14-
phpVersion: '8.1'
14+
phpVersion: '8.2'
1515
extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
1616
key: winter-cms-cache-develop
1717
steps:

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: ${{ matrix.operatingSystem }} / JavaScript
1919
env:
2020
nodeVersion: 16
21-
phpVersion: '8.0'
21+
phpVersion: '8.2'
2222
extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
2323
key: winter-cms-cache-develop
2424
steps:
@@ -96,7 +96,7 @@ jobs:
9696
max-parallel: 8
9797
matrix:
9898
operatingSystem: [ubuntu-latest, windows-latest]
99-
phpVersion: ['8.0', '8.1', '8.2', '8.3']
99+
phpVersion: ['8.1', '8.2', '8.3', '8.4']
100100
fail-fast: false
101101
runs-on: ${{ matrix.operatingSystem }}
102102
name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
@@ -121,7 +121,7 @@ jobs:
121121
key: ${{ env.key }}
122122

123123
- name: Cache extensions
124-
uses: actions/cache@v2
124+
uses: actions/cache@v3
125125
with:
126126
path: ${{ steps.extcache.outputs.dir }}
127127
key: ${{ steps.extcache.outputs.key }}
@@ -154,7 +154,7 @@ jobs:
154154
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
155155

156156
- name: Cache dependencies
157-
uses: actions/cache@v2
157+
uses: actions/cache@v3
158158
with:
159159
path: ${{ steps.composercache.outputs.dir }}
160160
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

README.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,30 +83,28 @@ In order to ensure that the Winter community is welcoming to all, please review
8383

8484
## Sponsors
8585

86-
Winter CMS development is financially supported by the generosity of the following sponsors:
86+
Winter CMS development is financially supported by the generosity of the following sponsors. If you would like to have your name, company and link added to this list and support open-source development, feel free to make a donation to our [Open Collective](https://opencollective.com/wintercms).
8787

8888
### Organizations
8989

90-
[![Route4Me logo, Route Planning and Route Mapping](https://raw.githubusercontent.com/wintercms/winter/develop/.github/assets/sponsor-route4me.png)](https://route4me.com/?utm_source=wintercms)
90+
<a href="https://laravel.com/?ref=wintercms" target="_blank">
91+
<img src="https://raw.githubusercontent.com/laravel/art/refs/heads/master/logo-type/5%20svg/3%20RGB/1%20Full%20Color/laravel-logotype-rgb-red.svg" alt="Laravel logo" width="300">
92+
</a>
9193

92-
Route4Me is a [Premium Sponsor to the Winter CMS Open Collective](https://opencollective.com/wintercms).
94+
Laravel provides [Laravel Vapor](https://vapor.laravel.com/?ref=wintercms) to the Winter CMS project which is used to power the serverless PHP hosting used for our [main website and documentation](https://wintercms.com/).
9395

94-
[![Froala logo](https://froala.com/wp-content/uploads/2019/10/froala.svg)](https://froala.com/wysiwyg-editor/)
96+
<a href="https://froala.com/wysiwyg-editor/" target="_blank">
97+
<img src="https://froala.com/wp-content/uploads/2019/10/froala.svg" alt="Froala logo" width="300">
98+
</a>
9599

96100
Froala provides a perpetual, Enterprise license to Winter CMS which allows us and our users to use the Froala WYSIWYG Editor in Winter CMS powered projects.
97101

98-
Big thanks to our sponsors on OpenCollective:
99-
100-
- [FrogeHost](https://froge.host/?utm_source=wintercms)
101-
102102
### Individuals
103103

104104
Big thanks to our sponsors on OpenCollective:
105105

106106
- Orville
107107

108-
If you would like to have your name, company and link added to this list and support open-source development, feel free to make a donation to our [Open Collective](https://opencollective.com/wintercms).
109-
110108
## License
111109

112110
The Winter platform is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"source": "https://github.com/wintercms/winter"
3030
},
3131
"require": {
32-
"php": "^8.0.2",
32+
"php": ">=8.1",
3333
"winter/storm": "~1.2.0",
3434
"winter/wn-system-module": "~1.2.0",
3535
"winter/wn-backend-module": "~1.2.0",

config/app.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
*/
6464

6565
'asset_url' => env('ASSET_URL', null),
66-
66+
6767
/*
6868
|--------------------------------------------------------------------------
6969
| Temporary Path
@@ -195,6 +195,19 @@
195195

196196
'timezone' => 'UTC',
197197

198+
/*
199+
|--------------------------------------------------------------------------
200+
| Scheduler Timezone
201+
|--------------------------------------------------------------------------
202+
|
203+
| This property specifies the default timezone for your application's
204+
| scheduled tasks. You can set it independently of the application's
205+
| default timezone to ensure that schedules run at the desired local time.
206+
|
207+
*/
208+
209+
'schedule_timezone' => 'UTC',
210+
198211
/*
199212
|--------------------------------------------------------------------------
200213
| Application Locale Configuration

0 commit comments

Comments
 (0)