diff --git a/.travis.yml b/.travis.yml index dc86930..a826a56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,7 +107,7 @@ before_script: PHPUNIT_FLAGS="--coverage-clover=coverage.clover" fi script: - - vendor/bin/phpunit --debug --verbose $PHPUNIT_FLAGS --enforce-time-limit + - vendor/bin/phpunit --verbose $PHPUNIT_FLAGS --enforce-time-limit after_script: - | diff --git a/composer.json b/composer.json index 167cd78..596be53 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ } ], "require": { - "yiisoft/yii2": "~2.0.15" + "yiisoft/yii2": "^2.0.15.0" }, "require-dev": { - "yiisoft/yii2-dev": "~2.0.15", + "yiisoft/yii2-dev": "~2.0.15.0", "yiisoft/yii2-coding-standards": "^2.0.2", "phpunit/phpunit": "4.8.34" }, @@ -33,16 +33,16 @@ "config": { "platform": { "php": "5.4" - } - }, - "extra": { - "asset-installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" }, - "asset-vcs-driver-options": { - "github-no-api": true - }, - "asset-pattern-skip-version": "(-build|-patch)" + "fxp-asset": { + "installer-paths": { + "npm-asset-library": "vendor/npm", + "bower-asset-library": "vendor/bower" + }, + "vcs-driver-options": { + "github-no-api": true + }, + "pattern-skip-version": "(-build|-patch)" + } } } diff --git a/composer.lock b/composer.lock index 32f6801..07484c3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "d015d4ea6455980811e107e60cf98777", + "content-hash": "5aaeea677f3ba305bc64ad566e0d7c14", "packages": [ { "name": "bower-asset/inputmask", @@ -1430,7 +1430,7 @@ }, { "name": "symfony/yaml", - "version": "v2.8.36", + "version": "v2.8.37", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git",