Skip to content

Commit 0d55c43

Browse files
authored
[Next Major Version] Davis 5.0.0 (#135)
1 parent a0fd679 commit 0d55c43

File tree

77 files changed

+3060
-3408
lines changed

Some content is hidden

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

77 files changed

+3060
-3408
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DATABASE_DRIVER=mysql # or postgresql, or sqlite
2727
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
2828
# For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=UTF-8"
2929
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db" (without the quotes so Symfony can resolve it if it's an absolute path)
30-
DATABASE_URL="mysql://davis:[email protected]:3306/davis?serverVersion=mariadb-10.6.10&charset=utf8mb4"
30+
DATABASE_URL="mysql://davis:[email protected]:3306/davis?serverVersion=10.9.3-MariaDB&charset=utf8mb4"
3131
###< doctrine/doctrine-bundle ###
3232

3333
###> symfony/mailer ###

.env.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ SYMFONY_DEPRECATIONS_HELPER=999999
55
PANTHER_APP_ENV=panther
66
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
77

8+
DATABASE_URL="mysql://davis:[email protected]:3306/davis_test?serverVersion=10.9.3-MariaDB&charset=utf8mb4"
9+
810
MAILER_DSN=smtp://localhost:465?encryption=ssl&auth_mode=login&username=&password=

.github/workflows/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ env:
1313
SYMFONY_DEPRECATIONS_HELPER: max[self]=0
1414
ADMIN_LOGIN: admin
1515
ADMIN_PASSWORD: test
16-
DATABASE_URL: mysql://user:password@mysql:3306/test_db
16+
DATABASE_URL: mysql://davis:davis@mysql:3306/davis_test
1717

1818
jobs:
1919
analyze:
2020
name: Analyze
2121
runs-on: ubuntu-latest
2222
container:
23-
image: php:8.2-alpine
23+
image: php:8.3-alpine
2424
options: >-
2525
--tmpfs /tmp:exec
2626
--tmpfs /var/tmp:exec
@@ -51,11 +51,12 @@ jobs:
5151
--tmpfs /var/tmp:exec
5252
services:
5353
mysql:
54-
image: mariadb:10.7
54+
image: mariadb:10.11
5555
env:
56-
MYSQL_DATABASE: test_db
57-
MYSQL_USER: user
58-
MYSQL_PASSWORD: password
56+
# Corresponds to what is in .env.test
57+
MYSQL_DATABASE: davis_test
58+
MYSQL_USER: davis
59+
MYSQL_PASSWORD: davis
5960
MYSQL_ROOT_PASSWORD: root
6061
options: >-
6162
--health-cmd "mysqladmin ping"
@@ -67,9 +68,8 @@ jobs:
6768
strategy:
6869
matrix:
6970
php:
70-
- '8.0'
71-
- '8.1'
7271
- '8.2'
72+
- '8.3'
7373
fail-fast: false
7474
steps:
7575
- name: Checkout
@@ -84,7 +84,5 @@ jobs:
8484
run: wget -qO - https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
8585
- name: Install dependencies with Composer
8686
run: composer install --no-progress --no-interaction --ansi
87-
- name: Migrate database
88-
run: bin/console doctrine:schema:update --force --no-interaction --complete
8987
- name: Run tests with PHPUnit
9088
run: vendor/bin/phpunit --process-isolation --colors=always

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Davis
66
[![Latest release][release_badge]][release_link]
77
[![Sponsor me][sponsor_badge]][sponsor_link]
88

9-
A simple, fully translatable admin interface and frontend for `sabre/dav` based on [Symfony 5](https://symfony.com/) and [Bootstrap 5](https://getbootstrap.com/), initially inspired by [Baïkal](https://github.com/sabre-io/Baikal).
9+
A simple, fully translatable admin interface and frontend for `sabre/dav` based on [Symfony 7](https://symfony.com/) and [Bootstrap 5](https://getbootstrap.com/), initially inspired by [Baïkal](https://github.com/sabre-io/Baikal).
1010

1111
Provides user edition, calendar creation and sharing, and address book creation. The interface is simple and straightforward, responsive, and provides a light and a dark mode.
1212

@@ -28,7 +28,7 @@ Created and maintained (with the help of the community) by [@tchapi](https://git
2828

2929
# 🔩 Requirements
3030

31-
- PHP > 7.3.0 (with `pdo_mysql` [or `pdo_pgsql`, `pdo_sqlite`], `gd` and `intl` extensions), compatible up to PHP 8.2 (_See dependencies table below_)
31+
- PHP > 8.2 (with `pdo_mysql` [or `pdo_pgsql`, `pdo_sqlite`], `gd` and `intl` extensions), compatible up to PHP 8.3 (_See dependencies table below_)
3232
- A compatible database layer, such as MySQL or MariaDB (recommended), PostgreSQL (not extensively tested yet) or SQLite (not extensively tested yet)
3333
- Composer > 2 (_The last release compatible with Composer 1 is [v1.6.2](https://github.com/tchapi/davis/releases/tag/v1.6.2)_)
3434
- The [`imap`](https://www.php.net/manual/en/imap.installation.php) and [`ldap`](https://www.php.net/manual/en/ldap.installation.php) PHP extensions if you want to use either authentication methods (_these are not enabled / compiled by default except in the Docker image_)
@@ -38,8 +38,8 @@ Dependencies
3838

3939
| Release | Status | PHP version |
4040
|--------------------|----------------------------|--------------------|
41-
| `main` (edge) | development branch | PHP 8.0+ |
42-
| `v4.x` | active | PHP 8.0+ |
41+
| `main` (edge) | development branch | PHP 8.2+ |
42+
| `v4.x` | security fixes only | PHP 8.0 → 8.3 |
4343
| `v3.x` | security fixes only | PHP 7.3 → 8.2 |
4444

4545
# 🧰 Installation

composer.json

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,59 @@
44
"type": "project",
55
"license": "MIT",
66
"require": {
7-
"php": "^8.0",
7+
"php": "^8.2",
88
"ext-ctype": "*",
99
"ext-gd": "*",
1010
"ext-iconv": "*",
1111
"composer-runtime-api": "^2",
1212
"dantsu/php-osm-static-api": "^0.6.4",
13-
"doctrine/annotations": "^1.14.3",
14-
"doctrine/doctrine-bundle": "^2.4",
15-
"doctrine/doctrine-migrations-bundle": "^3.1",
16-
"doctrine/orm": "^2.9",
17-
"phpdocumentor/reflection-docblock": "^5.3",
13+
"doctrine/doctrine-bundle": "^2.11.2",
14+
"doctrine/doctrine-migrations-bundle": "^3.3.0",
15+
"doctrine/orm": "^2.18",
1816
"sabre/dav": "^4.6.0",
1917
"symfony/apache-pack": "^1.0.1",
20-
"symfony/asset": "^5.4.21",
21-
"symfony/console": "^5.4.21",
22-
"symfony/dotenv": "^5.4.21",
23-
"symfony/expression-language": "^5.4.21",
24-
"symfony/flex": "^1.21.2",
25-
"symfony/form": "^5.4.21",
26-
"symfony/framework-bundle": "^5.4.21",
27-
"symfony/http-client": "^5.4.21",
28-
"symfony/intl": "^5.4.21",
29-
"symfony/mailer": "^5.4.21",
18+
"symfony/asset": "^7.0",
19+
"symfony/console": "^7.0",
20+
"symfony/dotenv": "^7.0",
21+
"symfony/expression-language": "^7.0",
22+
"symfony/flex": "^2.4.4",
23+
"symfony/form": "^7.0",
24+
"symfony/framework-bundle": "^7.0",
25+
"symfony/http-client": "^7.0",
26+
"symfony/intl": "^7.0",
27+
"symfony/mailer": "^7.0",
3028
"symfony/monolog-bundle": "^3.10.0",
31-
"symfony/process": "^5.4.21",
32-
"symfony/property-access": "^5.4.21",
33-
"symfony/property-info": "^5.4.21",
34-
"symfony/proxy-manager-bridge": "^5.4.21",
35-
"symfony/runtime": "^5.4.21",
36-
"symfony/security-bundle": "^5.4.21",
37-
"symfony/security-guard": "^5.4.21",
38-
"symfony/serializer": "^5.4.21",
39-
"symfony/translation": "^5.4.21",
40-
"symfony/twig-bundle": "^5.4.21",
41-
"symfony/validator": "^5.4.21",
42-
"symfony/web-link": "^5.4.21",
43-
"symfony/yaml": "^5.4.21"
29+
"symfony/process": "^7.0",
30+
"symfony/property-access": "^7.0",
31+
"symfony/property-info": "^7.0",
32+
"symfony/runtime": "^7.0",
33+
"symfony/security-bundle": "^7.0",
34+
"symfony/serializer": "^7.0",
35+
"symfony/translation": "^7.0",
36+
"symfony/twig-bundle": "^7.0",
37+
"symfony/validator": "^7.0",
38+
"symfony/web-link": "^7.0",
39+
"symfony/yaml": "^7.0"
4440
},
4541
"require-dev": {
46-
"friendsofphp/php-cs-fixer": "^3.46.0",
47-
"phpunit/phpunit": "^9.6",
48-
"symfony/browser-kit": "^5.4.21",
49-
"symfony/css-selector": "^5.4.21",
50-
"symfony/debug-bundle": "^5.4.21",
51-
"symfony/maker-bundle": "^1.40",
52-
"symfony/phpunit-bridge": "^5.4.21",
53-
"symfony/stopwatch": "^5.4.21",
54-
"symfony/web-profiler-bundle": "^5.4.21"
42+
"doctrine/doctrine-fixtures-bundle": "^3.5",
43+
"friendsofphp/php-cs-fixer": "^3.49.0",
44+
"phpunit/phpunit": "^10.5.10",
45+
"symfony/browser-kit": "^7.0",
46+
"symfony/css-selector": "^7.0",
47+
"symfony/debug-bundle": "^7.0",
48+
"symfony/maker-bundle": "^1.54",
49+
"symfony/phpunit-bridge": "^7.0",
50+
"symfony/stopwatch": "^7.0",
51+
"symfony/web-profiler-bundle": "^7.0"
5552
},
5653
"config": {
5754
"preferred-install": {
5855
"*": "dist"
5956
},
6057
"sort-packages": true,
6158
"platform": {
62-
"php": "8.0.28"
59+
"php": "8.2.15"
6360
},
6461
"allow-plugins": {
6562
"composer/package-versions-deprecated": true,
@@ -77,14 +74,6 @@
7774
"App\\Tests\\": "tests/"
7875
}
7976
},
80-
"replace": {
81-
"paragonie/random_compat": "2.*",
82-
"symfony/polyfill-ctype": "*",
83-
"symfony/polyfill-iconv": "*",
84-
"symfony/polyfill-php71": "*",
85-
"symfony/polyfill-php70": "*",
86-
"symfony/polyfill-php56": "*"
87-
},
8877
"scripts": {
8978
"auto-scripts": {
9079
"cache:clear": "symfony-cmd",
@@ -103,7 +92,7 @@
10392
"extra": {
10493
"symfony": {
10594
"allow-contrib": false,
106-
"require": "5.4.*"
95+
"require": "7.0.*"
10796
}
10897
}
10998
}

0 commit comments

Comments
 (0)