Skip to content

Commit c98b217

Browse files
committed
Updated dependencies and tests
1 parent 543d4cd commit c98b217

39 files changed

Lines changed: 324 additions & 366 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ php-cs-fixer.phar
33
vendor
44
.idea
55
composer.lock
6+
.phpunit.result.cache

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ matrix:
3131
before_script:
3232
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
3333
- 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;
3435
- if [[ "$dependencies" == "highest" ]]; then travis_retry composer require laminas/laminas-mvc-console:^1.1 --prefer-dist $COMPOSER_ARGS; fi;
3536

3637
script:
3738
- ./vendor/bin/phpunit
38-
- ./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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
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",
@@ -37,8 +37,8 @@
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"

phpunit.xml.dist

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
<?xml version="1.0"?>
2-
<!-- works fine with PHPUnit-3.6.10 -->
3-
<phpunit
4-
bootstrap="./tests/Bootstrap.php"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
verbose="true"
10-
stopOnFailure="false"
11-
processIsolation="false"
12-
backupGlobals="false"
13-
syntaxCheck="true"
14-
>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
4+
bootstrap="./tests/Bootstrap.php"
5+
colors="true"
6+
convertErrorsToExceptions="true"
7+
convertNoticesToExceptions="true"
8+
convertWarningsToExceptions="true"
9+
verbose="true"
10+
stopOnFailure="false"
11+
processIsolation="false"
12+
backupGlobals="false"
13+
>
1514
<testsuite name="AssetManager tests">
1615
<directory>./tests/AssetManagerTest</directory>
1716
</testsuite>

src/AssetManager/Controller/ConsoleController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ protected function purgeCache($verbose = false)
101101
}
102102

103103
foreach ($this->appConfig['asset_manager']['caching'] as $configName => $config) {
104-
105104
if (empty($config['options']['dir'])) {
106105
continue;
107106
}

src/AssetManager/Resolver/AliasPathStackResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class AliasPathStackResolver implements ResolverInterface, MimeResolverAwareInterface
1717
{
1818
/**
19-
* @var Array
19+
* @var array
2020
*/
2121
protected $aliases = array();
2222

src/AssetManager/Resolver/CollectionResolver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public function resolve($name)
122122
$collection->setTargetPath($name);
123123

124124
foreach ($this->collections[$name] as $asset) {
125-
126125
if (!is_string($asset)) {
127126
throw new Exception\RuntimeException(
128127
'Asset should be of type string. got ' . gettype($asset)

src/AssetManager/Resolver/ConcatResolver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public function resolve($name)
128128
$resolvedAssets = array();
129129

130130
foreach ((array) $this->concats[$name] as $assetName) {
131-
132131
$resolvedAsset = $this->getAggregateResolver()->resolve((string) $assetName);
133132

134133
if (!$resolvedAsset instanceof AssetInterface) {

src/AssetManager/Resolver/PathStackResolver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ public function resolve($name)
176176
}
177177

178178
foreach ($this->getPaths() as $path) {
179-
180179
$file = new SplFileInfo($path . $name);
181180

182181
if ($file->isReadable() && !$file->isDir()) {

src/AssetManager/Service/AggregateResolverServiceFactory.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
3333
}
3434

3535
foreach ($config['resolvers'] as $resolverService => $priority) {
36-
3736
$resolverService = $container->get($resolverService);
3837

3938
if (!$resolverService instanceof ResolverInterface) {

0 commit comments

Comments
 (0)