aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Wells <bruce.wells@simparel.com>2019-10-31 15:31:34 +0300
committerBruce Wells <bruce.wells@simparel.com>2019-10-31 15:31:34 +0300
commitadf43bc705fd2d839a639c162f53407434867206 (patch)
treeac756881772bbe8fe1c93bdab7f09283196d84ec
parent8b5c7049907b0d2c37f98205b0fcfbdcf8374227 (diff)
parent7988714aaac569b7cc39c3ad1831f12d54054fd7 (diff)
Merge branch 'master' of https://github.com/phpfui/MathExecutor
-rw-r--r--.travis.yml1
-rw-r--r--README.md6
-rw-r--r--composer.json4
-rw-r--r--tests/MathTest.php2
4 files changed, 3 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 551e6ed..3a63f2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: php
php:
- - 5.6
- 7.1
- 7.2
- 7.3
diff --git a/README.md b/README.md
index 7238a0b..58c5422 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,6 @@ $executor->addFunction('abs', function($arg) {return abs($arg);});
```
Function default parameters are not supported at this time.
-Default parameters are not currently supported.
-
## Operators:
Default operators: `+ - * / ^`
@@ -158,7 +156,3 @@ You can add operators, functions and variables with the public methods in MathEx
This will allow you to remove functions and operators if needed, or implement different types more simply.
Also note that you can replace an existing default operator by adding a new operator with the same regular expression string. For example if you just need to redefine TokenPlus, you can just add a new operator with the same regex string, in this case '\\+'.
-
-## Future Enhancements
-
-At some point this package will be upgraded to a currently supported version of PHP.
diff --git a/composer.json b/composer.json
index dc35c2f..4c57b47 100644
--- a/composer.json
+++ b/composer.json
@@ -12,10 +12,10 @@
}
],
"require": {
- "php": ">=5.6"
+ "php": ">=7.1"
},
"require-dev": {
- "phpunit/phpunit": "~5.0"
+ "phpunit/phpunit": "~7.0"
},
"autoload": {
"psr-0": {"NXP": "src/"}
diff --git a/tests/MathTest.php b/tests/MathTest.php
index 7f5ce9b..e289016 100644
--- a/tests/MathTest.php
+++ b/tests/MathTest.php
@@ -21,7 +21,7 @@ use NXP\Exception\UnknownOperatorException;
use NXP\Exception\UnknownTokenException;
use NXP\Exception\UnknownVariableException;
-class MathTest extends \PHPUnit_Framework_TestCase
+class MathTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider providerExpressions