Resolved composer config

This commit is contained in:
Franco Springveldt 2017-09-08 17:09:16 +12:00
parent b739e6cc5f
commit 136a914304
6 changed files with 53 additions and 30 deletions

View File

@ -1,34 +1,35 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
sudo: false
language: php language: php
php: dist: trusty
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
env: env:
- DB=MYSQL CORE_RELEASE=3.2 global:
- COMPOSER_ROOT_VERSION=4.0.x-dev
matrix: matrix:
include: include:
- php: 5.6 - php: 5.6
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.2
allow_failures:
- php: 7.0 - php: 7.0
env: DB=PGSQL PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
before_script: before_script:
- composer self-update || true # Init PHP
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - phpenv rehash
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - phpenv config-rm xdebug.ini
- cd ~/builds/ss
- composer install # Install composer dependencies
- composer install --prefer-dist
- composer require --prefer-dist --no-update silverstripe/recipe-framework:1.0.x-dev
- if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:2.0.x-dev; fi
- composer update
script: script:
- vendor/bin/phpunit multiform/tests - 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 --standard=framework/phpcs.xml.dist src/ tests/; fi
after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

View File

@ -1,6 +1,6 @@
# MultiForm Module # MultiForm Module
[![Build Status](https://api.travis-ci.org/silverstripe/silverstripe-multiform.svg?branch=master)](https://travis-ci.org/silverstripe/silverstripe-multiform) [![Build Status](https://travis-ci.org/silverstripe/silverstripe-multiform.svg?branch=master)](https://travis-ci.org/silverstripe/silverstripe-multiform)
[![Latest Stable Version](https://poser.pugx.org/silverstripe/multiform/version.svg)](https://github.com/silverstripe/silverstripe-multiform/releases) [![Latest Stable Version](https://poser.pugx.org/silverstripe/multiform/version.svg)](https://github.com/silverstripe/silverstripe-multiform/releases)
[![Latest Unstable Version](https://poser.pugx.org/silverstripe/multiform/v/unstable.svg)](https://packagist.org/packages/silverstripe/multiform) [![Latest Unstable Version](https://poser.pugx.org/silverstripe/multiform/v/unstable.svg)](https://packagist.org/packages/silverstripe/multiform)
[![Total Downloads](https://poser.pugx.org/silverstripe/multiform/downloads.svg)](https://packagist.org/packages/silverstripe/multiform) [![Total Downloads](https://poser.pugx.org/silverstripe/multiform/downloads.svg)](https://packagist.org/packages/silverstripe/multiform)

View File

@ -3,4 +3,5 @@ Name: multisitelegacy
--- ---
SilverStripe\ORM\DatabaseAdmin: SilverStripe\ORM\DatabaseAdmin:
classname_value_remapping: classname_value_remapping:
MultiFormSession: SilverStripe\MultiForm\Model\MultiFormSession MultiFormSession: SilverStripe\MultiForm\Models\MultiFormSession
MultiFormStep: SilverStripe\MultiForm\Models\MultiFormStep

View File

@ -13,10 +13,17 @@
"require": { "require": {
"silverstripe/framework": "~3.2" "silverstripe/framework": "~3.2"
}, },
"license": "BSD-3-Clause", "require": {
"extra": { "silverstripe/framework": "^4@dev"
"branch-alias": { },
"dev-master": "2.x-dev" "require-dev": {
} "phpunit/phpunit": "^5.7",
} "squizlabs/php_codesniffer": "^3.0"
},
"license": "BSD-3-Clause",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
}
} }

13
phpunit.xml.dist Normal file
View File

@ -0,0 +1,13 @@
<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
<testsuite name="Default">
<directory>tests/</directory>
</testsuite>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">src/</directory>
<exclude>
<directory suffix=".php">tests/</directory>
</exclude>
</whitelist>
</filter>
</phpunit>

View File

@ -1,8 +1,9 @@
<?php <?php
namespace SilverStripe\MultiForm; namespace SilverStripe\MultiForm\Tasks;
use SilverStripe\Dev\BuildTask; use SilverStripe\Dev\BuildTask;
use SilverStripe\MultiForm\Models\MultiFormSession;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;