Skip to content

Commit

Permalink
pass through glue (#1)
Browse files Browse the repository at this point in the history
* pass through glue

* remove old php versions from ci

* downgrade phpunit for 7.0 compatability
  • Loading branch information
TomK committed Mar 1, 2019
1 parent d627883 commit 3950ea5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
15 changes: 0 additions & 15 deletions .circleci/config.yml
Expand Up @@ -22,18 +22,6 @@ defaults: &defaults

version: 2
jobs:
build-php54:
<<: *defaults
docker:
- image: tomkay/docker-legacy-php:5.4-alpine
build-php55:
<<: *defaults
docker:
- image: tomkay/docker-legacy-php:5.5-alpine
build-php56:
<<: *defaults
docker:
- image: php:5.6-alpine
build-php70:
<<: *defaults
docker:
Expand All @@ -59,9 +47,6 @@ workflows:
version: 2
build:
jobs:
- build-php54
- build-php55
- build-php56
- build-php70
- build-php71
- build-php72
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -13,7 +13,7 @@
"packaged/helpers": "^1.0||^2.0"
},
"require-dev": {
"phpunit/phpunit": "~7.0"
"phpunit/phpunit": "~6.0"
},
"autoload": {
"psr-4": {
Expand Down
7 changes: 6 additions & 1 deletion src/SafeHtml.php
Expand Up @@ -53,7 +53,12 @@ public static function escape($input, $arrayGlue = ' ')

if(is_array($input))
{
return new static(implode($arrayGlue, array_map([SafeHtml::class, 'escape'], $input)));
return new static(
implode(
$arrayGlue,
array_map(function ($input) use ($arrayGlue) { return SafeHtml::escape($input, $arrayGlue); }, $input)
)
);
}

if($input instanceof ISafeHtmlProducer)
Expand Down

0 comments on commit 3950ea5

Please sign in to comment.