Skip to content

Bump php minimum version & fix deprecations #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norberttech merged 16 commits into from
Dec 21, 2023
Merged

Bump php minimum version & fix deprecations #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e99a6d2
Bump symfony deps and min php version
nocive Dec 14, 2023
e1d74bd
Fix deprecations and use constants over static props
nocive Dec 14, 2023
54138f6
CR
nocive Dec 21, 2023
558eada
update github workflows php version matrix
nocive Dec 21, 2023
ca5b02e
bump php-cs-fixer
nocive Dec 21, 2023
aaa5821
fix php-cs-fixer integration
nocive Dec 21, 2023
9a42d2c
modernize test code
nocive Dec 21, 2023
37db584
add php 8.3 to gh workflows
nocive Dec 21, 2023
6f72bde
fix php version constraint
nocive Dec 21, 2023
07b2ca7
allow for ^7.0 too for symfony/framework-bundle
nocive Dec 21, 2023
51e8cac
keep static analysis on 8.1
nocive Dec 21, 2023
3e8a27b
restore composer.lock to its former glory
nocive Dec 21, 2023
cebc673
doh
nocive Dec 21, 2023
2afbd3c
refresh composer.lock with lowest dependencies
nocive Dec 21, 2023
c0512e7
generate composer.lock with lower php version
nocive Dec 21, 2023
dca68a8
dont use --prefer-lowest
nocive Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/static-analyze.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.1"
operating-system:
- "ubuntu-latest"

Expand Down Expand Up @@ -56,4 +56,4 @@ jobs:
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Static Analyze"
run: "composer static:analyze"
run: "composer static:analyze"
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
- "lowest"
- "highest"
php-version:
- "7.4"
- "8.1"
- "8.2"
- "8.3"
operating-system:
- "ubuntu-latest"
- "windows-latest"
Expand Down Expand Up @@ -59,4 +61,4 @@ jobs:
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Tests"
run: "composer test"
run: "composer test"
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/build
/vendor
/var
/var
12 changes: 6 additions & 6 deletions .php_cs → .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
\mkdir(__DIR__ . '/var');
}

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setCacheFile(__DIR__.'/var/.php_cs.cache')
->setRules([
'@PSR2' => true,
'psr4' => true,
'psr_autoloading' => true,
'strict_param' => true,
'ordered_imports' => true,
'blank_line_before_statement' => true,
'trailing_comma_in_multiline_array' => true,
'return_type_declaration' => ['space_before' => 'one'],
'class_attributes_separation' => ['elements' => ['const', 'property', 'method']],
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
'return_type_declaration' => ['space_before' => 'none'],
'class_attributes_separation' => ['elements' => ['const' => 'one', 'property' => 'one', 'method' => 'one']],
'no_unused_imports' => true,
'declare_strict_types' => true,
'blank_line_after_opening_tag' => true
])
->setFinder($finder);
->setFinder($finder);
16 changes: 8 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"keywords": ["ace", "code", "editor", "symfony", "form", "bundle", "javascript"],
"license": "MIT",
"require": {
"php": ">=7.3",
"twig/twig": "^1.34|^2.0|^3.0",
"symfony/framework-bundle": "^3.0|^4.0|^5.0",
"symfony/form": "^3.0|^4.0|^5.0",
"symfony/twig-bridge": "^3.0|^4.0|^5.0",
"symfony/asset": "^3.0|^4.0|^5.0",
"symfony/expression-language": "^3.0|^4.0|^5.0"
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"twig/twig": "^2.0|^3.0",
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
"symfony/form": "^5.4|^6.0",
"symfony/twig-bridge": "^5.4|^6.0",
"symfony/asset": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0"
},
"config": {
"optimize-autoloader": true,
"sort-packages": true
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"friendsofphp/php-cs-fixer": "^3.16",
"phpunit/phpunit": "^9.2"
},
"autoload": {
Expand Down
Loading