Skip to content

Commit

Permalink
Update naming
Browse files Browse the repository at this point in the history
  • Loading branch information
wilr committed Mar 3, 2016
1 parent f5bcb63 commit 53a3f74
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 51 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ before_script:
- cd ~/builds/ss

script:
- "if [ \"$COVERAGE\" = \"\" ]; then vendor/bin/phpunit -c shop_discount/phpunit.xml.dist; fi"
- "if [ \"$COVERAGE\" = \"1\" ]; then vendor/bin/phpunit -c shop_discount/phpunit.xml.dist --coverage-clover shop_discount/coverage.xml; fi"
- "if [ \"$COVERAGE\" = \"\" ]; then vendor/bin/phpunit -c silvershop-discounts/phpunit.xml.dist; fi"
- "if [ \"$COVERAGE\" = \"1\" ]; then vendor/bin/phpunit -c silvershop-discounts/phpunit.xml.dist --coverage-clover silvershop-discounts/coverage.xml; fi"

after_script:
- if [ "$COVERAGE" = "1" ]; then
- cd shop_discount
- cd silvershop-discounts
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload -v --format=php-clover coverage.xml
- fi
17 changes: 0 additions & 17 deletions ChangeLog

This file was deleted.

22 changes: 11 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
BSD2 License
Copyright (c) 2012, Jeremy Shipman
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
BSD2 License

Copyright (c) 2016. SilverShop
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion _config/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Name: shopdiscount
Name: silvershop-discounts
---
LeftAndMain:
extra_requirements_css:
Expand Down
9 changes: 6 additions & 3 deletions code/actions/Action.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?php

abstract class Action{

/**
* @package silvershop-discounts
*/
abstract class Action
{
abstract function perform();

abstract function isForItems();

}
}
21 changes: 5 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
{
"name" : "burnbright/silverstripe-shop-discount",
"description" : "Discounts submodule for silverstripe-shop module. Create coupons and generic discounts to be applied at checkout.",
"name" : "silvershop/discounts",
"description" : "Adds Discount and Coupon support for SilverShop.",
"license" : "BSD-2-Clause",
"type" : "silverstripe-module",
"keywords" : ["silverstripe","shop","shopping cart","ecommerce","discount","coupons"],
"authors" : [
{
"name" : "Jeremy Shipman",
"email" : "[email protected]",
"homepage" : "https://github.com/jedateach",
"role" : "Developer"
}
],
"require" : {
"silverstripe/cms": "~3.1",
"silverstripe/framework": "~3.1",
"burnbright/silverstripe-shop": "*"
"silvershop/core": "*"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7",
"burnbright/silverstripe-shop-shipping": "*"
"phpunit/PHPUnit": "~3.7"
},
"extra" : {
"installer-name": "shop_discount"
"installer-name": "silvershop-discounts"
}
}

0 comments on commit 53a3f74

Please sign in to comment.