Updated dependencies and tests

Author: thomasvargiu

.gitignore

@@ -3,3 +3,4 @@ php-cs-fixer.phar
 vendor
 .idea
 composer.lock
+.phpunit.result.cache

.travis.yml

@@ -31,8 +31,9 @@ matrix:
 before_script:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
   - if [[ "$dependencies" == "lowest" ]]; then travis_retry composer update --prefer-dist --prefer-lowest --prefer-stable $COMPOSER_ARGS; fi;
+  - if [[ "$dependencies" == "highest" ]]; then travis_retry composer update --prefer-dist $COMPOSER_ARGS; fi;
   - if [[ "$dependencies" == "highest" ]]; then travis_retry composer require laminas/laminas-mvc-console:^1.1 --prefer-dist $COMPOSER_ARGS; fi;
 
 script:
   - ./vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 ./src ./tests/AssetManagerTest
+  - if [[ "$CS_CHECK" == "true" ]]; then ./vendor/bin/phpcs --standard=PSR2 ./src ./tests/AssetManagerTest; fi;

composer.json

@@ -22,9 +22,9 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3 || ^8.0",
         "laminas/laminas-modulemanager": "^2.7.2",
-        "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
+        "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-servicemanager": "^2.7.6 || ^3.1.1",
         "laminas/laminas-loader": "^2.5.1",
         "laminas/laminas-eventmanager": "^2.6.3 || ^3.0.1",
@@ -37,8 +37,8 @@
         "laminas/laminas-view": "^2.8.1",
         "laminas/laminas-cache": "^2.7.1",
         "laminas/laminas-console": "^2.6",
-        "squizlabs/php_codesniffer": "~1.5.0",
-        "phpunit/phpunit": "^7.0"
+        "squizlabs/php_codesniffer": "^3.5.6",
+        "phpunit/phpunit": "^8.5.8 || ^9.1"
     },
     "suggest": {
         "laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application"

phpunit.xml.dist

@@ -1,17 +1,16 @@
-<?xml version="1.0"?>
-<!-- works fine with PHPUnit-3.6.10 -->
-<phpunit
-        bootstrap="./tests/Bootstrap.php"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        verbose="true"
-        stopOnFailure="false"
-        processIsolation="false"
-        backupGlobals="false"
-        syntaxCheck="true"
-        >
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="./tests/Bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         verbose="true"
+         stopOnFailure="false"
+         processIsolation="false"
+         backupGlobals="false"
+         >
     <testsuite name="AssetManager tests">
         <directory>./tests/AssetManagerTest</directory>
     </testsuite>

src/AssetManager/Controller/ConsoleController.php

@@ -101,7 +101,6 @@ protected function purgeCache($verbose = false)
         }
 
         foreach ($this->appConfig['asset_manager']['caching'] as $configName => $config) {
-
             if (empty($config['options']['dir'])) {
                 continue;
             }

src/AssetManager/Resolver/AliasPathStackResolver.php

@@ -16,7 +16,7 @@
 class AliasPathStackResolver implements ResolverInterface, MimeResolverAwareInterface
 {
     /**
-     * @var Array
+     * @var array
      */
     protected $aliases = array();
 

src/AssetManager/Resolver/CollectionResolver.php

@@ -122,7 +122,6 @@ public function resolve($name)
         $collection->setTargetPath($name);
 
         foreach ($this->collections[$name] as $asset) {
-
             if (!is_string($asset)) {
                 throw new Exception\RuntimeException(
                     'Asset should be of type string. got ' . gettype($asset)

src/AssetManager/Resolver/ConcatResolver.php

@@ -128,7 +128,6 @@ public function resolve($name)
         $resolvedAssets = array();
 
         foreach ((array) $this->concats[$name] as $assetName) {
-
             $resolvedAsset = $this->getAggregateResolver()->resolve((string) $assetName);
 
             if (!$resolvedAsset instanceof AssetInterface) {

src/AssetManager/Resolver/PathStackResolver.php

@@ -176,7 +176,6 @@ public function resolve($name)
         }
 
         foreach ($this->getPaths() as $path) {
-
             $file = new SplFileInfo($path . $name);
 
             if ($file->isReadable() && !$file->isDir()) {

src/AssetManager/Service/AggregateResolverServiceFactory.php

@@ -33,7 +33,6 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         }
 
         foreach ($config['resolvers'] as $resolverService => $priority) {
-
             $resolverService = $container->get($resolverService);
 
             if (!$resolverService instanceof ResolverInterface) {

src/AssetManager/View/Helper/Asset.php

@@ -57,7 +57,6 @@ private function elaborateFilePath($filename, $queryString)
     {
         $asset = $this->assetManagerResolver->resolve($filename);
         if ($asset !== null) {
-
             // append last modified date to the filepath and use a custom query string
             return $this->appendTimestamp($filename, $queryString, $asset->getLastModified());
         }
@@ -121,7 +120,6 @@ public function __invoke($filename)
 
         // no cache dir is defined
         if (!isset($cacheConfig['options']['dir'])) {
-
             // append current timestamp to the filepath and use a custom query string
             return $this->appendTimestamp($filename, $queryString);
         }

tests/AssetManagerTest/Cache/FilePathCacheTest.php

@@ -8,25 +8,30 @@
 
 class FilePathCacheTest extends TestCase
 {
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $cache = new FilePathCache('/imagination', 'bacon.porn');
         $this->assertTrue($cache instanceof CacheInterface);
 
-        $this->assertAttributeEquals(
+        $refClass = new \ReflectionClass(FilePathCache::class);
+        $dirProp = $refClass->getProperty('dir');
+        $dirProp->setAccessible(true);
+
+        $filenameProp = $refClass->getProperty('filename');
+        $filenameProp->setAccessible(true);
+
+        $this->assertSame(
             '/imagination',
-            'dir',
-            $cache
+            $dirProp->getValue($cache)
         );
 
-        $this->assertAttributeEquals(
+        $this->assertSame(
             'bacon.porn',
-            'filename',
-            $cache
+            $filenameProp->getValue($cache)
         );
     }
 
-    public function testHas()
+    public function testHas(): void
     {
         // Check fail
         $cache = new FilePathCache('/imagination', 'bacon.porn');
@@ -37,31 +42,26 @@ public function testHas()
         $this->assertTrue($cache->has('bacon'));
     }
 
-    /**
-     * @expectedException \RunTimeException
-     *
-     */
-    public function testGetException()
+    public function testGetException(): void
     {
+        $this->expectException(\RuntimeException::class);
         $cache = new FilePathCache('/imagination', 'bacon.porn');
         $cache->get('bacon');
     }
 
-    public function testGet()
+    public function testGet(): void
     {
         $cache = new FilePathCache('', __FILE__);
         $this->assertEquals(file_get_contents(__FILE__), $cache->get('bacon'));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testSetMayNotWriteFile()
+    public function testSetMayNotWriteFile(): void
     {
+        $this->expectException(\RuntimeException::class);
         restore_error_handler(); // Previous test fails, so doesn't unset.
         $time = time();
         $sentence = 'I am, what I am. Cached data, please don\'t hate, '
-            . 'for we are all equals. Except you, you\'re a dick.';
+           . 'for we are all equals. Except you, you\'re a dick.';
         $base = '/tmp/_cachetest.' . $time . '/';
         mkdir($base, 0777);
         mkdir($base.'readonly', 0400, true);
@@ -70,33 +70,28 @@ public function testSetMayNotWriteFile()
         $cache->set('bacon', $sentence);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testSetMayNotWriteDir()
+    public function testSetMayNotWriteDir(): void
     {
+        $this->expectException(\RuntimeException::class);
         restore_error_handler(); // Previous test fails, so doesn't unset.
         $time = time()+1;
         $sentence = 'I am, what I am. Cached data, please don\'t hate, '
-            . 'for we are all equals. Except you, you\'re a dick.';
+           . 'for we are all equals. Except you, you\'re a dick.';
         $base = '/tmp/_cachetest.' . $time . '/';
         mkdir($base, 0400, true);
 
         $cache = new FilePathCache($base.'readonly', 'bacon.'.$time.'.hammertime');
 
         $cache->set('bacon', $sentence);
-
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testSetCanNotWriteToFileThatExists()
+    public function testSetCanNotWriteToFileThatExists(): void
     {
+        $this->expectException(\RuntimeException::class);
         restore_error_handler(); // Previous test fails, so doesn't unset.
         $time = time()+333;
         $sentence = 'I am, what I am. Cached data, please don\'t hate, '
-            . 'for we are all equals. Except you, you\'re a dick.';
+           . 'for we are all equals. Except you, you\'re a dick.';
         $base = '/tmp/_cachetest.' . $time . '/';
         mkdir($base, 0777);
 
@@ -110,7 +105,7 @@ public function testSetCanNotWriteToFileThatExists()
         $cache->set('bacon', $sentence);
     }
 
-    public function testSetSuccess()
+    public function testSetSuccess(): void
     {
         $time       = time();
         $sentence = 'I am, what I am. Cached data, please don\'t hate, '
@@ -122,17 +117,15 @@ public function testSetSuccess()
         $this->assertEquals($sentence, file_get_contents($base.'bacon.'.$time));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testRemoveFails()
+    public function testRemoveFails(): void
     {
+        $this->expectException(\RuntimeException::class);
         $cache = new FilePathCache('/dev', 'null');
 
         $cache->remove('bacon');
     }
 
-    public function testRemoveSuccess()
+    public function testRemoveSuccess(): void
     {
         $time       = time();
         $sentence = 'I am, what I am. Cached data, please don\'t hate, '
@@ -145,7 +138,7 @@ public function testRemoveSuccess()
         $this->assertTrue($cache->remove('bacon'));
     }
 
-    public function testCachedFile()
+    public function testCachedFile(): void
     {
         $method = new \ReflectionMethod(FilePathCache::class, 'cachedFile');
 

tests/AssetManagerTest/Cache/LaminasCacheAdapterTest.php

@@ -12,7 +12,7 @@
  */
 class LaminasCacheAdapterTest extends \PHPUnit\Framework\TestCase
 {
-    public function testConstructor()
+    public function testConstructor(): void
     {
         $mockLaminasCache = $this->getMockBuilder(Memory::class)
             ->disableOriginalConstructor()
@@ -23,19 +23,17 @@ public function testConstructor()
         $this->assertInstanceOf(LaminasCacheAdapter::class, $adapter);
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\Error\Error
-     */
-    public function testConstructorOnlyAcceptsALaminasCacheStorageInterface()
+    public function testConstructorOnlyAcceptsALaminasCacheStorageInterface(): void
     {
+        $this->expectError();
         if (PHP_MAJOR_VERSION >= 7) {
             $this->expectException('\TypeError');
         }
 
         new LaminasCacheAdapter(new \DateTime());
     }
 
-    public function testHasMethodCallsLaminasCacheHasItem()
+    public function testHasMethodCallsLaminasCacheHasItem(): void
     {
         $mockLaminasCache = $this->getMockBuilder(Memory::class)
             ->disableOriginalConstructor()
@@ -48,7 +46,7 @@ public function testHasMethodCallsLaminasCacheHasItem()
         $adapter->has('SomeKey');
     }
 
-    public function testGetMethodCallsLaminasCacheGetItem()
+    public function testGetMethodCallsLaminasCacheGetItem(): void
     {
         $mockLaminasCache = $this->getMockBuilder(Memory::class)
             ->disableOriginalConstructor()
@@ -61,7 +59,7 @@ public function testGetMethodCallsLaminasCacheGetItem()
         $adapter->get('SomeKey');
     }
 
-    public function testSetMethodCallsLaminasCacheSetItem()
+    public function testSetMethodCallsLaminasCacheSetItem(): void
     {
         $mockLaminasCache = $this->getMockBuilder(Memory::class)
             ->disableOriginalConstructor()
@@ -74,7 +72,7 @@ public function testSetMethodCallsLaminasCacheSetItem()
         $adapter->set('SomeKey', array());
     }
 
-    public function testRemoveMethodCallsLaminasCacheRemoveItem()
+    public function testRemoveMethodCallsLaminasCacheRemoveItem(): void
     {
         $mockLaminasCache = $this->getMockBuilder(Memory::class)
             ->disableOriginalConstructor()