Skip to content
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
merged 4 commits into from
Nov 12, 2017
Merged

Conversation

andrewboerema
Copy link

  • Properly cased the unit symbols for Joules (J) and watts (W)
  • Added kJ, MJ, kWh, MWh, MeV, and Nm
  • Removed some unnecessary imports

@andrewboerema andrewboerema changed the base branch from master to develop October 11, 2017 17:48
Copy link
Owner

@jordanbrauer jordanbrauer left a 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 to jordanbrauer:develop (you may need to pull in and resolve any merge conflicts from your fork and the current state of develop)
  • 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 😉

@jordanbrauer
Copy link
Owner

jordanbrauer commented Oct 11, 2017

Great stuff @andrewboerema! Thanks for your contribution. I've included some requested changes before your pull request can be accepted.

@jordanbrauer jordanbrauer added this to the Production Ready v1.0.0 milestone Oct 13, 2017
@jordanbrauer jordanbrauer merged commit 0860032 into jordanbrauer:develop Nov 12, 2017
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants