makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16549] Require stable versions as PHPUnit 9.3 has been released

Browse source 
PHPBB3-16549
This commit is contained in:
rxu 2020-08-09 14:20:17 +07:00
parent 4c4debf004
commit 72c4c18364
No known key found for this signature in database
GPG key ID: 955F0567380E586A
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/functional/forum_style_test.php
View file

@ -48,15 +48,6 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2'); $db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
$crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); $crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
<<<<<<< HEAD
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));
=======
$this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href')); $this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1'); $crawler = self::request('GET', 'viewtopic.php?t=1');
@ -64,7 +55,6 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); $crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href')); $this->assertStringContainsString('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(2)->attr('href'));
>>>>>>> 33be5dc489... [ticket/16549] Move from assert[Not]Contains to assertString[Not]ContainsString
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2'); $db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
$this->delete_style(2, 'test_style'); $this->delete_style(2, 'test_style');

6
travis/setup-phpbb.sh
View file

@ -40,9 +40,7 @@ cd phpBB
php ../composer.phar install --dev --no-interaction php ../composer.phar install --dev --no-interaction
if [ "$TRAVIS_PHP_VERSION" == "nightly" ] if [ "$TRAVIS_PHP_VERSION" == "nightly" ]
then then
php ../composer.phar config minimum-stability dev \ php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
&& php ../composer.phar config prefer-stable true \ && php ../composer.phar require misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-dependencies --ignore-platform-reqs
&& php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
&& php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-dependencies --ignore-platform-reqs
fi fi
cd .. cd ..