Skip to content
Draft

v6 #22

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"source": "https://github.com/getkirby/plainkit"
},
"require": {
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"getkirby/cms": "^5.2"
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
"getkirby/cms": "^6.0.0-beta.1"
},
"config": {
"allow-plugins": {
Expand Down
6 changes: 5 additions & 1 deletion content/error/error.txt
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
Title: Error
Title: Error

----

Uuid: dqiognp770t85fkb
6 changes: 5 additions & 1 deletion content/home/home.txt
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
Title: Home
Title: Home

----

Uuid: nmr3oz1rok707lxb
1,159 changes: 1,159 additions & 0 deletions kirby/CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions kirby/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ We use an [`.editorconfig`](https://editorconfig.org) file to enforce basic form

We use [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to ensure a consistent style for our PHP code. It is mainly based on [PSR-12](https://www.php-fig.org/psr/psr-12/). Run `composer fix` in the `kirby` folder to check for inconsistencies and fix them (this runs PHP CS Fixer through [`cpx`](#development-setup), no separate installation needed). Our automated PR checks will fail if there are code style issues with your code.

#### Frontend/Panel (JavaScript, Vue)
#### Frontend/Panel (JavaScript, TypeScript, Vue)

We use [Prettier](https://prettier.io) to ensure a consistent style for our JavaScript and Vue code. After running `npm install` in the `kirby/panel` folder, you can run `npm run format` to check for inconsistencies and fix them. We also use [ESLint](https://eslint.org) which you can use by running `npm run lint` and/or `npm run lint:fix`.
We use [Oxfmt](https://oxc.rs/docs/guide/usage/formatter) to ensure a consistent style for our JavaScript, TypeScript and Vue code. After running `npm install` in the `kirby/panel` folder, you can run `npm run format` to check for inconsistencies and `npm run format:fix` to fix them. We also use [ESLint](https://eslint.org) which you can use by running `npm run lint` and/or `npm run lint:fix`.

### Documentation

Expand Down
4 changes: 2 additions & 2 deletions kirby/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
defined('KIRBY_PHP_VERSION_CHECK') !== true ||
KIRBY_PHP_VERSION_CHECK !== false
) && (
version_compare(PHP_VERSION, '8.2.0', '>=') === false ||
version_compare(PHP_VERSION, '8.6.0', '<') === false
version_compare(PHP_VERSION, '8.3.0', '>=') === false ||
version_compare(PHP_VERSION, '8.7.0', '<') === false
)
) {
http_response_code(503);
Expand Down
176 changes: 121 additions & 55 deletions kirby/cacert.pem

Large diffs are not rendered by default.

41 changes: 19 additions & 22 deletions kirby/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Kirby core",
"license": "proprietary",
"type": "kirby-cms",
"version": "5.6.1",
"version": "6.0.0-beta.4",
"keywords": [
"kirby",
"cms",
Expand All @@ -24,7 +24,7 @@
"source": "https://github.com/getkirby/kirby"
},
"require": {
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"php": "~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0",
"ext-ctype": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand All @@ -36,22 +36,20 @@
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-simplexml": "*",
"christian-riesen/base32": "1.6.0",
"claviska/simpleimage": "4.4.0",
"composer/semver": "3.5.1",
"erusev/parsedown": "1.8.0",
"erusev/parsedown-extra": "0.9.0",
"filp/whoops": "2.18.6",
"christian-riesen/base32": "^2.0.1",
"claviska/simpleimage": "^4.4.2",
"composer/semver": "^3.6.0",
"erusev/parsedown": "^1.8.0",
"erusev/parsedown-extra": "^0.9.0",
"filp/whoops": "^2.19.3",
"getkirby/composer-installer": "^1.2.1",
"laminas/laminas-escaper": "2.18.0",
"michelf/php-smartypants": "1.8.1",
"phpmailer/phpmailer": "7.1.1",
"symfony/polyfill-intl-idn": "1.43.0",
"symfony/polyfill-mbstring": "1.43.0",
"symfony/yaml": "7.4.20"
},
"replace": {
"symfony/polyfill-php72": "*"
"laminas/laminas-escaper": "^2.19.0",
"lbuchs/webauthn": "^2.2",
"michelf/php-smartypants": "^1.8.1",
"phpmailer/phpmailer": "^7.2.0",
"symfony/polyfill-intl-idn": "^1.43.0",
"symfony/polyfill-mbstring": "^1.43.3",
"symfony/yaml": "^7.4.23"
},
"suggest": {
"ext-apcu": "Support for the Apcu cache driver",
Expand Down Expand Up @@ -96,16 +94,15 @@
"@analyze:psalm"
],
"analyze:composer": "composer validate --strict --no-check-version --no-check-all",
"analyze:composer:unused": "./scripts/cpx icanhazstring/composer-unused:0.9.6 --no-progress",
"analyze:psalm": "./scripts/cpx vimeo/psalm:6.16.1",
"build": "./scripts/build",
"analyze:composer:unused": "cpx icanhazstring/composer-unused:0.9.6 --no-progress",
"analyze:psalm": "cpx vimeo/psalm:6.16.1",
"ci": [
"@fix",
"@analyze",
"@test"
],
"fix": "./scripts/cpx friendsofphp/php-cs-fixer:3.95.1 fix",
"test": "./scripts/cpx phpunit/phpunit:11.5.55",
"fix": "cpx getkirby/php-cs:0.2.1 fix",
"test": "cpx \"brianium/paratest:7.20.0||7.27.5\" --passthru-php=\"-dopcache.enable_cli=1 -dopcache.optimization_level=0 -dopcache.jit_buffer_size=0\"",
"test:coverage": [
"@putenv XDEBUG_MODE=coverage",
"@test --coverage-html=tests/coverage"
Expand Down
Loading