Skip to content

Commit 1862c0c

Browse files
authored
Update dependencies and remove Drone for Github Actions (#151)
* Update dependencies * Switch from Drone to Github Actions and add config for phpstan
1 parent 6d3fdea commit 1862c0c

File tree

10 files changed

+1253
-1461
lines changed

10 files changed

+1253
-1461
lines changed

.drone.yml

Lines changed: 0 additions & 93 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Deployment
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
9+
cancel-in-progress: true
10+
11+
jobs:
12+
composer:
13+
name: Install PHP dependencies
14+
runs-on: ubuntu-latest
15+
container: joomlaprojects/docker-images:php8.4
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: actions/cache@v4
19+
id: cache-php
20+
with:
21+
path: vendor
22+
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
23+
- name: Install PHP dependencies
24+
if: steps.cache-php.outputs.cache-hit != 'true'
25+
run: |
26+
git config --global --add safe.directory $GITHUB_WORKSPACE
27+
composer config --global home
28+
composer install --no-progress
29+
30+
code-style-php:
31+
name: Check PHP code style
32+
runs-on: ubuntu-latest
33+
container: joomlaprojects/docker-images:php8.4
34+
needs: [composer]
35+
steps:
36+
- uses: actions/checkout@v4
37+
- uses: actions/cache/restore@v4
38+
with:
39+
path: vendor
40+
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
41+
- name: Check PHP code style
42+
env:
43+
PHP_CS_FIXER_IGNORE_ENV: true
44+
run: vendor/bin/phpcs -p --report=full --extensions=php --standard=ruleset.xml src/ bin/ www/
45+
46+
phpstan:
47+
name: Run PHPstan
48+
runs-on: ubuntu-latest
49+
container: joomlaprojects/docker-images:php8.4
50+
needs: [code-style-php]
51+
steps:
52+
- uses: actions/checkout@v4
53+
- uses: actions/cache/restore@v4
54+
with:
55+
path: vendor
56+
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
57+
- name: Run PHPstan
58+
run: |
59+
./vendor/bin/phpstan --error-format=github
60+
61+
deployment:
62+
name: Deployment to server
63+
runs-on: ubuntu-latest
64+
if: github.ref == 'refs/heads/master'
65+
steps:
66+
- name: Update server
67+
uses: appleboy/ssh-action@v1
68+
with:
69+
host: ${{ secrets.HOST }}
70+
username: ${{ secrets.USERNAME }}
71+
key: ${{ secrets.KEY }}
72+
port: ${{ secrets.PORT }}
73+
script: |
74+
cd /home/fwjoomla/siteData
75+
bin/framework update:server

composer.json

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,48 @@
44
"homepage": "http://github.com/joomla/framework.joomla.org",
55
"license": "GPL-2.0-or-later",
66
"require": {
7-
"php": "^8.1",
7+
"php": "^8.3",
88
"ext-json": "*",
99
"ext-pdo": "*",
1010
"fig/link-util": "^1.1",
11-
"joomla/application": "^3.0",
12-
"joomla/console": "^3.0",
13-
"joomla/controller": "^3.0",
14-
"joomla/database": "^3.0",
15-
"joomla/di": "^3.0",
16-
"joomla/event": "^3.0",
17-
"joomla/filesystem": "^3.0",
18-
"joomla/filter": "^3.0",
19-
"joomla/github": "^3.0@dev",
20-
"joomla/http": "^3.0",
21-
"joomla/input": "^3.0",
22-
"joomla/model": "^3.0",
23-
"joomla/preload": "^3.0",
24-
"joomla/registry": "^3.0",
25-
"joomla/renderer": "^3.0",
26-
"joomla/router": "^3.0",
27-
"joomla/string": "^3.0",
28-
"joomla/uri": "^3.0",
29-
"joomla/utilities": "^3.0",
30-
"joomla/view": "^3.0",
31-
"laminas/laminas-diactoros": "^2.17",
11+
"joomla/application": "^4.0",
12+
"joomla/console": "^4.0",
13+
"joomla/controller": "^4.0",
14+
"joomla/database": "^4.0",
15+
"joomla/di": "^4.0",
16+
"joomla/event": "^4.0",
17+
"joomla/filesystem": "^4.0",
18+
"joomla/filter": "^4.0",
19+
"joomla/github": "^4.0",
20+
"joomla/http": "^4.0",
21+
"joomla/input": "^4.0",
22+
"joomla/model": "^4.0",
23+
"joomla/preload": "^4.0",
24+
"joomla/registry": "^4.0",
25+
"joomla/renderer": "dev-4.x-dev",
26+
"joomla/router": "^4.0",
27+
"joomla/string": "^4.0",
28+
"joomla/uri": "^4.0",
29+
"joomla/utilities": "^4.0",
30+
"joomla/view": "^4.0",
31+
"laminas/laminas-diactoros": "^3.6.0",
3232
"monolog/monolog": "^2.1",
33-
"psr/link": "^1.0",
33+
"psr/link": "^2.0",
3434
"ramsey/uuid": "^4.0.1",
3535
"robmorgan/phinx": "^0.16.1",
36-
"symfony/asset": "^5.1.2",
37-
"symfony/process": "^5.1.2",
38-
"symfony/web-link": "^5.1.2",
39-
"symfony/yaml": "^5.1.2",
36+
"symfony/asset": "^v7.2.0",
37+
"symfony/process": "^7.1.7.0",
38+
"symfony/web-link": "^v7.3.0",
39+
"symfony/yaml": "^v7.3.1",
4040
"theiconic/php-ga-measurement-protocol": "^2.7.2",
41-
"twig/twig": "^3.0"
41+
"twig/twig": "^3.19.0.0"
4242
},
4343
"require-dev": {
4444
"friendsofphp/php-cs-fixer": "^3.59",
45-
"squizlabs/php_codesniffer": "~3.10",
46-
"maximebf/debugbar": "^1.22.3",
47-
"phpstan/phpstan": "^1.12"
45+
"squizlabs/php_codesniffer": "^3.10",
46+
"php-debugbar/php-debugbar": "^v2.2.4",
47+
"phpstan/phpstan": "^2.1.19",
48+
"phpstan/phpstan-deprecation-rules": "^2.0.3"
4849
},
4950
"replace": {
5051
"paragonie/random_compat": "*"
@@ -56,7 +57,7 @@
5657
},
5758
"config": {
5859
"platform": {
59-
"php": "8.1.0"
60+
"php": "8.3.0"
6061
}
6162
}
6263
}

0 commit comments

Comments
 (0)