Skip to content

Commit

Permalink
Update to PHP Unit 9
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewdalpino committed Jun 6, 2021
1 parent 6cfe146 commit ef4109d
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 80 deletions.
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -44,11 +44,11 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "2.18.*",
"phpbench/phpbench": "1.0.0-alpha8",
"phpbench/phpbench": "^1.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "0.12.*",
"phpstan/phpstan-phpunit": "0.12.*",
"phpunit/phpunit": "8.5.*"
"phpunit/phpunit": "^9.0"
},
"suggest": {
"ext-tensor": "For fast Matrix/Vector computing",
Expand Down
145 changes: 68 additions & 77 deletions phpunit.xml
@@ -1,79 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Base">
<directory>tests</directory>
</testsuite>
<testsuite name="Anomaly Detectors">
<directory>tests/AnomalyDetectors</directory>
</testsuite>
<testsuite name="Backends">
<directory>tests/Backends</directory>
</testsuite>
<testsuite name="Classifiers">
<directory>tests/Classifiers</directory>
</testsuite>
<testsuite name="Clusterers">
<directory>tests/Clusterers</directory>
</testsuite>
<testsuite name="Cross Validation">
<directory>tests/CrossValidation</directory>
</testsuite>
<testsuite name="Datasets">
<directory>tests/Datasets</directory>
</testsuite>
<testsuite name="Extractors">
<directory>tests/Extractors</directory>
</testsuite>
<testsuite name="Graph">
<directory>tests/Graph</directory>
</testsuite>
<testsuite name="Helpers">
<directory>tests/Helpers</directory>
</testsuite>
<testsuite name="Kernels">
<directory>tests/Kernels</directory>
</testsuite>
<testsuite name="Loggers">
<directory>tests/Loggers</directory>
</testsuite>
<testsuite name="Neural Net">
<directory>tests/NeuralNet</directory>
</testsuite>
<testsuite name="Persisters">
<directory>tests/Persisters</directory>
</testsuite>
<testsuite name="Regressors">
<directory>tests/Regressors</directory>
</testsuite>
<testsuite name="Specifications">
<directory>tests/Specifications</directory>
</testsuite>
<testsuite name="Strategies">
<directory>tests/Strategies</directory>
</testsuite>
<testsuite name="Tokenizers">
<directory>tests/Transformers</directory>
</testsuite>
<testsuite name="Transformers">
<directory>tests/Transformers</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">src</directory>
</whitelist>
</filter>
<php>
<env name="ENV" value="testing"/>
</php>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" forceCoversAnnotation="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Base">
<directory>tests</directory>
</testsuite>
<testsuite name="Anomaly Detectors">
<directory>tests/AnomalyDetectors</directory>
</testsuite>
<testsuite name="Backends">
<directory>tests/Backends</directory>
</testsuite>
<testsuite name="Classifiers">
<directory>tests/Classifiers</directory>
</testsuite>
<testsuite name="Clusterers">
<directory>tests/Clusterers</directory>
</testsuite>
<testsuite name="Cross Validation">
<directory>tests/CrossValidation</directory>
</testsuite>
<testsuite name="Datasets">
<directory>tests/Datasets</directory>
</testsuite>
<testsuite name="Extractors">
<directory>tests/Extractors</directory>
</testsuite>
<testsuite name="Graph">
<directory>tests/Graph</directory>
</testsuite>
<testsuite name="Helpers">
<directory>tests/Helpers</directory>
</testsuite>
<testsuite name="Kernels">
<directory>tests/Kernels</directory>
</testsuite>
<testsuite name="Loggers">
<directory>tests/Loggers</directory>
</testsuite>
<testsuite name="Neural Net">
<directory>tests/NeuralNet</directory>
</testsuite>
<testsuite name="Persisters">
<directory>tests/Persisters</directory>
</testsuite>
<testsuite name="Regressors">
<directory>tests/Regressors</directory>
</testsuite>
<testsuite name="Specifications">
<directory>tests/Specifications</directory>
</testsuite>
<testsuite name="Strategies">
<directory>tests/Strategies</directory>
</testsuite>
<testsuite name="Tokenizers">
<directory>tests/Transformers</directory>
</testsuite>
<testsuite name="Transformers">
<directory>tests/Transformers</directory>
</testsuite>
</testsuites>
<php>
<env name="ENV" value="testing"/>
</php>
</phpunit>
10 changes: 10 additions & 0 deletions tests/FunctionsTest.php
Expand Up @@ -18,6 +18,16 @@

/**
* @group Functions
* @covers \Rubix\ML\argmax
* @covers \Rubix\ML\argmin
* @covers \Rubix\ML\array_transpose
* @covers \Rubix\ML\comb
* @covers \Rubix\ML\iterator_contains_nan
* @covers \Rubix\ML\iterator_filter
* @covers \Rubix\ML\iterator_first
* @covers \Rubix\ML\iterator_map
* @covers \Rubix\ML\logsumexp
* @covers \Rubix\ML\warn_deprecated
*/
class FunctionsTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Persisters/FilesystemTest.php
Expand Up @@ -69,6 +69,6 @@ public function saveLoad() : void

protected function assertPreConditions() : void
{
$this->assertFileNotExists(self::PATH);
$this->assertFileDoesNotExist(self::PATH);
}
}

0 comments on commit ef4109d

Please sign in to comment.