WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit e743470

Browse files
alexander-schranzalexander-schranz
committed
Merge branch '2.6' of github.com:sulu/skeleton into 3.0
 Conflicts: composer.json config/packages/monolog.yaml config/packages/sulu_document_manager.yaml
2 parents d1dbac2 + d83c3dc commit e743470

File tree

16 files changed

+94
-96
lines changed

16 files changed

+94
-96
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ MAILER_DSN=null://null
4444
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
4545
#
4646
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db"
47-
DATABASE_URL="mysql://root:[email protected]:3306/su_myapp?serverVersion=8.0.32&charset=utf8mb4"
47+
DATABASE_URL="mysql://root:[email protected]:3306/su_myapp?serverVersion=8.4.7&charset=utf8mb4"
4848
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
4949
# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
5050
###< doctrine/doctrine-bundle ###

‎.github/workflows/test-application.yaml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,23 @@ jobs:
7171
MAILER_URL: null://localhost
7272
SULU_ADMIN_EMAIL:
7373
DATABASE_URL: "mysql://root:@127.0.0.1:3306/sulu_test?serverVersion=8.0"
74-
PHP_CS_FIXER_IGNORE_ENV: true # remove when php cs fixer add support for PHP 8.4
74+
75+
- php-version: '8.5'
76+
node-version: '24'
77+
npm-version: '11'
78+
mysql-version: '8.4'
79+
create-project: true
80+
create-database: true
81+
checkout-directory: 'project'
82+
working-directory: 'create-project-test'
83+
php-extensions: 'ctype, iconv, mysql, gd'
84+
tools: 'composer:v2'
85+
env:
86+
APP_ENV: test
87+
APP_SECRET: a448d1dfcaa563fce56c2fd9981f662b
88+
MAILER_URL: null://localhost
89+
SULU_ADMIN_EMAIL:
90+
DATABASE_URL: "mysql://root:@127.0.0.1:3306/sulu_test?serverVersion=8.4.7"
7591

7692
services:
7793
mysql:

‎assets/admin/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file should only be changed by the `bin/console sulu:admin:update-build` command:
2-
// See https://docs.sulu.io/en/latest/upgrades/upgrade-2.x.html
2+
// See https://docs.sulu.io/en/2.6/upgrades/upgrade-2.x.html
33

44
// Sulu Core Bundles
55
import {startAdmin} from 'sulu-admin-bundle';

‎bin/phpunit‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,4 @@ if (!\ini_get('date.timezone')) {
77
\ini_set('date.timezone', 'UTC');
88
}
99

10-
if (\is_file(\dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit')) {
11-
if (\PHP_VERSION_ID >= 80000) {
12-
require \dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit';
13-
} else {
14-
\define('PHPUNIT_COMPOSER_INSTALL', \dirname(__DIR__) . '/vendor/autoload.php');
15-
require PHPUNIT_COMPOSER_INSTALL;
16-
PHPUnit\TextUI\Command::main();
17-
}
18-
} else {
19-
if (!\is_file(\dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
20-
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
21-
exit(1);
22-
}
23-
24-
require \dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
25-
}
10+
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';

‎compose.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ version: '3'
33
services:
44
###> doctrine/doctrine-bundle ###
55
database:
6-
# arm compatible mysql docker image
7-
image: mysql/mysql-server:${MYSQL_VERSION:-8.0} # arm and x86/x64 compatible mysql image
6+
image: mysql:${MYSQL_VERSION:-8.4}
87
environment:
98
MYSQL_DATABASE: ${MYSQL_DATABASE:-su_myapp}
109
# You should definitely change the password in production

‎composer.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
"scheb/2fa-trusted-device": "^7.3",
4040
"stof/doctrine-extensions-bundle": "^1.11",
4141
"sulu/sulu": "3.0.*",
42-
"symfony/config": "^7.3",
43-
"symfony/dotenv": "^7.3",
42+
"symfony/config": "^7.4",
43+
"symfony/dotenv": "^7.4",
4444
"symfony/flex": "^1.17 || ^2.0",
45-
"symfony/framework-bundle": "^7.3",
46-
"symfony/mailer": "^7.3",
47-
"symfony/monolog-bridge": "^7.3",
45+
"symfony/framework-bundle": "^7.4",
46+
"symfony/mailer": "^7.4",
47+
"symfony/monolog-bridge": "^7.4",
4848
"symfony/monolog-bundle": "^3.4",
49-
"symfony/runtime": "^7.3",
50-
"symfony/security-bundle": "^7.3",
51-
"symfony/twig-bundle": "^7.3"
49+
"symfony/runtime": "^7.4",
50+
"symfony/security-bundle": "^7.4",
51+
"symfony/twig-bundle": "^7.4"
5252
},
5353
"require-dev": {
5454
"cmsig/seal-memory-adapter": "^0.12.2",
@@ -64,12 +64,12 @@
6464
"phpunit/phpunit": "^11.5 || ^12.1",
6565
"rector/rector": "^2.0",
6666
"sulu/sulu-rector": "^2.0",
67-
"symfony/browser-kit": "^7.3",
68-
"symfony/css-selector": "^7.3",
69-
"symfony/debug-bundle": "^7.3",
70-
"symfony/error-handler": "^7.3",
67+
"symfony/browser-kit": "^7.4",
68+
"symfony/css-selector": "^7.4",
69+
"symfony/debug-bundle": "^7.4",
70+
"symfony/error-handler": "^7.4",
7171
"symfony/thanks": "^1.2",
72-
"symfony/web-profiler-bundle": "^7.3",
72+
"symfony/web-profiler-bundle": "^7.4",
7373
"vincentlanglet/twig-cs-fixer": "^3.0"
7474
},
7575
"conflict": {
@@ -200,7 +200,7 @@
200200
"extra": {
201201
"symfony": {
202202
"allow-contrib": true,
203-
"require": "7.3.*"
203+
"require": "7.4.*"
204204
}
205205
}
206206
}

‎config/packages/doctrine.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ doctrine:
44

55
# IMPORTANT: You MUST configure your server version,
66
# either here or in the DATABASE_URL env var (see .env file)
7-
#server_version: '8.0.27'
7+
#server_version: '8.4.7'
88

99
profiling_collect_backtrace: '%kernel.debug%'
1010
use_savepoints: true

‎config/packages/monolog.yaml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ when@dev:
1010
path: "%kernel.logs_dir%/%kernel.environment%.log"
1111
level: debug
1212
channels: ["!event"]
13-
# uncomment to get logging in your browser
14-
# you may have to allow bigger header sizes in your Web server configuration
15-
#firephp:
16-
# type: firephp
17-
# level: info
18-
#chromephp:
19-
# type: chromephp
20-
# level: info
2113
console:
2214
type: console
2315
process_psr_3_messages: false
@@ -45,6 +37,7 @@ when@prod: &prod
4537
action_level: error
4638
handler: nested
4739
excluded_http_codes: [404, 405]
40+
channels: ["!deprecation"]
4841
buffer_size: 50 # How many messages should be saved? Prevent memory leaks
4942
nested:
5043
type: stream

‎config/packages/security.yaml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,20 @@ security:
22
access_decision_manager:
33
strategy: unanimous
44
allow_if_all_abstain: true
5+
56
# https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
67
password_hashers:
78
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
9+
810
# https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
911
providers:
1012
sulu:
1113
id: sulu_security.user_provider
12-
# Easy way to control access for large sections of your site
13-
# Note: Only the *first* access control that matches will be used
14-
access_control:
15-
- { path: ^/admin/reset, roles: PUBLIC_ACCESS }
16-
- { path: ^/admin/security/reset, roles: PUBLIC_ACCESS }
17-
- { path: ^/admin/login$, roles: PUBLIC_ACCESS }
18-
- { path: ^/admin/2fa, roles: PUBLIC_ACCESS }
19-
- { path: ^/admin/_wdt, roles: PUBLIC_ACCESS }
20-
- { path: ^/admin/_profiler, roles: PUBLIC_ACCESS }
21-
- { path: ^/admin/translations, roles: PUBLIC_ACCESS }
22-
- { path: ^/admin$, roles: PUBLIC_ACCESS }
23-
- { path: ^/admin/$, roles: PUBLIC_ACCESS }
24-
- { path: ^/admin/p/, roles: PUBLIC_ACCESS }
25-
- { path: ^/admin, roles: ROLE_USER }
2614

2715
firewalls:
2816
dev:
29-
pattern: ^/(_(profiler|wdt)|css|images|js)/
17+
# Ensure dev tools and static assets are always allowed
18+
pattern: ^/(_profiler|_wdt|assets|build)/
3019
security: false
3120
admin:
3221
pattern: ^/admin(\/|$)
@@ -55,7 +44,7 @@ security:
5544
# # For an advanced user management with registration and opt-in emails have a look at the:
5645
# # https://github.com/sulu/SuluCommunityBundle
5746
# # Also have a look at the user context based caching when you output user role specific data
58-
# # https://docs.sulu.io/en/2.2/cookbook/user-context-caching.html
47+
# # https://docs.sulu.io/en/2.6/cookbook/user-context-caching.html
5948
# form_login:
6049
# login_path: login
6150
# check_path: login
@@ -67,19 +56,31 @@ security:
6756
# lifetime: 604800 # 1 week in seconds
6857
# path: /
6958
#
70-
# # activate different ways to authenticate
59+
# # Activate different ways to authenticate:
7160
# # https://symfony.com/doc/current/security.html#the-firewall
7261
#
7362
# # https://symfony.com/doc/current/security/impersonating_user.html
7463
# # switch_user: true
7564

65+
# Note: Only the *first* matching rule is applied
66+
access_control:
67+
- { path: ^/admin/reset, roles: PUBLIC_ACCESS }
68+
- { path: ^/admin/security/reset, roles: PUBLIC_ACCESS }
69+
- { path: ^/admin/login$, roles: PUBLIC_ACCESS }
70+
- { path: ^/admin/2fa, roles: PUBLIC_ACCESS }
71+
- { path: ^/admin/_wdt, roles: PUBLIC_ACCESS }
72+
- { path: ^/admin/_profiler, roles: PUBLIC_ACCESS }
73+
- { path: ^/admin/translations, roles: PUBLIC_ACCESS }
74+
- { path: ^/admin$, roles: PUBLIC_ACCESS }
75+
- { path: ^/admin/$, roles: PUBLIC_ACCESS }
76+
- { path: ^/admin/p/, roles: PUBLIC_ACCESS }
77+
- { path: ^/admin, roles: ROLE_USER }
78+
7679
when@test:
7780
security:
7881
password_hashers:
79-
# By default, password hashers are resource intensive and take time. This is
80-
# important to generate secure password hashes. In tests however, secure hashes
81-
# are not important, waste resources and increase test times. The following
82-
# reduces the work factor to the lowest possible values.
82+
# Password hashers are resource-intensive by design to ensure security.
83+
# In tests, it's safe to reduce their cost to improve performance.
8384
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
8485
algorithm: auto
8586
cost: 4 # Lowest possible value for bcrypt

‎config/packages/sulu_http_cache.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ when@prod: &prod
66

77
# Varnish Configuration:
88
#
9-
# See: https://docs.sulu.io/en/2.0/cookbook/caching-with-varnish.html
9+
# See: https://docs.sulu.io/en/2.6/cookbook/caching-with-varnish.html
1010
# Changes in the public/index.php is needed to disable the symfony http cache and use varnish instead
1111
#
1212
# varnish:

0 commit comments

Comments
 (0)