Merge upstream in local

Author: Christian Benthake

.github/workflows/main.yml

@@ -1,16 +1,31 @@
 language: php
 
-php:
-  - "7.2"
-  - "7.3"
-  - "7.4"
+matrix:
+  include:
+    - php: 7.2
+      dist: bionic
+      env: COMPOSER_OPTS=""
+    - php: 7.3
+      dist: bionic
+      env: COMPOSER_OPTS=""
+    - php: 7.4
+      dist: bionic
+      env: COMPOSER_OPTS=""
+    - php: nightly
+      dist: bionic
+      env: COMPOSER_OPTS="--ignore-platform-reqs"
+  allow_failures:
+    - php: nightly
+      env: COMPOSER_OPTS="--ignore-platform-reqs"
 
 cache:
   directories:
     - $HOME/.composer/cache
 
+install:
+  - travis_retry composer install $COMPOSER_OPTS
+
 script:
-  - composer install
   - vendor/bin/grumphp run
   - composer test
   - composer infection

.travis.yml

@@ -39,7 +39,7 @@
     },
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.2 <7.5",
+        "php": ">=7.2",
         "ext-json": "*"
     },
     "extra": {

composer.json

@@ -7,11 +7,18 @@ services:
     - ./:/app
     - ~/.ssh:/home/application/.ssh
     - ~/.gitconfig:/home/application/.gitconfig
-    - ~/.composer/cache:/home/application/.composer/cache
     environment:
       - XDEBUG_REMOTE_HOST=${XDEBUG_REMOTE_HOST:-}
       - XDEBUG_REMOTE_PORT=${XDEBUG_REMOTE_PORT:-9000}
       - php.xdebug.idekey=${XDEBUG_IDEKEY:-PHPSTORM}
       - php.xdebug.remote_log=${XDEBUG_REMOTE_LOG:-/tmp/xdebug.log}
       - PHP_DEBUGGER=${PHP_DEBUGGER:-none}
     working_dir: /app
+
+  php8:
+    image: chrisb9/php8-nginx-xdebug
+    volumes:
+      - ./:/app
+      - ~/.ssh:/home/application/.ssh
+      - ~/.gitconfig:/home/application/.gitconfig
+    working_dir: /app

docker-compose.yml

@@ -19,7 +19,7 @@ final class ShellBuilder implements ShellInterface, \JsonSerializable
 {
     use ShellConditional;
 
-    /** @var array<ShellInterface>  */
+    /** @var array<ShellInterface|string>  */
     private $commandList = [];
     /** @var int */
     private $groupType;
@@ -100,14 +100,28 @@ public function removeVariable(string $variable): self
         return $this;
     }
 
+    /**
+     * @param string|ShellInterface ...$commands
+     * @return $this
+     * @throws ShellBuilderException
+     */
+    public function add(...$commands): self
+    {
+        foreach ($commands as $command) {
+            $this->addSingle($command);
+        }
+        return $this;
+    }
+
     /**
      * @param string|ShellInterface $command
+     * @param bool $raw
      * @return $this
      * @throws ShellBuilderException
      */
-    public function add($command): self
+    public function addSingle($command, bool $raw = false): self
     {
-        $command = $this->parseCommand($command, true);
+        $command = $raw ? $command : $this->parseCommand($command, true);
         if (empty($this->commandList)) {
             $this->commandList[] = $command;
             return $this;
@@ -338,7 +352,7 @@ public function __toArray(): array
     {
         $commands = [];
         foreach ($this->commandList as $item) {
-            $commands[] = $item->__toArray();
+            $commands[] = is_string($item) ? $item : $item->__toArray();
         }
         return $commands;
     }

src/ShellBuilder.php

@@ -63,6 +63,20 @@ public function testBuilderConceptWithShortcut(): void
         $this->assertEquals($result, (string)$builder);
     }
 
+    public function testBuilderAddMany(): void
+    {
+        $builder = new ShellBuilder();
+        $builder->add('a', 'b', 'c', 'd');
+        $this->assertEquals('a ; b ; c ; d', (string)$builder);
+    }
+
+    public function testBuilderAddRawCommand(): void
+    {
+        $builder = new ShellBuilder();
+        $builder->addSingle('echo --colorize "hello world"', true);
+        $this->assertEquals('echo --colorize "hello world"', (string)$builder);
+    }
+
     public function testCommandListDelimiter(): void
     {
         $result = (string)(new ShellBuilder())->add('a')->add('b')->add('c');