-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding energy units #33
Merged
jordanbrauer
merged 4 commits into
jordanbrauer:develop
from
andrewboerema:energy-units
Nov 12, 2017
Merged
Adding energy units #33
jordanbrauer
merged 4 commits into
jordanbrauer:develop
from
andrewboerema:energy-units
Nov 12, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewboerema
commented
Oct 11, 2017
- Properly cased the unit symbols for Joules (J) and watts (W)
- Added kJ, MJ, kWh, MWh, MeV, and Nm
- Removed some unnecessary imports
10 tasks
jordanbrauer
requested changes
Oct 11, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few notes before your contribution can be pulled in:
- Switch target branch from
jordanbrauer:master
tojordanbrauer:develop
(you may need to pull in and resolve any merge conflicts from your fork and the current state ofdevelop
) - Write some integration tests for your units to ensure that they convert properly - you can add them to this file:
tests/integration/UnitConverter/Unit/Energy/EnergyUnits.spec.php
.- Additionally, fix any tests that may have failed due to your upgrades (e.g., unit symbol cases)
- Make sure Travis passes the build process 😉
Great stuff @andrewboerema! Thanks for your contribution. I've included some requested changes before your pull request can be accepted. |
jordanbrauer
added a commit
that referenced
this pull request
Nov 12, 2017
* remove composer.lock from repo and add it to .gitignore (#30) * Implement Kilopascal and Megapascal and write tests (#29) * implement Kilopascal * implement Megapascal * fix docblocks * Fix: add missing self conversions for temperature units (#31) * Feature/improve travis file (#32) * update .travis.yml * Added time measurements (#35) Closes #10 * Added time measurements * Added requested changes * Added new time units * Feat: add simple contributing guide for now (#36) * Added last weight measures (#37) * Added last weight measures * Fixed stone units * Added millibar as pressure unit (#34) * Added millibar as pressure unit * Fixed wrong millibar, also fixed documentation block * Added requested changes * Added requested changes * Fixed millibar units * scientificSymbol property, getter and setter are added (#47) closes #46 * Add first set of dev docs (#44) * Update: composer docs cmd now uses bash script to check for stale docs * Update: phpDocumentor XML config file * Feat: docs for v0.3.9-alpha (#43) * Update: move docs directory to project root for github pages support * Adding energy units (#33) * Properly casing unit symbols * Adding requested energy units * Removing unnecessary imports * Upgrade: docs & composer version * Fix: Energy integration test - wrong unit case for Joule
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.