Skip to content

Commit

Permalink
Update code and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
iMattPro committed Jun 2, 2021
1 parent 9b40dec commit 53101ff
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion migrations/m1_schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function effectively_installed()
* @return array Array of migration files
* @static
*/
static public function depends_on()
public static function depends_on()
{
return array('\phpbb\db\migration\data\v31x\v313');
}
Expand Down
5 changes: 4 additions & 1 deletion styles/all/template/js/collapsiblecategories.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
var oldTitle = $(this).attr('title'),
newTitle = $(this).attr('data-title-alt');
$(this)
.attr({'title': newTitle, 'data-title-alt': oldTitle})
.attr({
'title': newTitle,
'data-title-alt': oldTitle
})
.find('i')
.toggleClass('fa-plus-square fa-minus-square')
.end()
Expand Down
4 changes: 2 additions & 2 deletions tests/controller/main_controller_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function get_controller($forum_id, $is_ajax = false, $result = false, $in
->getMock();
$user->data['user_form_salt'] = '';

/** @var $operator \PHPUnit_Framework_MockObject_MockObject|\phpbb\collapsiblecategories\operator\operator */
/** @var $operator \PHPUnit\Framework\MockObject\MockObject|\phpbb\collapsiblecategories\operator\operator */
$operator = $this->getMockBuilder('\phpbb\collapsiblecategories\operator\operator')
->setMethods(['set_user_categories'])
->disableOriginalConstructor()
Expand All @@ -33,7 +33,7 @@ public function get_controller($forum_id, $is_ajax = false, $result = false, $in
->with($forum_id)
->willReturn($result);

/** @var $request \PHPUnit_Framework_MockObject_MockObject|\phpbb\request\request */
/** @var $request \PHPUnit\Framework\MockObject\MockObject|\phpbb\request\request */
$request = $this->getMockBuilder('\phpbb\request\request')
->disableOriginalConstructor()
->getMock();
Expand Down
6 changes: 3 additions & 3 deletions tests/event/listener_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@

class listener_test extends \phpbb_test_case
{
/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\controller\helper */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\controller\helper */
protected $controller_helper;

/** @var \phpbb\collapsiblecategories\event\listener */
protected $listener;

/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\collapsiblecategories\operator\operator_interface */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\collapsiblecategories\operator\operator_interface */
protected $operator;

/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\template\template */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\template\template */
protected $template;

/** @var \phpbb\user */
Expand Down
4 changes: 2 additions & 2 deletions tests/operator/operator_base.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ class operator_base extends \phpbb_database_test_case
/** @var \phpbb\config\config */
protected $config;

/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\controller\helper */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\controller\helper */
protected $controller_helper;

/** @var \phpbb\request\request */
protected $request;

/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\user */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\user */
protected $user;

/** @var \phpbb\collapsiblecategories\operator\operator */
Expand Down
6 changes: 3 additions & 3 deletions tests/system/simple_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

class simple_test extends \phpbb_test_case
{
/** @var \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
/** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
protected $container;

/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\finder */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\finder */
protected $extension_finder;

/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\db\migrator */
/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\db\migrator */
protected $migrator;

protected function setUp(): void
Expand Down

0 comments on commit 53101ff

Please sign in to comment.