Skip to content
This repository has been archived by the owner on Jul 25, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/v2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobbyshaw
bobbyshaw committed Jun 17, 2016
2 parents 99208eb + 68a12df commit 8988170
Show file tree
Hide file tree
Showing 17 changed files with 1,624 additions and 1,047 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
vendor
composer.lock
coverage/
3 changes: 3 additions & 0 deletions .scrutinizer.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tools:
external_code_coverage: true

4 changes: 4 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ before_script:

script: phpunit


after_script:
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover coverage/clover/coverage.xml
7 changes: 6 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
],

"require-dev": {
"phpunit/phpunit": "4.*"
"phpunit/phpunit": "4.*",
"phpro/grumphp": "^0.9.0",
"fabpot/php-cs-fixer": "^1.11",
"squizlabs/php_codesniffer": "^2.5",
"roave/security-advisories": "dev-master"

},

"autoload": {
Expand Down
16 changes: 2 additions & 14 deletions data/3_deliveryMethodMeta.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,12 @@ UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,1001,2500,2500,"Spec
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0,50,50,"Special Delivery: Guaranteed by 9am Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 9am Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,0,500,500,"Special Delivery: Guaranteed by 1pm"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,1001,2500,2500,"Special Delivery: Guaranteed by 1pm"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,0,50,50,"Special Delivery: Guaranteed by 9am"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,1001,2500,2500,"Special Delivery: Guaranteed by 9am"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,0,500,500,"Special Delivery: Guaranteed by 1pm Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 1pm Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0,50,50,"Special Delivery: Guaranteed by 9am Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am Saturday"
UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 9am Saturday"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LETTER,0,50,50,"Signed For: First Class Letter"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0,50,50,"Signed For: First Class Large Letter"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50,"Signed For: First Class Small Parcel"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"Signed For: First Class Medium Parcel"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50,"Signed For: Second Class Class Letter"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0,50,50,"Signed For: Second Class Class Large Letter"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50,"Signed For: Second Class Letter"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0,50,50,"Signed For: Second Class Large Letter"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL,0,50,50,"Signed For: Second Class Small Parcel"
UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,0,50,50,"Signed For: Second Class Medium Parcel"
UK_STANDARD_FIRST_CLASS_LETTER,0,20,20,"Standard First Class Letter"
Expand Down
524 changes: 247 additions & 277 deletions data/4_deliveryToPrice.csv
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/5_cleanNameToMethod.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"firstclasslargelettersignedfor","Signed For: First Class Large Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0,50,50
"firstclasssignedforsmall","Signed For: First Class Small Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50
"firstclasssignedformedium","Signed For: First Class Medium Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50
"secondclasslettersignedfor","Signed For: Second Class Class Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50
"secondclasslargelettersignedfor","Signed For: Second Class Class Large Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0,50,50
"secondclasslettersignedfor","Signed For: Second Class Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50
"secondclasslargelettersignedfor","Signed For: Second Class Large Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0,50,50
"secondclasssmallparcelsignedfor","Signed For: Second Class Small Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL,0,50,50
"secondclassmediumparcelsignedfor","Signed For: Second Class Medium Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,0,50,50
"letter","Standard First Class Letter",UK_STANDARD_FIRST_CLASS_LETTER,0,20,20
Expand Down
8 changes: 4 additions & 4 deletions data/6_cleanNameMethodGroup.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday"
"firstclasslettersignedfor","Signed For: First Class Letter"
"firstclasslargelettersignedfor","Signed For: First Class Large Letter"
"firstclasssignedforsmall","Signed For: First Small Parcel"
"firstclasssignedformedium","Signed For: First Medium Parcel"
"secondclasslettersignedfor","Signed For: Second Class Class Letter"
"secondclasslargelettersignedfor","Signed For: Second Class Class Large Letter"
"firstclasssignedforsmall","Signed For: First Class Small Parcel"
"firstclasssignedformedium","Signed For: First Class Medium Parcel"
"secondclasslettersignedfor","Signed For: Second Class Letter"
"secondclasslargelettersignedfor","Signed For: Second Class Large Letter"
"secondclasssmallparcelsignedfor","Signed For: Second Class Small Parcel"
"secondclassmediumparcelsignedfor","Signed For: Second Class Medium Parcel"
"letter","Standard First Class Letter"
Expand Down
10 changes: 10 additions & 0 deletions grumphp.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
parameters:
git_dir: .
bin_dir: ./vendor/bin
tasks:
composer: ~
phpcs:
tab_width: 4
phpcsfixer:
level: psr2
phpunit: ~
13 changes: 12 additions & 1 deletion phpunit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
</phpunit>
<filter>
<whitelist>
<directory>src/</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="coverage/html/phpunit" charset="UTF-8"
yui="true" highlight="false"
lowUpperBound="35" highLowerBound="70"/>
<log type="coverage-clover" target="coverage/clover/coverage.xml"/>
</logging>
</phpunit>
85 changes: 0 additions & 85 deletions src/CalculateMethod.php
View file

This file was deleted.

Loading

0 comments on commit 8988170

Please sign in to comment.