diff options
author | Bruce Wells <brucekwells@gmail.com> | 2020-05-20 04:37:04 +0300 |
---|---|---|
committer | Bruce Wells <brucekwells@gmail.com> | 2020-05-20 04:37:04 +0300 |
commit | 906021d27c4630328f68eb635a616774ab1b80e9 (patch) | |
tree | ecfbcc7e3033ef1f11c25baca1c9d32f496d8ee1 /composer.json | |
parent | f284316053cbd7cde8e5209585a9f974ef2321e7 (diff) | |
parent | 11ea95cb2125e329a84b30f05e25a79e29abf353 (diff) |
Merge branch 'ng' of https://github.com/neonxp/MathExecutor into neonxp-ng
# Conflicts:
# src/NXP/Classes/Calculator.php
# src/NXP/Classes/Lexer.php
# src/NXP/Classes/Token/AbstractOperator.php
# src/NXP/Classes/TokenFactory.php
# src/NXP/MathExecutor.php
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/composer.json b/composer.json index 8a5bd99..3098443 100644 --- a/composer.json +++ b/composer.json @@ -1,23 +1,36 @@ { - "name": "nxp/math-executor", - "description": "Simple math expressions calculator", - "minimum-stability": "stable", - "keywords": ["math","parser","expression","calculator","formula","mathmatics"], - "homepage": "http://github.com/NeonXP/MathExecutor", - "license": "MIT", - "authors": [ - { - "name": "Alexander 'NeonXP' Kiryukhin", - "email": "frei@neonxp.info" - } - ], - "require": { - "php": ">=7.1" + "name": "nxp/math-executor", + "description": "Simple math expressions calculator", + "minimum-stability": "stable", + "keywords": [ + "math", + "parser", + "expression", + "calculator", + "formula", + "mathmatics" + ], + "homepage": "http://github.com/NeonXP/MathExecutor", + "license": "MIT", + "authors": [ + { + "name": "Alexander 'NeonXP' Kiryukhin", + "email": "a.kiryukhin@mail.ru" }, - "require-dev": { - "phpunit/phpunit": "~7.0" - }, - "autoload": { - "psr-0": {"NXP": "src/"} + { + "name": "Bruce Wells", + "email": "brucekwells@gmail.com" + } + ], + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "~7.0" + }, + "autoload": { + "psr-0": { + "NXP": "src/" } + } } |