Skip to content

Commit 18b4c24

Browse files
TatevikGrtatevikg1
andauthored
Update to php8.1 symfony 6.4 (#103)
* ISSUE-337: use local * ISSUE-337: test * ISSUE-337: fix write issue * ISSUE-337: update version * ISSUE-337: fix tests * ISSUE-337: update phpstan * ISSUE-337: changelog + test --------- Co-authored-by: Tatevik <[email protected]>
1 parent 8c6eb3f commit 18b4c24

File tree

8 files changed

+6805
-4715
lines changed

8 files changed

+6805
-4715
lines changed

.github/workflows/ci.yml

+3-16
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
php-versions: ['7.2', '7.3', '7.4', '8.0']
26-
dependencies: ['current', 'latest', 'oldest']
25+
php-versions: ['8.1']
26+
dependencies: ['current', 'oldest']
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@v2
@@ -50,36 +50,23 @@ jobs:
5050
restore-keys: ${{ runner.os }}-composer-
5151
- name: Install the latest dependencies
5252
run: composer update --with-dependencies --prefer-stable --prefer-dist
53-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
5453
if: ${{ matrix.dependencies }} == "current"
55-
- name: Install the lowest dependencies
56-
run: composer update --with-dependencies --prefer-stable --prefer-dist --prefer-lowest
57-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
58-
if: ${{ matrix.dependencies }} == "latest"
5954
- name: Install current dependencies from composer.lock
6055
run: composer install
61-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
6256
if: ${{ matrix.dependencies }} == "oldest"
6357
- name: Set up database schema
6458
run: mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -u${{ env.DB_USERNAME }} -p${{ env.DB_PASSWORD }} ${{ env.DB_DATABASE }} < vendor/phplist/core/resources/Database/Schema.sql
65-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
6659
- name: Validating composer.json
6760
run: composer validate --no-check-all --no-check-lock --strict;
68-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
6961
- name: Linting all php files
7062
run: find src/ tests/ public/ -name ''*.php'' -print0 | xargs -0 -n 1 -P 4 php -l; php -l;
7163
- name: Run integration tests with phpunit
7264
run: vendor/bin/phpunit tests/Integration/
73-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
7465
- name: Running the system tests
75-
run: vendor/bin/phpunit tests/Integration/;
76-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
66+
run: vendor/bin/phpunit tests/System/;
7767
- name: Running static analysis
7868
run: vendor/bin/phpstan analyse -l 5 src/ tests/;
79-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
8069
- name: Running PHPMD
8170
run: vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml;
82-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
8371
- name: Running PHP_CodeSniffer
8472
run: vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/;
85-
continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
/vendor/
1515
.DS_Store
1616
.vagrant
17+
.phpunit.result.cache

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ This project adheres to [Semantic Versioning](https://semver.org/).
1616
### Fixed
1717
- Security update for symfony/symfony and symfony/dependency-injection (#86)
1818

19+
20+
## 5.0.0-alpha1
21+
22+
### Changed
23+
- php version 8.1
24+
1925
## 4.0.0-alpha2
2026

2127
### Added

composer.json

100644100755
+14-33
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,29 @@
2222
"role": "Former developer"
2323
}
2424
],
25-
"repositories": [
26-
{
27-
"type": "path",
28-
"url": "../core",
29-
"options": {
30-
"symlink": true
31-
}
32-
},
33-
{
34-
"type": "path",
35-
"url": "../rest-api",
36-
"options": {
37-
"symlink": true
38-
}
39-
},
40-
{
41-
"type": "path",
42-
"url": "../web-frontend",
43-
"options": {
44-
"symlink": true
45-
}
46-
}
47-
],
4825
"support": {
4926
"issues": "https://github.com/phpList/base-distribution/issues",
5027
"forum": "https://discuss.phplist.org/",
5128
"source": "https://github.com/phpList/base-distribution"
5229
},
5330
"require": {
54-
"php": "^7.2|^8.0",
55-
"phplist/core": "@dev",
56-
"phplist/rest-api": "@dev",
57-
"phplist/web-frontend": "@dev"
31+
"php": "^8.1",
32+
"phplist/core": "dev-ISSUE-337",
33+
"phplist/rest-api": "dev-ISSUE-337",
34+
"phplist/web-frontend": "dev-ISSUE-337",
35+
"doctrine/orm": "^3.3"
5836
},
5937
"require-dev": {
60-
"phpunit/phpunit": "8.5.14 | ^9.5.2",
61-
"guzzlehttp/guzzle": "6.5.5 |^7.2.0",
38+
"phpunit/phpunit": "^9.5.2",
39+
"guzzlehttp/guzzle": "^7.2.0",
6240
"squizlabs/php_codesniffer": "^3.5.8",
63-
"phpstan/phpstan": "^0.12.57",
41+
"phpstan/phpstan": "^1.10",
6442
"nette/caching": "^3.1.0",
6543
"nikic/php-parser": "^4.10.4",
6644
"phpmd/phpmd": "^2.6.0",
67-
"roave/security-advisories": "dev-master"
45+
"roave/security-advisories": "dev-master",
46+
"symfony/process": "^6.4",
47+
"symfony/framework-bundle": "^6.4"
6848
},
6949
"autoload": {
7050
"psr-4": {
@@ -89,7 +69,8 @@
8969
"PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
9070
"PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
9171
"PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
92-
"PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches"
72+
"php bin/console cache:clear",
73+
"php bin/console cache:warmup"
9374
],
9475
"post-install-cmd": [
9576
"@create-directories",
@@ -106,7 +87,7 @@
10687
},
10788
"extra": {
10889
"branch-alias": {
109-
"dev-master": "4.0.x-dev"
90+
"dev-ISSUE-337": "5.0.x-dev"
11091
},
11192
"symfony-app-dir": "bin",
11293
"symfony-bin-dir": "bin",

0 commit comments

Comments
 (0)