Skip to content

Commit d1f00e7

Browse files
committed
PHP8 - Symfony 5.2 Updated
1 parent 188aec2 commit d1f00e7

File tree

25 files changed

+4272
-3260
lines changed

25 files changed

+4272
-3260
lines changed

.editorconfig

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ root = true
66

77
# Unix-style newlines with a newline ending every file
88
[*]
9-
end_of_line = lf
10-
insert_final_newline = true
119
charset = utf-8
10+
end_of_line = LF
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
1213

13-
[*.php]
14+
[*.{php,html,twig,json,yml,yaml,vue}]
1415
indent_style = space
1516
indent_size = 4
1617

17-
[{package.json, composer.json}]
18-
indent_size = 2
19-
2018
[*.md]
21-
trim_trailing_whitespace = false
19+
max_line_length = 80

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
44

55
###> symfony/framework-bundle ###
6-
APP_ENV=prod
6+
APP_ENV=dev
77
APP_SECRET=52a9ee6241c958598f23df444ffdb03c
88
###< symfony/framework-bundle ###
99

1010
###> doctrine/doctrine-bundle ###
1111
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
12-
DATABASE_URL=mysql://root:root@127.0.0.1:3306/pdadmin
12+
DATABASE_URL=mysql://root:1234@127.0.0.1:3306/pdadmin
1313
###< doctrine/doctrine-bundle ###
1414

1515
###> symfony/mailer ###

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ src/*/Entity/*/*~
2828
node_modules
2929
.idea
3030
/build/
31-
.DS_Store
31+
.DS_Store
32+
npm-debug.log
33+
yarn-error.log

assets/admin/scss/app.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ header {
370370
background: RGBA(247, 249, 249, 1.00);
371371
margin: -$gutter-padding;
372372
margin-bottom: $gutter-padding;
373-
padding: $gutter-padding+.2 $gutter-padding 0;
373+
padding: $gutter-padding - .2 $gutter-padding 0;
374374
display: block;
375375
box-shadow: 0 -1px 1px rgba(0, 0, 0, .1) inset;
376376
position: relative;
@@ -396,9 +396,9 @@ header {
396396
margin: 0;
397397
font-weight: 300;
398398
display: block;
399-
font-size: $font-size-base + 1;
399+
font-size: $font-size-base + .7;
400400
line-height: $font-size-base + 1.2;
401-
padding-bottom: 1rem;
401+
padding-bottom: .75rem;
402402
position: relative;
403403

404404
.text {
@@ -410,9 +410,9 @@ header {
410410

411411
.desc {
412412
display: block;
413-
font-size: $font-size-base + .1;
413+
font-size: $font-size-base;
414414
line-height: 20px;
415-
margin-top: 10px;
415+
margin-top: 5px;
416416
color: #777;
417417
overflow: hidden;
418418
text-overflow: ellipsis;

assets/admin/scss/modules/content-nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ nav#content_nav {
2121
display: inline-block;
2222
color: inherit;
2323
border-radius: 0;
24-
padding: .5rem 0 .9rem 0;
24+
padding: 0.25rem 0 0.75rem 0;
2525
transition: $transition;
2626
position: relative;
2727
&:hover,

bin/console

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use App\Kernel;
55
use Symfony\Bundle\FrameworkBundle\Console\Application;
66
use Symfony\Component\Console\Input\ArgvInput;
7+
use Symfony\Component\Dotenv\Dotenv;
78
use Symfony\Component\ErrorHandler\Debug;
89

910
if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
@@ -14,8 +15,8 @@ set_time_limit(0);
1415

1516
require dirname(__DIR__).'/vendor/autoload.php';
1617

17-
if (!class_exists(Application::class)) {
18-
throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
18+
if (!class_exists(Application::class) || !class_exists(Dotenv::class)) {
19+
throw new LogicException('You need to add "symfony/framework-bundle" and "symfony/dotenv" as Composer dependencies.');
1920
}
2021

2122
$input = new ArgvInput();
@@ -27,7 +28,7 @@ if ($input->hasParameterOption('--no-debug', true)) {
2728
putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
2829
}
2930

30-
require dirname(__DIR__).'/config/bootstrap.php';
31+
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
3132

3233
if ($_SERVER['APP_DEBUG']) {
3334
umask(0000);

composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.3.0",
14+
"php": ">=7.4.0",
1515
"ext-ctype": "*",
1616
"ext-iconv": "*",
1717
"ext-json": "*",
18-
"appaydin/pd-mailer": "2.*",
19-
"appaydin/pd-menu": "2.*",
20-
"appaydin/pd-user": "2.*",
21-
"appaydin/pd-widget": "2.*",
18+
"appaydin/pd-mailer": "^2.0",
19+
"appaydin/pd-menu": "^2.0",
20+
"appaydin/pd-user": "^2.0",
21+
"appaydin/pd-widget": "^2.0",
2222
"beberlei/doctrineextensions": "1.*",
2323
"intervention/image": "2.*",
2424
"knplabs/knp-paginator-bundle": "5.*",
@@ -71,7 +71,8 @@
7171
"symfony/polyfill-php72": "*",
7272
"symfony/polyfill-php71": "*",
7373
"symfony/polyfill-php70": "*",
74-
"symfony/polyfill-php56": "*"
74+
"symfony/polyfill-php56": "*",
75+
"symfony/polyfill-mbstring": "*"
7576
},
7677
"scripts": {
7778
"auto-scripts": {
@@ -91,7 +92,7 @@
9192
"extra": {
9293
"symfony": {
9394
"allow-contrib": false,
94-
"require": "5.0.*"
95+
"require": "5.2.*"
9596
}
9697
}
9798
}

0 commit comments

Comments
 (0)