Skip to content

Commit

Permalink
Upgrade to SilverStripe 4, SilverShop 3
Browse files Browse the repository at this point in the history
  • Loading branch information
wilr committed Feb 10, 2018
1 parent 9943858 commit d3c7ece
Show file tree
Hide file tree
Showing 109 changed files with 3,551 additions and 2,880 deletions.
54 changes: 34 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,46 @@
language: php

php:
- 5.3
dist: trusty

env:
- DB=MYSQL CORE_RELEASE=3.1
global:
- COMPOSER_ROOT_VERSION=3.0.x-dev

matrix:
include:
- php: 5.5
env: DB=PGSQL CORE_RELEASE=3.1
- php: 5.4
env: DB=SQLITE CORE_RELEASE=3.1 COVERAGE=1
- php: 5.6
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.0
env: DB=PGSQL PHPUNIT_TEST=1
- php: 7.0
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1

before_script:
- composer self-update
# Init PHP
- phpenv rehash
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss
- phpenv config-rm xdebug.ini || true
- echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

# Install composer dependencies
- export PATH=~/.composer/vendor/bin:$PATH
- composer validate
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:^2.0 --no-update; fi
- composer update

script:
- "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 silvershop-discounts
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload -v --format=php-clover coverage.xml
- fi
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
# - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi

after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

notifications:
webhooks:
urls:
- 'https://webhooks.gitter.im/e/a3720004986a0f249abc'
on_success: change
on_failure: always
on_start: false
49 changes: 49 additions & 0 deletions .upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
mappings:
ItemPercentDiscount: SilverShop\Discounts\Actions\ItemPercentDiscount
ItemDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\ItemDiscountConstraint
DiscountReport: SilverShop\Discounts\Admin\DiscountReport
DiscountModelAdmin: SilverShop\Discounts\Admin\DiscountModelAdmin
CheckoutStepDiscount: SilverShop\Discounts\Checkout\Step\CheckoutStepDiscount
CouponForm: SilverShop\Discounts\Form\CouponForm
GridField_LinkComponent: SilverShop\Discounts\Form\GridField_LinkComponent
DiscountedOrderExtension: SilverShop\Discounts\Extensions\DiscountedOrderExtension
ProductVariationDiscountExtension: SilverShop\Discounts\Extensions\ProductVariationDiscountExtension
ProductDiscountExtension: SilverShop\Discounts\Extensions\ProductDiscountExtension
SpecificPricingExtension: SilverShop\Discounts\Extensions\SpecificPricingExtension
DiscountedOrderItem: SilverShop\Discounts\Extensions\DiscountedOrderItem
CouponFormCheckoutDecorator: SilverShop\Discounts\Extensions\CouponFormCheckoutDecorator
OrderDiscount: SilverShop\Discounts\Model\OrderDiscount
OrderCoupon: SilverShop\Discounts\Model\OrderCoupon
GiftVoucherProduct: SilverShop\Discounts\Model\GiftVoucherProduct
GiftVoucherProduct_Controller: SilverShop\Discounts\Model\GiftVoucherProduct_Controller
GiftVoucherFormValidator: SilverShop\Discounts\Model\GiftVoucherFormValidator
GiftVoucher_OrderItem: SilverShop\Discounts\Model\GiftVoucherOrderItem
Discount: SilverShop\Discounts\Model\Discount
PartialUseDiscount: SilverShop\Discounts\Model\PartialUseDiscount
OrderDiscountModifier: SilverShop\Discounts\Model\Modifiers\OrderDiscountModifier
OrderCouponTest: SilverShop\Discounts\Tests\OrderCouponTest
PartialUseDiscountTest: SilverShop\Discounts\Tests\PartialUseDiscountTest
DiscountReportTest: SilverShop\Discounts\Tests\DiscountReportTest
CouponFormTest: SilverShop\Discounts\Tests\CouponFormTest
OrderDiscountTest: SilverShop\Discounts\Tests\OrderDiscountTest
SpecificPriceTest: SilverShop\Discounts\Tests\SpecificPriceTest
GiftVoucherTest: SilverShop\Discounts\Tests\GiftVoucherTest
CalculatorTest: SilverShop\Discounts\Tests\CalculatorTest
DatetimeDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\DatetimeDiscountConstraintTest
CategoriesDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\CategoriesDiscountConstraintTest
ProductsDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\ProductsDiscountConstraintTest
ProductTypeDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\ProductTypeDiscountConstraintTest
UseLimitDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\UseLimitDiscountConstraintTest
MembershipDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\MembershipDiscountConstraintTest
ValueDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\ValueDiscountConstraintTest
GroupDiscountConstraintTest: SilverShop\Discounts\Tests\Constraints\GroupDiscountConstraintTest
CategoriesDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\CategoriesDiscountConstraint
DiscountConstraint: SilverShop\Discounts\Extensions\Constraints\DiscountConstraint
UseLimitDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\UseLimitDiscountConstraint
ValueDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\ValueDiscountConstraint
GroupDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\GroupDiscountConstraint
CodeDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\CodeDiscountConstraint
DatetimeDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\DatetimeDiscountConstraint
MembershipDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\MembershipDiscountConstraint
ProductsDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\ProductsDiscountConstraint
ProductTypeDiscountConstraint: SilverShop\Discounts\Extensions\Constraints\ProductTypeDiscountConstraint
4 changes: 2 additions & 2 deletions _config.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

define('silvershop-discounts_DIR', 'silvershop-discounts');
use SilverShop\Discounts\Extensions\Constraints\DiscountConstraint;

DiscountConstraint::set_up_constraints();
DiscountConstraint::set_up_constraints();
38 changes: 17 additions & 21 deletions _config/config.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
---
Name: silvershop-discounts
---
LeftAndMain:
extra_requirements_css:
- silvershop-discounts/css/OrderCouponAdmin.css
Product:
SilverShop\Page\Product:
extensions:
- ProductDiscountExtension
ProductVariation:
- SilverShop\Discounts\Extensions\ProductDiscountExtension
SilverShop\Model\Variation\Variation:
extensions:
- ProductVariationDiscountExtension
Order:
- SilverShop\Discounts\Extensions\ProductVariationDiscountExtension
SilverShop\Model\Order:
extensions:
- DiscountedOrderExtension
Product_OrderItem:
- SilverShop\Discounts\Extensions\DiscountedOrderExtension
SilverShop\Model\OrderItem:
extensions:
- DiscountedOrderItem
Discount:
- SilverShop\Discounts\Extensions\DiscountedOrderItem
SilverShop\Discounts\Model\Discount:
constraints:
- ZonesDiscountConstraint
- CategoriesDiscountConstraint
- ProductsDiscountConstraint
- GroupDiscountConstraint
- MembershipDiscountConstraint
- DatetimeDiscountConstraint
- ValueDiscountConstraint
- UseLimitDiscountConstraint
- CodeDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\CategoriesDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\ProductsDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\GroupDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\MembershipDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\DatetimeDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\ValueDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\UseLimitDiscountConstraint
- SilverShop\Discounts\Extensions\Constraints\CodeDiscountConstraint
44 changes: 0 additions & 44 deletions code/Adjustment.php

This file was deleted.

Loading

0 comments on commit d3c7ece

Please sign in to comment.