Merge pull request #251 from bscheshirwork/use-asset-packegist

We can use asset-packagist instead of fxp-asset
This commit is contained in:
Antonio Ramirez
2018-10-20 11:56:00 +02:00
committed by GitHub
5 changed files with 13 additions and 12 deletions

View File

@ -30,7 +30,6 @@ install:
phpenv config-rm xdebug.ini || echo "xdebug is not installed"
fi
- travis_retry composer self-update && composer --version
- travis_retry composer global require "fxp/composer-asset-plugin:^1.4.0"
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-dist --no-interaction

View File

@ -17,6 +17,7 @@
- Enh: Add controller module class reference (TonisOrmisson)
- Enh: Replace the deprecated InvalidParamException in ClassMapHelper (TonisOrmisson)
- Fix #242: Add POST filter for `admin/force-password-change` action (bscheshirwork)
- Enh #251: Use `asset-packagist` instead of `fxp-asset` if you run it as a module without having a project around (bscheshirwork)
- Fix #252: Delete check for unexpected property `allowPasswordRecovery` for resend email by admin (bscheshirwork)
- Fix #254: Rename `GDPR` properties to `lowerCamelCase` style (bscheshirwork)
- Fix #258: Rename `GDPR` delete action to `lowerCamelCase`/`dash` style (bscheshirwork)

View File

@ -80,15 +80,7 @@
"*": "auto"
},
"fxp-asset": {
"installer-paths": {
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
},
"vcs-driver-options": {
"github-no-api": true
},
"git-skip-update": "2 days",
"pattern-skip-version": "(-build|-patch)"
"enabled": false
}
},
"conflict": {
@ -97,5 +89,11 @@
},
"extra": {
"bootstrap": "Da\\User\\Bootstrap"
},
"repositories": [
{
"type": "composer",
"url": "https://asset-packagist.org"
}
]
}

View File

@ -6,6 +6,8 @@ return [
'aliases' => [
'@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User',
'@tests' => dirname(dirname(__DIR__)),
'@bower' => '@vendor/bower-asset',
'@npm' => '@vendor/npm-asset',
],
'components' => [
'log' => null,

View File

@ -8,7 +8,8 @@ return [
'@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User',
'@tests' => dirname(dirname(__DIR__)),
'@vendor' => VENDOR_DIR,
'@bower' => VENDOR_DIR . '/bower',
'@bower' => '@vendor/bower-asset',
'@npm' => '@vendor/npm-asset',
],
'bootstrap' => ['Da\User\Bootstrap'],
'modules' => [