Merge branch 'develop'

Author: Ocramius

.gitignore

@@ -6,3 +6,5 @@
 /laminas-mkdoc-theme/
 /phpunit.xml
 /vendor/
+.phpunit.result.cache
+

.travis.yml

@@ -6,38 +6,34 @@ cache:
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction"
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
+    - php: 7.3
       env:
         - DEPS=lowest
-    - php: 5.6
+    - php: 7.3
       env:
         - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=latest
-    - php: 7.1
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
+    - php: 7.4
       env:
         - DEPS=lowest
-    - php: 7.1
+    - php: 7.4
       env:
         - DEPS=latest
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
-    - php: 7.2
+    - php: 8.0
       env:
         - DEPS=lowest
-    - php: 7.2
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - php: 8.0
       env:
         - DEPS=latest
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.3.0 - TBD
+
+### Added
+
+- [#9](https://github.com/laminas/laminas-mvc-console/pull/9) added PHP 8.x support.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.2.1 - TBD
 
 ### Added

composer.json

@@ -29,23 +29,25 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.3 || ~8.0.0",
         "container-interop/container-interop": "^1.1",
         "laminas/laminas-console": "^2.6",
-        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+        "laminas/laminas-eventmanager": "^3.3",
         "laminas/laminas-modulemanager": "^2.7.1",
         "laminas/laminas-mvc": "^3.0.3",
         "laminas/laminas-router": "^3.0",
-        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-        "laminas/laminas-stdlib": "^2.7.5 || ^3.0",
+        "laminas/laminas-servicemanager": "^3.3",
+        "laminas/laminas-stdlib": "^3.3",
         "laminas/laminas-text": "^2.6",
-        "laminas/laminas-view": "^2.6.3",
+        "laminas/laminas-view": "^2.11.3",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
         "laminas/laminas-filter": "^2.6.1",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+        "phpspec/prophecy": "^1.12.0",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.3"
     },
     "conflict": {
         "laminas/laminas-mvc": "<3.0.0"

test/Controller/ConsoleControllerTest.php

@@ -19,15 +19,18 @@
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class ConsoleControllerTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var TestAsset\ConsoleController
      */
     public $controller;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->controller = new TestAsset\ConsoleController();
 

test/ResponseSender/ConsoleResponseSenderTest.php

@@ -13,9 +13,12 @@
 use Laminas\Stdlib\ResponseInterface;
 use LaminasTest\Mvc\Console\ResponseSender\TestAsset\ConsoleResponseSender;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class ConsoleResponseSenderTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testSendResponseIgnoresInvalidResponseTypes()
     {
         $mockResponse = $this->getMockForAbstractClass(ResponseInterface::class);

test/Router/CatchallTest.php

@@ -13,9 +13,12 @@
 use Laminas\Mvc\Console\Router\RouteMatch;
 use Laminas\Stdlib\RequestInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class CatchallTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function provideFactoryOptions()
     {
         return [

test/Router/ConsoleRouterDelegatorFactoryTest.php

@@ -12,10 +12,12 @@
 use Laminas\Mvc\Console\Router\ConsoleRouterDelegatorFactory;
 use LaminasTest\Mvc\Console\Service\FactoryEnvironmentTrait;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class ConsoleRouterDelegatorFactoryTest extends TestCase
 {
     use FactoryEnvironmentTrait;
+    use ProphecyTrait;
 
     public function environments()
     {

test/Router/ConsoleRouterFactoryTest.php

@@ -13,10 +13,13 @@
 use Laminas\Mvc\Console\Router\SimpleRouteStack;
 use Laminas\Router\RoutePluginManager;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class ConsoleRouterFactoryTest extends TestCase
 {
-    public function setUp()
+    use ProphecyTrait;
+
+    public function setUp() : void
     {
         $this->container = $this->prophesize(ContainerInterface::class);
         $this->factory = new ConsoleRouterFactory();

test/Router/FactoryTester.php

@@ -48,9 +48,15 @@ public function testFactory($classname, array $requiredOptions, array $options)
             $classname::factory(0);
             $this->testCase->fail('An expected exception was not thrown');
         } catch (InvalidArgumentException $e) {
-            $this->testCase->assertContains('factory expects an array or Traversable set of options', $e->getMessage());
+            $this->testCase->assertStringContainsString(
+                'factory expects an array or Traversable set of options',
+                $e->getMessage()
+            );
         } catch (RouterInvalidArgumentException $e) {
-            $this->testCase->assertContains('factory expects an array or Traversable set of options', $e->getMessage());
+            $this->testCase->assertStringContainsString(
+                'factory expects an array or Traversable set of options',
+                $e->getMessage()
+            );
         }
 
         // Test required options.
@@ -63,9 +69,9 @@ public function testFactory($classname, array $requiredOptions, array $options)
                 $classname::factory($testOptions);
                 $this->testCase->fail('An expected exception was not thrown');
             } catch (InvalidArgumentException $e) {
-                $this->testCase->assertContains($exceptionMessage, $e->getMessage());
+                $this->testCase->assertStringContainsString($exceptionMessage, $e->getMessage());
             } catch (RouterInvalidArgumentException $e) {
-                $this->testCase->assertContains($exceptionMessage, $e->getMessage());
+                $this->testCase->assertStringContainsString($exceptionMessage, $e->getMessage());
             }
         }