Skip to content

Commit

Permalink
Bump branch-alias to 0.3
Browse files Browse the repository at this point in the history
Changes:
- Bumped Composer branch-alias to 0.3
- Updated locomotivemtl/charcoal-user to ~0.2
- Added missing locomotivemtl/charcoal-translator at ~0.2
- Updated phpunit/phpunit to ^5.7
- Updated squizlabs/php_codesniffer to ^2.6
  • Loading branch information
mcaskill committed Nov 17, 2017
1 parent b41795b commit d72d750
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "0.2.x-dev"
"dev-master": "0.3.x-dev"
}
},
"require": {
"php": ">=5.6.0",
"psr/log": "^1.0",
"locomotivemtl/charcoal-config": "~0.7",
"locomotivemtl/charcoal-factory": "~0.4",
"locomotivemtl/charcoal-translator": "~0.1",
"locomotivemtl/charcoal-translator": "~0.2",
"locomotivemtl/charcoal-view": "~0.2",
"locomotivemtl/charcoal-user": "^0.1.1"
"locomotivemtl/charcoal-user": "^0.2"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
"squizlabs/php_codesniffer": "^2.4",
"satooshi/php-coveralls": "~1.0.1",
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^2.6",
"satooshi/php-coveralls": "^1.0",
"tedivm/stash": "~0.14",
"pimple/pimple": "^3.0"
},
Expand Down
12 changes: 6 additions & 6 deletions tests/Charcoal/Ui/Menu/AbstractMenuTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public function testItems()

$ret = iterator_to_array($this->obj->items());


$this->assertEquals(['test', 'foobar'], array_keys($ret));
$this->assertArrayHasKey('test', $ret);
$this->assertArrayHasKey('foobar', $ret);

$this->assertInstanceOf(MenuItemInterface::class, $ret['test']);
$this->assertInstanceOf(MenuItemInterface::class, $ret['foobar']);
Expand Down Expand Up @@ -95,17 +95,17 @@ public function testItemsPriority()

$items = [
'test' => [
'priority'=>2
'priority' => 2
],
'foobar' => [
'priority'=>1
'priority' => 1
]
];
$this->obj->setItems($items);

$ret = iterator_to_array($this->obj->items());


$this->assertEquals(['foobar', 'test'], array_keys($ret));
$this->assertArrayHasKey('test', $ret);
$this->assertArrayHasKey('foobar', $ret);
}
}

0 comments on commit d72d750

Please sign in to comment.