Skip to content

Commit

Permalink
PHP8 - Symfony 5.2 Updated
Browse files Browse the repository at this point in the history
  • Loading branch information
cesurapp committed Feb 27, 2021
1 parent 188aec2 commit d1f00e7
Show file tree
Hide file tree
Showing 25 changed files with 4,272 additions and 3,260 deletions.
12 changes: 5 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
end_of_line = LF
insert_final_newline = true
trim_trailing_whitespace = true

[*.php]
[*.{php,html,twig,json,yml,yaml,vue}]
indent_style = space
indent_size = 4

[{package.json, composer.json}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false
max_line_length = 80
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration

###> symfony/framework-bundle ###
APP_ENV=prod
APP_ENV=dev
APP_SECRET=52a9ee6241c958598f23df444ffdb03c
###< symfony/framework-bundle ###

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

###> symfony/mailer ###
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ src/*/Entity/*/*~
node_modules
.idea
/build/
.DS_Store
.DS_Store
npm-debug.log
yarn-error.log
10 changes: 5 additions & 5 deletions assets/admin/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ header {
background: RGBA(247, 249, 249, 1.00);
margin: -$gutter-padding;
margin-bottom: $gutter-padding;
padding: $gutter-padding+.2 $gutter-padding 0;
padding: $gutter-padding - .2 $gutter-padding 0;
display: block;
box-shadow: 0 -1px 1px rgba(0, 0, 0, .1) inset;
position: relative;
Expand All @@ -396,9 +396,9 @@ header {
margin: 0;
font-weight: 300;
display: block;
font-size: $font-size-base + 1;
font-size: $font-size-base + .7;
line-height: $font-size-base + 1.2;
padding-bottom: 1rem;
padding-bottom: .75rem;
position: relative;

.text {
Expand All @@ -410,9 +410,9 @@ header {

.desc {
display: block;
font-size: $font-size-base + .1;
font-size: $font-size-base;
line-height: 20px;
margin-top: 10px;
margin-top: 5px;
color: #777;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
2 changes: 1 addition & 1 deletion assets/admin/scss/modules/content-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nav#content_nav {
display: inline-block;
color: inherit;
border-radius: 0;
padding: .5rem 0 .9rem 0;
padding: 0.25rem 0 0.75rem 0;
transition: $transition;
position: relative;
&:hover,
Expand Down
7 changes: 4 additions & 3 deletions bin/console
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\ErrorHandler\Debug;

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

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

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

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

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

if ($_SERVER['APP_DEBUG']) {
umask(0000);
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
}
],
"require": {
"php": "^7.3.0",
"php": ">=7.4.0",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",
"appaydin/pd-mailer": "2.*",
"appaydin/pd-menu": "2.*",
"appaydin/pd-user": "2.*",
"appaydin/pd-widget": "2.*",
"appaydin/pd-mailer": "^2.0",
"appaydin/pd-menu": "^2.0",
"appaydin/pd-user": "^2.0",
"appaydin/pd-widget": "^2.0",
"beberlei/doctrineextensions": "1.*",
"intervention/image": "2.*",
"knplabs/knp-paginator-bundle": "5.*",
Expand Down Expand Up @@ -71,7 +71,8 @@
"symfony/polyfill-php72": "*",
"symfony/polyfill-php71": "*",
"symfony/polyfill-php70": "*",
"symfony/polyfill-php56": "*"
"symfony/polyfill-php56": "*",
"symfony/polyfill-mbstring": "*"
},
"scripts": {
"auto-scripts": {
Expand All @@ -91,7 +92,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.0.*"
"require": "5.2.*"
}
}
}
Loading

0 comments on commit d1f00e7

Please sign in to comment.