Merge pull request #52 from laminas/0.1.x-merge-up-into-0.2.x_5f943ce…

…a396e71.85633606
laminas · Oct 24, 2020 · 504186f · 504186f
2 parents 7463975 + 863f529
commit 504186f
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,14 @@ matrix:
     - php: 7.4
       env:
         - DEPS=latest
+    - php: nightly
+      env:
+        - DEPS=lowest
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - php: nightly
+      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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 0.1.5 - 2020-10-24
+
+### Added
+
+- [#50](https://github.com/laminas/laminas-cli/pull/50) Add PHP 8.0 support
+
+
+-----
+
+### Release Notes for [0.1.5](https://github.com/laminas/laminas-cli/milestone/4)
+
+
+
+### 0.1.5
+
+- Total issues resolved: **0**
+- Total pull requests resolved: **1**
+- Total contributors: **1**
+
+#### Enhancement,hacktoberfest-accepted
+
+ - [50: PHP 8.0 support](https://github.com/laminas/laminas-cli/pull/50) thanks to @Thaix
+
 ## 0.1.4 - 2020-08-10
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         }
     },
     "require": {
-        "php": "^7.3",
+        "php": "^7.3 || ~8.0.0",
         "composer/package-versions-deprecated": "^1.10.99",
         "psr/container": "^1.0",
         "symfony/console": "^4.3 || ^5.1.2",
@@ -38,7 +38,7 @@
         "laminas/laminas-coding-standard": "~2.0.0",
         "laminas/laminas-mvc": "^3.1.1",
         "laminas/laminas-servicemanager": "^3.4",
-        "phpunit/phpunit": "^9.0.1",
+        "phpunit/phpunit": "^9.4.1",
         "vimeo/psalm": "^3.13"
     },
     "autoload": {

diff --git a/src/AbstractContainerCommandLoader.php b/src/AbstractContainerCommandLoader.php
@@ -87,7 +87,7 @@ private function fetchCommandFromContainer(string $name): Command
     /** @psalm-param class-string<Command> $class */
     private function createCommand(string $class, string $name): Command
     {
-        /** @psalm-suppress MixedMethodCall */
+        /** @psalm-suppress UnsafeInstantiation */
         $command = new $class();
         $command->setName($name);
         return $command;

diff --git a/src/Input/AbstractInputParam.php b/src/Input/AbstractInputParam.php
@@ -15,6 +15,7 @@
 use Webmozart\Assert\Assert;
 
 use function array_walk;
+use function get_debug_type;
 use function is_string;
 use function sprintf;
 use function trim;

diff --git a/src/Input/AbstractParamAwareInput.php b/src/Input/AbstractParamAwareInput.php
@@ -22,6 +22,7 @@
 
 use function array_map;
 use function array_walk;
+use function get_debug_type;
 use function in_array;
 use function is_array;
 use function sprintf;

diff --git a/test/Input/ParamAwareInputTest.php b/test/Input/ParamAwareInputTest.php
@@ -130,7 +130,7 @@ public function proxyMethodsAndArguments(): iterable
         yield 'hasArgument' => ['hasArgument', ['argument'], true];
         yield 'getOptions' => ['getOptions', [], ['name', 'bool', 'choices']];
         yield 'isInteractive' => ['isInteractive', [], true];
-        
+
         // Implementation-specific methods
         yield 'hasParameterOption' => ['hasParameterOption', [['some', 'values'], true], true];
         yield 'getParameterOption' => ['getParameterOption', [['some', 'values'], null, true], 'value'];
@@ -163,7 +163,7 @@ public function testProxiesToDecoratedInput(
             $this->helper,
             $this->params
         );
-        
+
         $this->assertSame($expectedOutput, $input->$method(...$arguments));
     }