Skip to content

Commit d3a5208

Browse files
author
Oleksii Korshenko
committed
MAGETWO-64900: [GitHub] [Issue] Travis Does not support freetype on PHP 5.6
2 parents c7fff61 + 2f6b417 commit d3a5208

File tree

6 files changed

+5
-55
lines changed

6 files changed

+5
-55
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.6
12+
- 5.6.29
1313
- 7.0
1414
env:
1515
global:

app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ protected function setUp()
5353
*/
5454
public function testGetCaptcha()
5555
{
56-
if (!function_exists("imageftbbox")) {
57-
$this->markTestSkipped('imageftbbox is not available on the test environment');
58-
}
59-
6056
$this->configMock->expects(
6157
$this->once()
6258
)->method(

app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
8888
*/
8989
protected function setUp()
9090
{
91-
if (!function_exists("imageftbbox")) {
92-
$this->markTestSkipped('imageftbbox is not available on the test environment');
93-
}
9491
$this->session = $this->_getSessionStub();
9592

9693
$this->_storeManager = $this->getMock(

dev/tests/integration/etc/di/preferences/ce.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@
2222
\Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class =>
2323
\Magento\TestFramework\Db\ConnectionAdapter::class,
2424
\Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
25-
\Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
26-
\Magento\Captcha\Model\DefaultModel::class => \Magento\TestFramework\Captcha\DefaultModel::class,
25+
\Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class
2726
];

dev/tests/integration/framework/Magento/TestFramework/Captcha/DefaultModel.php

Lines changed: 0 additions & 44 deletions
This file was deleted.

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,9 @@ public function cropDataProvider()
547547
*/
548548
public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expectedColor2, $adapterType)
549549
{
550-
if (!function_exists('imagettfbbox')) {
550+
if (!function_exists('imagettfbbox')
551+
|| (getenv('TRAVIS') && getenv('TRAVIS_PHP_VERSION') == '5.6.29')
552+
) {
551553
$this->markTestSkipped('Workaround for problem with imagettfbbox() function on Travis');
552554
}
553555
$adapter = $this->_getAdapter($adapterType);

0 commit comments

Comments
 (0)