mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 17:40:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4966 from VSEphpbb/ticket/15369

Browse Source 
[ticket/15369] Update composer
This commit is contained in:
Marc Alexander 2018-02-17 16:31:53 +01:00
commit 009ae0dfac
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
6 changed files with 435 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
composer.phar
View File

Binary file not shown.

2
phpBB/composer.json
View File

@ -27,7 +27,7 @@
"require": {
"php": ">=5.6",
"bantu/ini-get-wrapper": "1.0.*",
"composer/composer": "^1.0",
"composer/composer": "^1.6",
"composer/installers": "^1.4",
"google/recaptcha": "~1.1",
"guzzlehttp/guzzle": "~6.3",

749
phpBB/composer.lock generated
View File

File diff suppressed because it is too large Load Diff

20
tests/event/php_exporter_test.php
View File

@ -122,7 +122,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
static public function crawl_php_file_throws_data()
{
return array(
array('missing_var.test', null),
array('missing_var.test', 2),
array('duplicate_event.test', 10),
);
}
@ -132,7 +132,8 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
*/
public function test_crawl_php_file_throws($file, $exception_code)
{
$this->setExpectedException('LogicException', '', $exception_code);
$this->expectException('LogicException');
$this->expectExceptionCode($exception_code);
$this->exporter->crawl_php_file($file);
}
@ -206,7 +207,8 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
*/
public function test_validate_event_throws($event_name, $event, $exception_code)
{
$this->setExpectedException('LogicException', '', $exception_code);
$this->expectException('LogicException');
$this->expectExceptionCode($exception_code);
$this->exporter->validate_event($event_name, $event);
}
@ -461,7 +463,8 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
*/
public function test_get_vars_from_array_throws($lines, $event_line, $exception_code)
{
$this->setExpectedException('LogicException', '', $exception_code);
$this->expectException('LogicException');
$this->expectExceptionCode($exception_code);
$this->exporter->set_current_event('', $event_line);
$this->exporter->set_content($lines);
@ -546,7 +549,8 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
*/
public function test_get_vars_from_docblock_throws($lines, $event_line, $exception_code)
{
$this->setExpectedException('LogicException', '', $exception_code);
$this->expectException('LogicException');
$this->expectExceptionCode($exception_code);
$this->exporter->set_current_event('', $event_line);
$this->exporter->set_content($lines);
@ -649,7 +653,8 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
*/
public function test_find_since_throws($lines, $event_line, $exception_code)
{
$this->setExpectedException('LogicException', '', $exception_code);
$this->expectException('LogicException');
$this->expectExceptionCode($exception_code);
$this->exporter->set_current_event('', $event_line);
$this->exporter->set_content($lines);
@ -750,7 +755,8 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
*/
public function test_find_description_throws($lines, $event_line, $exception_code)
{
$this->setExpectedException('LogicException', '', $exception_code);
$this->expectException('LogicException');
$this->expectExceptionCode($exception_code);
$this->exporter->set_current_event('', $event_line);
$this->exporter->set_content($lines);

2
tests/feed/attachments_base_test.php
View File

@ -35,7 +35,7 @@ class phpbb_feed_attachments_base_test extends phpbb_database_test_case
new \phpbb\symfony_request(
new phpbb_mock_request()
),
$this->getMock('\phpbb\request\request'),
$this->createMock('\phpbb\request\request'),
$phpbb_root_path,
'php'
);

7
tests/test_framework/phpbb_test_case_helpers.php
View File

@ -95,7 +95,12 @@ class phpbb_test_case_helpers
break;
}
$this->expectedTriggerError = true;
$this->test_case->setExpectedException($exceptionName, (string) $message, $errno);
$this->test_case->expectException($exceptionName);
$this->test_case->expectExceptionCode($errno);
if ($message)
{
$this->test_case->expectExceptionMessage((string) $message);
}
}
public function makedirs($path)