aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Upgrading to PHP 7.1 (#48)V1.0.0Bruce Wells2019-10-313-4/+3
| | | | | | | | | | | | | | | | * Subtraction fix (#46) (#7) * Updated unit tests * Fixed docs * Better unary minus support * Subtraction fix (#46) (#8) * Updated unit tests * Fixed docs * Better unary minus support * Upgrading PHPUnit and dropping support for 5.6 and 7.0
* Subtraction fix (#46)v0.8.0Bruce Wells2019-08-165-7/+50
| | | | | * Updated unit tests * Fixed docs * Better unary minus support
* Merge pull request #44 from phpfui/masterv0.7.2Alexander Kiryukhin2019-01-165-26/+70
|\ | | | | | | | | | | | | | | | | | | | | * Fixed comma operator Added unit tests for expressions in function arguments. Changed array_push to $var[] = native code. * Fixed merge error * Fixed typo in constant
| * Fixed typo in constantBruce Wells2019-01-161-1/+1
| |
| * Fixed merge errorBruce Wells2019-01-161-14/+1
| |
| * Merge branch 'master' into masterBruce Wells2019-01-161-0/+9
| |\ | |/ |/|
* | Update code-of-conduct.ru.mdAlexander Kiryukhin2019-01-121-0/+1
| |
* | Create code-of-conduct.ru.mdAlexander Kiryukhin2019-01-121-0/+4
| |
* | Fixed function parameter order (#42)v0.7.1Bruce Wells2019-01-125-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed parsing for () * sync (#5) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * Fix md typo (#39) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Syncing to origin (#4) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * \\ instead of \ * Update README.md Some small fixes * Fix single quotes parsing (#41) * Fix single quotes parsing Fix e-mails Some small fixes * Mistake in test * More PHP versions * Update README.md Deleted `dev` branch * Fixed function parameter order Corrected $places default value for addFunction to match TokenFactory Added function order test and put expected order first in assertEquals If else blocks in calculator Updated docs
| * Fixed comma operatorBruce Wells2019-01-165-30/+74
| | | | | | | | | | Added unit tests for expressions in function arguments. Changed array_push to $var[] = native code.
| * Fixed function parameter orderBruce Wells2019-01-161-8/+12
| | | | | | | | | | | | | | Corrected $places default value for addFunction to match TokenFactory Added function order test and put expected order first in assertEquals If else blocks in calculator Updated docs
| * sync (#6)Bruce Wells2019-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed function parameter order (#42) * Fixed parsing for () * sync (#5) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * Fix md typo (#39) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Syncing to origin (#4) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * \\ instead of \ * Update README.md Some small fixes * Fix single quotes parsing (#41) * Fix single quotes parsing Fix e-mails Some small fixes * Mistake in test * More PHP versions * Update README.md Deleted `dev` branch * Fixed function parameter order Corrected $places default value for addFunction to match TokenFactory Added function order test and put expected order first in assertEquals If else blocks in calculator Updated docs * Create code-of-conduct.ru.md * Update code-of-conduct.ru.md
| * Merge branch 'master' into masterBruce Wells2019-01-121-3/+2
| |\ | |/ |/|
* | Merge branch 'master' into masterBruce Wells2019-01-111-1/+1
|\ \
* | | Update README.mdAlexander Kiryukhin2019-01-111-6/+0
| | | | | | | | | Deleted `dev` branch
* | | Fix single quotes parsing (#41)Alexander Kiryukhin2019-01-1126-178/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix single quotes parsing Fix e-mails Some small fixes * Mistake in test * More PHP versions
* | | Update README.mdAlexander Kiryukhin2019-01-111-2/+2
| | | | | | | | | Some small fixes
* | | Fix md typo (#39)Bruce Wells2019-01-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Syncing to origin (#4) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * \\ instead of \
* | | Replaceable operators (#38)v0.7Bruce Wells2019-01-102-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression
* | | Added simple coc (#37)Alexander Kiryukhin2019-01-101-0/+9
| | | | | | | | | | | | | | | | | | * Added simple coc * Fix
* | | MathExecutor allow override default operators, functions and vars (#36)Timur2019-01-102-32/+78
| | |
* | | Documentation fixes (#34)Bruce Wells2018-12-201-6/+6
| | | | | | | | | | | | Fixing typos in and clarifying documentation.
| | * Fixed function parameter orderBruce Wells2019-01-125-24/+26
| | | | | | | | | | | | | | | | | | | | | Corrected $places default value for addFunction to match TokenFactory Added function order test and put expected order first in assertEquals If else blocks in calculator Updated docs
| | * Merge branch 'master' of https://github.com/phpfui/MathExecutorBruce Wells2019-01-1228-127/+239
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # src/NXP/Classes/Lexer.php
| | | * sync (#5)Bruce Wells2019-01-1127-187/+233
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * Fix md typo (#39) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Syncing to origin (#4) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression * \\ instead of \ * Update README.md Some small fixes * Fix single quotes parsing (#41) * Fix single quotes parsing Fix e-mails Some small fixes * Mistake in test * More PHP versions * Update README.md Deleted `dev` branch
| * | Syncing to origin (#4)Bruce Wells2019-01-103-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Added simple coc (#37) * Added simple coc * Fix * Replaceable operators (#38) * Updated from NeonXP/MathExecutor * Fixed function in () block issue * Fixing typos in and clarifying documentation. * Syncing from origin (#3) * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36) * Allow for operators to be replaced based on regex expression
| * | Syncing from origin (#3)Bruce Wells2019-01-102-32/+78
| | | | | | | | | | | | | | | | | | | | | | | | * Documentation fixes (#34) Fixing typos in and clarifying documentation. * MathExecutor allow override default operators, functions and vars (#36)
| | * Merge branch 'master' of https://github.com/phpfui/MathExecutorBruce Wells2019-01-092-8/+23
| | |\ | | |/ | |/| | | | | | | # Conflicts: # src/NXP/Classes/Lexer.php
| * | Merge branch 'master' into masterBruce Wells2018-12-190-0/+0
| |\ \ | |/ / |/| |
* | | Fixed Lexor to correctly generate reverse polish notation (#33)v0.6Bruce Wells2018-11-263-133/+151
| | | | | | | | | | | | | | | | | | * Updated from NeonXP/MathExecutor * Fixed function in () block issue
* | | Division By Zero Exception supportv0.5Bruce Wells2018-10-310-0/+0
| | | | | | | | | | | | | | | | | | Updated the documentation. Unit tests for strings. Added more unit tests. DivisionByZeroException support.
* | | Merge branch 'master' into masterBruce Wells2018-10-316-49/+167
|\ \ \
* | | | Support for better invalid expression detection and divide by zero (#30)Bruce Wells2018-10-258-4/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additional validation for bad expressions (*+ for example) * Removing DivisionByZeroException testing for now Added more unit tests.
| | * | Fixing typos in and clarifying documentation.Bruce Wells2018-12-191-6/+6
| | | |
| | * | Fixed function in () block issueBruce Wells2018-11-263-133/+151
| | | |
| | | * Fixed parsing for ()Bruce Wells2018-11-231-31/+34
| | |/
| | * Updated from NeonXP/MathExecutorBruce Wells2018-10-310-0/+0
| |/
| * Division By Zero Exception supportBruce Wells2018-10-316-49/+167
| | | | | | | | | | | | Updated the documentation. Unit tests for strings. DivisionByZeroException support.
| * Removing DivisionByZeroException testing for nowBruce Wells2018-10-252-8/+17
| | | | | | | | Added more unit tests.
| * Additional validation for bad expressions (*+ for example)Bruce Wells2018-10-248-3/+101
| |
| * Merge pull request #1 from NeonXP/masterBruce Wells2018-09-1215-61/+180
| |\ | |/ |/| Merge from upstream master
* | Merge pull request #28 from phpfui/support_for_double_quoted_stringsAlexander Kiryukhin2018-09-1213-57/+111
|\ \ | | | | | | Support for double quoted strings
| * | Fixed merge errorBruce Wells2018-09-121-13/+0
| | |
| * | Merge branch 'master' into support_for_double_quoted_stringsBruce Wells2018-09-125-6/+40
| |\ \ | |/ / |/| |
* | | Update .travis.ymlAlexander Kiryukhin2018-09-061-3/+3
| | |
* | | Merge pull request #27 from NeonXP/devv0.3Alexander Kiryukhin2018-09-063-4/+8
|\ \ \ | | | | | | | | Dev
| * \ \ Merge branch 'master' into devAlexander Kiryukhin2018-09-0610-7/+74
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #26 from phpfui/getters_for_function_and_operatorsAlexander Kiryukhin2018-09-064-3/+64
|\ \ \ \ | |_|_|/ |/| | | Getters for function and operators
| * | | Merge branch 'master' into getters_for_function_and_operatorsAlexander Kiryukhin2018-09-069-11/+31
| |\ \ \ | |/ / / |/| | |
| * | | Add ability to get functions and operators that have been registeredBruce Wells2018-08-312-0/+43
| | | |