Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ before_install:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi

install:
- COMPOSER_ROOT_VERSION=2.8.0 travis_retry composer install --no-interaction --ignore-platform-reqs
- travis_retry composer install --no-interaction --ignore-platform-reqs

script:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
Expand Down
7 changes: 0 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,10 @@
"php": ">=5.5"
},
"require-dev": {
"zendframework/zend-config": "dev-develop as 2.6.0",
"zendframework/zend-serializer": "~2.5",
"fabpot/php-cs-fixer": "1.7.*",
"phpunit/PHPUnit": "~4.0",
"athletic/athletic": "~0.1"
},
"suggest": {
"zendframework/zend-serializer": "Zend\\Serializer component"
},
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "2.7-dev",
Expand Down
55 changes: 16 additions & 39 deletions test/ArrayUtilsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
use ArrayObject;
use PHPUnit_Framework_TestCase as TestCase;
use stdClass;
use Zend\Config\Config;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\ArrayUtils\MergeRemoveKey;
use Zend\Stdlib\Parameters;

class ArrayUtilsTest extends TestCase
{
Expand Down Expand Up @@ -316,46 +316,23 @@ public function testAllowsRemovingKeys()

public static function validIterators()
{
return [
[[
'foo' => 'bar',
], [
'foo' => 'bar',
]],
[new Config([
'foo' => [
'bar' => [
'baz' => [
'baz' => 'bat',
],
$array = [
'foo' => [
'bar' => [
'baz' => [
'baz' => 'bat',
],
],
]), [
'foo' => [
'bar' => [
'baz' => [
'baz' => 'bat',
],
],
],
]],
[new ArrayObject([
'foo' => [
'bar' => [
'baz' => [
'baz' => 'bat',
],
],
],
]), [
'foo' => [
'bar' => [
'baz' => [
'baz' => 'bat',
],
],
],
]],
],
];
$arrayAccess = new ArrayObject($array);
$toArray = new Parameters($array);

return [
// Description => [input, expected array]
'array' => [$array, $array],
'Traversable' => [$arrayAccess, $array],
'Traversable and toArray' => [$toArray, $array],
];
}

Expand Down