Skip to content

Commit a633e27

Browse files
authored
Merge pull request #221 from thomasvargiu/deps-update
Dependencies update with assetic framework
2 parents 3f6dc69 + c98b217 commit a633e27

50 files changed

Lines changed: 530 additions & 3415 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ clover.xml
22
php-cs-fixer.phar
33
vendor
44
.idea
5+
composer.lock
6+
.phpunit.result.cache

.travis.yml

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,39 @@
11
language: php
22

3-
dist: trusty
3+
cache:
4+
directories:
5+
- $HOME/.composer/cache
46

5-
php:
6-
- 7.3
7-
- 7.4
7+
env:
8+
global:
9+
- COMPOSER_ARGS="--no-interaction"
810

911
matrix:
12+
fast_finish: true
1013
include:
14+
- php: 7.3
15+
env: dependencies=lowest
1116
- php: 7.3
1217
env: dependencies=highest
18+
- php: 7.4
19+
env: dependencies=lowest
1320
- php: 7.4
1421
env: dependencies=highest
22+
- php: 8.0
23+
env:
24+
- dependencies=lowest
25+
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
26+
- php: 8.0
27+
env:
28+
- dependencies=highest
29+
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
1530

1631
before_script:
17-
- composer self-update
18-
- if [ -z "$dependencies" ]; then composer install --prefer-dist -n; fi;
19-
- if [ "$dependencies" = "lowest" ]; then composer update --prefer-dist --prefer-lowest -n; fi;
20-
- if [ "$dependencies" = "highest" ]; then composer require laminas/laminas-mvc-console:^1.1 --prefer-dist -n; fi;
32+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
33+
- if [[ "$dependencies" == "lowest" ]]; then travis_retry composer update --prefer-dist --prefer-lowest --prefer-stable $COMPOSER_ARGS; fi;
34+
- if [[ "$dependencies" == "highest" ]]; then travis_retry composer update --prefer-dist $COMPOSER_ARGS; fi;
35+
- if [[ "$dependencies" == "highest" ]]; then travis_retry composer require laminas/laminas-mvc-console:^1.1 --prefer-dist $COMPOSER_ARGS; fi;
2136

2237
script:
2338
- ./vendor/bin/phpunit
24-
- ./vendor/bin/phpcs --standard=PSR2 ./src ./tests/AssetManagerTest
39+
- if [[ "$CS_CHECK" == "true" ]]; then ./vendor/bin/phpcs --standard=PSR2 ./src ./tests/AssetManagerTest; fi;

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^7.3",
25+
"php": "^7.3 || ^8.0",
2626
"laminas/laminas-modulemanager": "^2.7.2",
27-
"laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
27+
"laminas/laminas-stdlib": "^3.2.1",
2828
"laminas/laminas-servicemanager": "^2.7.6 || ^3.1.1",
2929
"laminas/laminas-loader": "^2.5.1",
3030
"laminas/laminas-eventmanager": "^2.6.3 || ^3.0.1",
3131
"laminas/laminas-mvc": "^2.7.9 || ^3.0.2",
32-
"kriswallsmith/assetic": "^1.4.0",
32+
"assetic/framework": "^2.0",
3333
"laminas/laminas-dependency-plugin": "^2.0"
3434
},
3535
"require-dev": {
3636
"laminas/laminas-http": "^2.5.4",
3737
"laminas/laminas-view": "^2.8.1",
3838
"laminas/laminas-cache": "^2.7.1",
3939
"laminas/laminas-console": "^2.6",
40-
"squizlabs/php_codesniffer": "~1.5.0",
41-
"phpunit/phpunit": "^7.0"
40+
"squizlabs/php_codesniffer": "^3.5.6",
41+
"phpunit/phpunit": "^8.5.8 || ^9.1"
4242
},
4343
"suggest": {
4444
"laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application"

0 commit comments

Comments
 (0)