Skip to content

Commit cc9d9b3

Browse files
committed
Debian Package dependency fix
1 parent d5a9dc6 commit cc9d9b3

File tree

6 files changed

+9
-61
lines changed

6 files changed

+9
-61
lines changed

composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
}
1010
],
1111
"require": {
12-
"php": ">= 5.6",
1312
"ext-soap": "*",
1413
"vitexsoftware/ease-framework": "dev-master"
1514
},
@@ -26,10 +25,6 @@
2625
}
2726
},
2827
"require-dev": {
29-
"phpunit/php-token-stream": "~1.2",
30-
"phpunit/phpunit": "5.3.*",
31-
"phpunit/phpunit-skeleton-generator": "*",
32-
"jakub-onderka/php-parallel-lint": "^0.9.2",
33-
"jakub-onderka/php-console-highlighter": "^0.3.2"
28+
"phpunit/phpunit": "^8"
3429
}
3530
}

debian/composer.json

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,12 @@
1010
],
1111
"version": "0.1",
1212
"require": {
13-
"php": ">= 5.6",
1413
"ext-soap": "*",
15-
"vitexsoftware/ease-framework": "dev-master"
14+
"deb/ease-framework": "*"
1615
},
1716
"autoload": {
1817
"psr-4": {
19-
"Subreg\\": "src/Subreg/"
18+
"Subreg\\": "./Subreg/"
2019
}
21-
},
22-
"autoload-dev": {
23-
"psr-4": {
24-
"Test\\Ease\\": "vendor/vitexsoftware/ease-framework/tests/src/Ease",
25-
"Test\\Subreg\\": "testing/src/Subreg/",
26-
"Test\\": "testing/"
27-
}
28-
},
29-
"require-dev": {
30-
"phpunit/php-token-stream": "~1.2",
31-
"phpunit/phpunit": "5.3.*",
32-
"phpunit/phpunit-skeleton-generator": "*",
33-
"jakub-onderka/php-parallel-lint": "^0.9.2",
34-
"jakub-onderka/php-console-highlighter": "^0.3.2"
3520
}
3621
}

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Priority: optional
88
Homepage: https://github.com/Spoje-NET/php-subreg
99

1010
Package: php-subreg
11-
Depends: ${misc:Depends}, ease-frammework
11+
Depends: ${misc:Depends}, ease-framework
1212
Architecture: all
1313
Section: web
1414
Priority: optional

tests/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
define('EASE_LOGGER', 'syslog');
2525
}
2626

27-
\Ease\Shared::instanced()->loadConfig('../config.json');
27+
\Ease\Shared::instanced()->loadConfig('../config.json',true);
2828

tests/configuration.xml

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
5-
backupGlobals="true"
6-
backupStaticAttributes="false"
7-
bootstrap="./bootstrap.php"
8-
colors="true"
9-
stopOnError="false"
10-
stopOnFailure="false"
11-
stopOnIncomplete="false"
12-
stopOnSkipped="false"
13-
stopOnRisky="false"
14-
testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
15-
verbose="true"
16-
debug="true"
17-
>
18-
2+
<phpunit>
193
<filter>
204
<whitelist processUncoveredFilesFromWhitelist="true">
21-
<directory suffix=".php">.</directory>
225
<directory suffix=".php">src</directory>
236
</whitelist>
247
</filter>
25-
26-
<!-- logging>
27-
<log type="coverage-html" target="/tmp/netspot-ws-coverage" lowUpperBound="35"
28-
highLowerBound="70" />
29-
<log type="coverage-clover" target="/tmp/nb-phpunit-coverage.xml"/>
30-
<log type="junit" target="/tmp/nb-phpunit-log.xml" logIncompleteSkipped="true"/>
31-
32-
<log type="tap" target="build/report.tap"/>
33-
<log type="junit" target="build/report.junit.xml"/>
34-
<log type="coverage-text" target="php://stdout"/>
35-
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
36-
<log type="coverage-clover" target="build/logs/clover.xml"/>
37-
38-
</logging -->
398
</phpunit>

tests/src/Subreg/ClientTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ClientTest extends \Test\Ease\MoleculeTest
1616
* Sets up the fixture, for example, opens a network connection.
1717
* This method is called before a test is executed.
1818
*/
19-
protected function setUp()
19+
protected function setUp(): void
2020
{
2121
$this->object = new \Subreg\Client(\Ease\Shared::instanced()->configuration);
2222
}
@@ -25,7 +25,7 @@ protected function setUp()
2525
* Tears down the fixture, for example, closes a network connection.
2626
* This method is called after a test is executed.
2727
*/
28-
protected function tearDown()
28+
protected function tearDown(): void
2929
{
3030

3131
}
@@ -54,7 +54,7 @@ public function testLogin()
5454
{
5555
$this->object->login();
5656
}
57-
57+
5858
/**
5959
* @covers Subreg\Client::checkDomain
6060
*/
@@ -70,5 +70,4 @@ public function testDomainsList()
7070
{
7171
return $this->object->domainsList();
7272
}
73-
7473
}

0 commit comments

Comments
 (0)