Skip to content

Commit 5029002

Browse files
HackwarHackwar
committed
Merge branch '3.x-dev' of https://github.com/joomla-framework/string into 3.x-dev
# Conflicts: # composer.json
2 parents 1e1cbef + f498976 commit 5029002

File tree

5 files changed

+468
-209
lines changed

5 files changed

+468
-209
lines changed

‎.drone.jsonnet‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ local composer(phpversion, params) = {
2525
local phpunit(phpversion) = {
2626
name: "PHPUnit",
2727
image: "joomlaprojects/docker-images:php" + phpversion,
28-
[if phpversion == "8.2" then "failure"]: "ignore",
28+
[if phpversion == "8.3" then "failure"]: "ignore",
2929
commands: ["vendor/bin/phpunit"]
3030
};
3131

@@ -51,8 +51,7 @@ local pipeline(name, phpversion, params) = {
5151
volumes: volumes,
5252
commands: [
5353
"php -v",
54-
"composer update",
55-
"composer require phpmd/phpmd phpstan/phpstan"
54+
"composer update"
5655
]
5756
},
5857
{
@@ -64,16 +63,12 @@ local pipeline(name, phpversion, params) = {
6463
]
6564
},
6665
{
67-
name: "phpmd",
68-
image: "joomlaprojects/docker-images:php8.1",
66+
name: "phan",
67+
image: "joomlaprojects/docker-images:php8.1-ast",
6968
depends: [ "composer" ],
7069
failure: "ignore",
7170
commands: [
72-
"vendor/bin/phpmd src text cleancode",
73-
"vendor/bin/phpmd src text codesize",
74-
"vendor/bin/phpmd src text controversial",
75-
"vendor/bin/phpmd src text design",
76-
"vendor/bin/phpmd src text unusedcode",
71+
"vendor/bin/phan"
7772
]
7873
},
7974
{
@@ -107,5 +102,5 @@ local pipeline(name, phpversion, params) = {
107102
},
108103
pipeline("8.1 lowest", "8.1", "--prefer-stable --prefer-lowest"),
109104
pipeline("8.1", "8.1", "--prefer-stable"),
110-
pipeline("8.2", "8.2", "--prefer-stable --ignore-platform-reqs"),
105+
pipeline("8.2", "8.2", "--prefer-stable"),
111106
]

‎.drone.yml‎

Lines changed: 107 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -1,202 +1,115 @@
11
---
2-
{
3-
"kind": "pipeline",
4-
"name": "Codequality",
5-
"steps": [
6-
{
7-
"commands": [
8-
"php -v",
9-
"composer update",
10-
"composer require phpmd/phpmd phpstan/phpstan"
11-
],
12-
"image": "joomlaprojects/docker-images:php8.1",
13-
"name": "composer",
14-
"volumes": [
15-
{
16-
"name": "composer-cache",
17-
"path": "/tmp/composer-cache"
18-
}
19-
]
20-
},
21-
{
22-
"commands": [
23-
"vendor/bin/phpcs --standard=ruleset.xml src/"
24-
],
25-
"depends": [
26-
"composer"
27-
],
28-
"image": "joomlaprojects/docker-images:php8.1",
29-
"name": "phpcs"
30-
},
31-
{
32-
"commands": [
33-
"vendor/bin/phpmd src text cleancode",
34-
"vendor/bin/phpmd src text codesize",
35-
"vendor/bin/phpmd src text controversial",
36-
"vendor/bin/phpmd src text design",
37-
"vendor/bin/phpmd src text unusedcode"
38-
],
39-
"depends": [
40-
"composer"
41-
],
42-
"failure": "ignore",
43-
"image": "joomlaprojects/docker-images:php8.1",
44-
"name": "phpmd"
45-
},
46-
{
47-
"commands": [
48-
"vendor/bin/phpstan analyse src"
49-
],
50-
"depends": [
51-
"composer"
52-
],
53-
"failure": "ignore",
54-
"image": "joomlaprojects/docker-images:php8.1",
55-
"name": "phpstan"
56-
},
57-
{
58-
"commands": [
59-
"phploc src"
60-
],
61-
"depends": [
62-
"composer"
63-
],
64-
"failure": "ignore",
65-
"image": "joomlaprojects/docker-images:php8.1",
66-
"name": "phploc"
67-
},
68-
{
69-
"commands": [
70-
"phpcpd src"
71-
],
72-
"depends": [
73-
"composer"
74-
],
75-
"failure": "ignore",
76-
"image": "joomlaprojects/docker-images:php8.1",
77-
"name": "phpcpd"
78-
}
79-
],
80-
"volumes": [
81-
{
82-
"host": {
83-
"path": "/tmp/composer-cache"
84-
},
85-
"name": "composer-cache"
86-
}
87-
]
88-
}
2+
kind: pipeline
3+
name: Codequality
4+
steps:
5+
- commands:
6+
- php -v
7+
- composer update
8+
image: joomlaprojects/docker-images:php8.1
9+
name: composer
10+
volumes:
11+
- name: composer-cache
12+
path: /tmp/composer-cache
13+
- commands:
14+
- vendor/bin/phpcs --standard=ruleset.xml src/
15+
depends:
16+
- composer
17+
image: joomlaprojects/docker-images:php8.1
18+
name: phpcs
19+
- commands:
20+
- vendor/bin/phan
21+
depends:
22+
- composer
23+
failure: ignore
24+
image: joomlaprojects/docker-images:php8.1-ast
25+
name: phan
26+
- commands:
27+
- vendor/bin/phpstan analyse src
28+
depends:
29+
- composer
30+
failure: ignore
31+
image: joomlaprojects/docker-images:php8.1
32+
name: phpstan
33+
- commands:
34+
- phploc src
35+
depends:
36+
- composer
37+
failure: ignore
38+
image: joomlaprojects/docker-images:php8.1
39+
name: phploc
40+
- commands:
41+
- phpcpd src
42+
depends:
43+
- composer
44+
failure: ignore
45+
image: joomlaprojects/docker-images:php8.1
46+
name: phpcpd
47+
volumes:
48+
- host:
49+
path: /tmp/composer-cache
50+
name: composer-cache
8951
---
90-
{
91-
"kind": "pipeline",
92-
"name": "PHP 8.1 lowest",
93-
"steps": [
94-
{
95-
"commands": [
96-
"php -v",
97-
"composer update --prefer-stable --prefer-lowest"
98-
],
99-
"image": "joomlaprojects/docker-images:php8.1",
100-
"name": "composer",
101-
"volumes": [
102-
{
103-
"name": "composer-cache",
104-
"path": "/tmp/composer-cache"
105-
}
106-
]
107-
},
108-
{
109-
"commands": [
110-
"vendor/bin/phpunit"
111-
],
112-
"image": "joomlaprojects/docker-images:php8.1",
113-
"name": "PHPUnit"
114-
}
115-
],
116-
"volumes": [
117-
{
118-
"host": {
119-
"path": "/tmp/composer-cache"
120-
},
121-
"name": "composer-cache"
122-
}
123-
]
124-
}
52+
kind: pipeline
53+
name: PHP 8.1 lowest
54+
steps:
55+
- commands:
56+
- php -v
57+
- composer update --prefer-stable --prefer-lowest
58+
image: joomlaprojects/docker-images:php8.1
59+
name: composer
60+
volumes:
61+
- name: composer-cache
62+
path: /tmp/composer-cache
63+
- commands:
64+
- vendor/bin/phpunit
65+
image: joomlaprojects/docker-images:php8.1
66+
name: PHPUnit
67+
volumes:
68+
- host:
69+
path: /tmp/composer-cache
70+
name: composer-cache
12571
---
126-
{
127-
"kind": "pipeline",
128-
"name": "PHP 8.1",
129-
"steps": [
130-
{
131-
"commands": [
132-
"php -v",
133-
"composer update --prefer-stable"
134-
],
135-
"image": "joomlaprojects/docker-images:php8.1",
136-
"name": "composer",
137-
"volumes": [
138-
{
139-
"name": "composer-cache",
140-
"path": "/tmp/composer-cache"
141-
}
142-
]
143-
},
144-
{
145-
"commands": [
146-
"vendor/bin/phpunit"
147-
],
148-
"image": "joomlaprojects/docker-images:php8.1",
149-
"name": "PHPUnit"
150-
}
151-
],
152-
"volumes": [
153-
{
154-
"host": {
155-
"path": "/tmp/composer-cache"
156-
},
157-
"name": "composer-cache"
158-
}
159-
]
160-
}
72+
kind: pipeline
73+
name: PHP 8.1
74+
steps:
75+
- commands:
76+
- php -v
77+
- composer update --prefer-stable
78+
image: joomlaprojects/docker-images:php8.1
79+
name: composer
80+
volumes:
81+
- name: composer-cache
82+
path: /tmp/composer-cache
83+
- commands:
84+
- vendor/bin/phpunit
85+
image: joomlaprojects/docker-images:php8.1
86+
name: PHPUnit
87+
volumes:
88+
- host:
89+
path: /tmp/composer-cache
90+
name: composer-cache
16191
---
162-
{
163-
"kind": "pipeline",
164-
"name": "PHP 8.2",
165-
"steps": [
166-
{
167-
"commands": [
168-
"php -v",
169-
"composer update --prefer-stable --ignore-platform-reqs"
170-
],
171-
"image": "joomlaprojects/docker-images:php8.2",
172-
"name": "composer",
173-
"volumes": [
174-
{
175-
"name": "composer-cache",
176-
"path": "/tmp/composer-cache"
177-
}
178-
]
179-
},
180-
{
181-
"commands": [
182-
"vendor/bin/phpunit"
183-
],
184-
"failure": "ignore",
185-
"image": "joomlaprojects/docker-images:php8.2",
186-
"name": "PHPUnit"
187-
}
188-
],
189-
"volumes": [
190-
{
191-
"host": {
192-
"path": "/tmp/composer-cache"
193-
},
194-
"name": "composer-cache"
195-
}
196-
]
197-
}
92+
kind: pipeline
93+
name: PHP 8.2
94+
steps:
95+
- commands:
96+
- php -v
97+
- composer update --prefer-stable
98+
image: joomlaprojects/docker-images:php8.2
99+
name: composer
100+
volumes:
101+
- name: composer-cache
102+
path: /tmp/composer-cache
103+
- commands:
104+
- vendor/bin/phpunit
105+
image: joomlaprojects/docker-images:php8.2
106+
name: PHPUnit
107+
volumes:
108+
- host:
109+
path: /tmp/composer-cache
110+
name: composer-cache
198111
---
199112
kind: signature
200-
hmac: 3020d65d007c99b2e2f529f94950f74277ebfcddc1a01bd1277462d029bb19a3
113+
hmac: 359f132c744f714b1f25b942977ed4e7b71d08b578b028134469f9d7546c5a88
201114

202115
...

0 commit comments

Comments
 (0)