Skip to content

Commit 1348cb9

Browse files
iMattProiMattPro
authored
Merge pull request #142 from iMattPro/updates
Minor Updates
2 parents 2d0e069 + 26d07db commit 1348cb9

File tree

3 files changed

+50
-40
lines changed

3 files changed

+50
-40
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: Tests
22

33
env:
44
EXTNAME: phpbb/skeleton # Your extension vendor/package name
5-
SNIFF: 1 # Run code sniffer on your code? 1 or 0
6-
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
7-
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
8-
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
9-
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
5+
SNIFF: 1 # Run code sniffer on your code? 1 or 0
6+
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
7+
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
8+
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
9+
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
1010

1111
on:
1212
push:
@@ -93,24 +93,22 @@ jobs:
9393
strategy:
9494
matrix:
9595
include:
96-
- php: '7.1'
96+
- php: '7.2'
9797
db: "mariadb:10.1"
98-
- php: '7.1'
98+
- php: '7.2'
9999
db: "mariadb:10.2"
100-
- php: '7.1'
100+
- php: '7.2'
101101
db: "mariadb:10.3"
102-
- php: '7.1'
102+
- php: '7.2'
103103
db: "mariadb:10.4"
104-
- php: '7.1'
104+
- php: '7.2'
105105
db: "mariadb:10.5"
106-
- php: '7.1'
106+
- php: '7.2'
107107
db: "mysql:5.6"
108108
db_alias: "MyISAM Tests"
109109
MYISAM: 1
110-
- php: '7.1'
110+
- php: '7.2'
111111
db: "mysql:5.6"
112-
- php: '7.1'
113-
db: "mysql:5.7"
114112
- php: '7.2'
115113
db: "mysql:5.7"
116114
COVERAGE: 1
@@ -127,6 +125,8 @@ jobs:
127125
db: "mysql:5.7"
128126
- php: '8.2'
129127
db: "mysql:5.7"
128+
- php: '8.3'
129+
db: "mysql:5.7"
130130

131131
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
132132

@@ -244,18 +244,16 @@ jobs:
244244
strategy:
245245
matrix:
246246
include:
247-
- php: '7.1'
247+
- php: '7.2'
248248
db: "postgres:9.5"
249-
- php: '7.1'
249+
- php: '7.2'
250250
db: "postgres:9.6"
251-
- php: '7.1'
251+
- php: '7.2'
252252
db: "postgres:10"
253-
- php: '7.1'
253+
- php: '7.2'
254254
db: "postgres:11"
255-
- php: '7.1'
255+
- php: '7.2'
256256
db: "postgres:12"
257-
- php: '7.1'
258-
db: "postgres:13"
259257
- php: '7.2'
260258
db: "postgres:13"
261259
- php: '7.3'
@@ -270,6 +268,8 @@ jobs:
270268
db: "postgres:14"
271269
- php: '8.2'
272270
db: "postgres:14"
271+
- php: '8.3'
272+
db: "postgres:14"
273273

274274
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
275275

@@ -358,7 +358,7 @@ jobs:
358358
strategy:
359359
matrix:
360360
include:
361-
- php: '7.1'
361+
- php: '7.2'
362362
db: "sqlite3"
363363
- php: '7.2'
364364
db: "mcr.microsoft.com/mssql/server:2017-latest"

‎controller/main.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,15 @@ public function handle()
173173
$this->data['components'][$component] = $this->get_user_input('component_' . $component, $details['default']);
174174
}
175175

176-
$this->template->assign_var('S_POST_ACTION', $this->helper->route('phpbb_skeleton_controller'));
176+
$phpbb_skeleton_controller = $this->helper->route('phpbb_skeleton_controller');
177+
178+
$this->template->assign_var('S_POST_ACTION', $phpbb_skeleton_controller);
179+
180+
// Create breadcrumbs
181+
$this->template->assign_block_vars('navlinks', [
182+
'FORUM_NAME' => $this->language->lang('PHPBB_SKELETON_EXT'),
183+
'U_VIEW_FORUM' => $phpbb_skeleton_controller,
184+
]);
177185

178186
return $this->helper->render('@phpbb_skeleton/skeleton_body.html', $this->language->lang('PHPBB_CREATE_SKELETON_EXT'));
179187
}

‎skeleton/.github/workflows/tests.yml.twig‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ env:
1111
on:
1212
push:
1313
branches: # Run tests when commits are pushed to these branches in your repo
14+
- main
1415
- master
1516
- develop
1617
pull_request: # Run tests when pull requests are made on these branches in your repo
1718
branches:
19+
- main
1820
- master
1921
- develop
2022

@@ -93,24 +95,22 @@ jobs:
9395
strategy:
9496
matrix:
9597
include:
96-
- php: '7.1'
98+
- php: '7.2'
9799
db: "mariadb:10.1"
98-
- php: '7.1'
100+
- php: '7.2'
99101
db: "mariadb:10.2"
100-
- php: '7.1'
102+
- php: '7.2'
101103
db: "mariadb:10.3"
102-
- php: '7.1'
104+
- php: '7.2'
103105
db: "mariadb:10.4"
104-
- php: '7.1'
106+
- php: '7.2'
105107
db: "mariadb:10.5"
106-
- php: '7.1'
108+
- php: '7.2'
107109
db: "mysql:5.6"
108110
db_alias: "MyISAM Tests"
109111
MYISAM: 1
110-
- php: '7.1'
112+
- php: '7.2'
111113
db: "mysql:5.6"
112-
- php: '7.1'
113-
db: "mysql:5.7"
114114
- php: '7.2'
115115
db: "mysql:5.7"
116116
- php: '7.3'
@@ -125,6 +125,8 @@ jobs:
125125
db: "mysql:5.7"
126126
- php: '8.2'
127127
db: "mysql:5.7"
128+
- php: '8.3'
129+
db: "mysql:5.7"
128130

129131
name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db_alias != '' && matrix.db_alias || matrix.db }}
130132

@@ -211,18 +213,16 @@ jobs:
211213
strategy:
212214
matrix:
213215
include:
214-
- php: '7.1'
216+
- php: '7.2'
215217
db: "postgres:9.5"
216-
- php: '7.1'
218+
- php: '7.2'
217219
db: "postgres:9.6"
218-
- php: '7.1'
220+
- php: '7.2'
219221
db: "postgres:10"
220-
- php: '7.1'
222+
- php: '7.2'
221223
db: "postgres:11"
222-
- php: '7.1'
224+
- php: '7.2'
223225
db: "postgres:12"
224-
- php: '7.1'
225-
db: "postgres:13"
226226
- php: '7.2'
227227
db: "postgres:13"
228228
- php: '7.3'
@@ -237,6 +237,8 @@ jobs:
237237
db: "postgres:14"
238238
- php: '8.2'
239239
db: "postgres:14"
240+
- php: '8.3'
241+
db: "postgres:14"
240242

241243
name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db }}
242244

@@ -325,7 +327,7 @@ jobs:
325327
strategy:
326328
matrix:
327329
include:
328-
- php: '7.1'
330+
- php: '7.2'
329331
db: "sqlite3"
330332
- php: '7.2'
331333
db: "mcr.microsoft.com/mssql/server:2017-latest"

0 commit comments

Comments
 (0)