Skip to content

Commit 3ebc678

Browse files
authored
Merge branch 'master' into pdf
2 parents da7041d + 5d62d14 commit 3ebc678

File tree

214 files changed

+7380
-5364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+7380
-5364
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.* export-ignore
2+
/_test export-ignore

.github/workflows/dokuwiki.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: DokuWiki Default Tasks
2+
on:
3+
push:
4+
pull_request:
5+
schedule:
6+
- cron: '19 8 25 * *'
7+
8+
9+
jobs:
10+
all:
11+
uses: dokuwiki/github-action/.github/workflows/all.yml@main

.github/workflows/phpCS.yml

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

.github/workflows/phpTestLinux.yml

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

.travis.yml

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

_test/AccessTableDataDBMulti.test.php renamed to _test/AccessTableDataDBMultiTest.php

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
namespace dokuwiki\plugin\struct\test;
44

5-
use dokuwiki\plugin\struct\meta\SchemaBuilder;
6-
use dokuwiki\plugin\struct\meta\Schema;
7-
use dokuwiki\plugin\struct\meta;
85
use dokuwiki\plugin\struct\meta\Search;
96

107
/**
@@ -14,12 +11,14 @@
1411
* @group plugins
1512
*
1613
*/
17-
class AccessTableDataDBMulti_struct_test extends StructTest {
14+
class AccessTableDataDBMultiTest extends StructTest
15+
{
1816

1917
/** @var \helper_plugin_sqlite $sqlite */
2018
protected $sqlite;
2119

22-
public function setUp() : void {
20+
public function setUp(): void
21+
{
2322
parent::setUp();
2423

2524
/** @var \helper_plugin_struct_db $sqlite */
@@ -32,32 +31,32 @@ public function setUp() : void {
3231
$this->saveData(
3332
'testpage',
3433
'testtable',
35-
array(
36-
'testMulitColumn2' => array('value1.1', 'value1.2'),
37-
'testMulitColumn' => array('value2.1', 'value2.2')
38-
),
34+
[
35+
'testMulitColumn2' => ['value1.1', 'value1.2'],
36+
'testMulitColumn' => ['value2.1', 'value2.2']
37+
],
3938
123
4039
);
4140

4241
// revision 2
4342
$this->saveData(
4443
'testpage',
4544
'testtable',
46-
array(
47-
'testMulitColumn2' => array('value1.1a', 'value1.2a'),
48-
'testMulitColumn' => array('value2.1a', 'value2.2a')
49-
),
45+
[
46+
'testMulitColumn2' => ['value1.1a', 'value1.2a'],
47+
'testMulitColumn' => ['value2.1a', 'value2.2a']
48+
],
5049
789
5150
);
5251

5352
// revision 1 of different page
5453
$this->saveData(
5554
'testpage2',
5655
'testtable',
57-
array(
58-
'testMulitColumn2' => array('value1.1a'),
59-
'testMulitColumn' => array('value2.1a')
60-
),
56+
[
57+
'testMulitColumn2' => ['value1.1a'],
58+
'testMulitColumn' => ['value2.1a']
59+
],
6160
789
6261
);
6362

@@ -74,24 +73,26 @@ public function setUp() : void {
7473
);
7574
}
7675

77-
public function test_getDataFromDB_currentRev() {
76+
public function test_getDataFromDB_currentRev()
77+
{
7878

7979
// act
8080
$schemaData = mock\AccessTable::getPageAccess('testtable', 'testpage');
8181
$actual_data = $schemaData->getDataFromDB();
8282

83-
$expected_data = array(
84-
array(
83+
$expected_data = [
84+
[
8585
'out1' => 'value1.1a' . Search::CONCAT_SEPARATOR . 'value1.2a',
8686
'out2' => 'value2.1a' . Search::CONCAT_SEPARATOR . 'value2.2a',
8787
'PID' => 'testpage',
88-
),
89-
);
88+
],
89+
];
9090

91-
$this->assertEquals($expected_data, $actual_data, '');
91+
$this->assertEquals($expected_data, $actual_data);
9292
}
9393

94-
public function test_getDataFromDB_deleteMultiPage() {
94+
public function test_getDataFromDB_deleteMultiPage()
95+
{
9596

9697
$this->saveData(
9798
'testpage',

0 commit comments

Comments
 (0)