Skip to content

Commit 69e66b9

Browse files
committed
Merge branch 'develop'
Merge details: commit 0af1cbb Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Wed May 11 11:51:30 2022 Fire the db config event before all db tasks commit 205200a Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Tue May 10 11:04:18 2022 Fix trait use statement commit 512a56e Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Mon May 9 14:30:16 2022 Use custom event for db config overrides commit 45254a6 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Fri May 6 16:15:21 2022 Allow overriding default backup config commit 18f43dc Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu May 5 11:13:10 2022 Add dependency on digipolisgent/robo-digipolis-general commit 0046ea4 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu May 5 11:12:45 2022 Rename folder to match namespace commit 39fd8fb Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu May 5 09:22:11 2022 Remove deprecated option --report-useless-tests commit 09d83d1 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu May 5 09:14:16 2022 Remove hirak/prestissimo from travis This package is no longer required (since Composer 2). commit 8785a8d Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Thu May 5 09:10:14 2022 Update travis: use PHP 8.1 commit fe16eb2 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Wed May 4 15:41:34 2022 Support Robo 3, PHP8
2 parents a0b4b00 + 0af1cbb commit 69e66b9

26 files changed

+307
-415
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ env:
33
- CC_TEST_REPORTER_ID=bdf841c244075ca1d4fa73178451ff4cf751f09583580334637b0fbb53696b9f
44
language: php
55
php:
6-
- 7.3
7-
- 7.2
8-
- 7.1
6+
- 8.1
97
before_script:
10-
- composer global require hirak/prestissimo
118
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
129
- chmod +x ./cc-test-reporter
1310
- ./cc-test-reporter before-build

RoboFile.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public function test()
1111
$this->stopOnFail(true);
1212
$this->taskPHPUnit()
1313
->option('disallow-test-output')
14-
->option('report-useless-tests')
1514
->option('strict-coverage')
1615
->option('-v')
1716
->option('-d error_reporting=-1')
@@ -27,7 +26,6 @@ public function testCoverageCodeclimate()
2726
$this->stopOnFail(true);
2827
$this->taskPHPUnit()
2928
->option('disallow-test-output')
30-
->option('report-useless-tests')
3129
->option('strict-coverage')
3230
->option('-d error_reporting=-1')
3331
->option('--coverage-clover=build/logs/clover.xml')

composer.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"minimum-stability": "dev",
66
"prefer-stable": true,
77
"require": {
8-
"consolidation/robo": "^1.0|^2.0",
8+
"consolidation/robo": "^3.0",
99
"phpseclib/phpseclib": "^3.0",
10-
"phpseclib/phpseclib2_compat": "^1.0.1",
11-
"backup-manager/backup-manager": "^3|^2",
12-
"gordalina/cachetool": "^8|^7|^6|^5|^4|^3|^2.1|^1.11",
13-
"digipolisgent/command-builder": "^1.2"
10+
"backup-manager/backup-manager": "^3",
11+
"gordalina/cachetool": "^8",
12+
"digipolisgent/command-builder": "^1.2",
13+
"digipolisgent/robo-digipolis-general": "dev-develop"
1414
},
1515
"require-dev": {
16-
"phpunit/phpunit": "~4.4"
16+
"phpunit/phpunit": "^9.5.20"
1717
},
1818
"autoload": {
1919
"psr-4": {
@@ -25,12 +25,6 @@
2525
"DigipolisGent\\Tests\\Robo\\Task\\Deploy\\": "tests"
2626
}
2727
},
28-
"scripts": {
29-
"test": "robo --ansi test"
30-
},
31-
"suggest": {
32-
"gordalina/cachetool": "Required if the clear OPcache task is used."
33-
},
3428
"license": "MIT",
3529
"authors": [
3630
{

phpunit.xml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
>
6-
<testsuites>
7-
<testsuite name="robo-digipolis-deploy tests">
8-
<directory>./tests</directory>
9-
</testsuite>
10-
</testsuites>
11-
<filter>
12-
<whitelist processUncoveredFilesFromWhitelist="true">
13-
<directory suffix=".php">./src</directory>
14-
</whitelist>
15-
</filter>
16-
<logging>
17-
<log type="coverage-clover" target="build/logs/clover.xml"/>
18-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3+
<coverage processUncoveredFiles="true">
4+
<include>
5+
<directory suffix=".php">./src</directory>
6+
</include>
7+
<report>
8+
<clover outputFile="build/logs/clover.xml"/>
9+
</report>
10+
</coverage>
11+
<testsuites>
12+
<testsuite name="robo-digipolis-deploy tests">
13+
<directory>./tests</directory>
14+
</testsuite>
15+
</testsuites>
16+
<logging/>
1917
</phpunit>

src/Commands/ClearOpCache.php

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

src/Commands/DatabaseBackup.php

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

src/Commands/DatabaseRestore.php

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

src/Commands/PartialCleanDirs.php

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

src/Commands/PushPackage.php

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

src/Commands/loadCommands.php

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

0 commit comments

Comments
 (0)