From f2fe6c4b24a053c0e609dcdf2b5ef86be5edcea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Hump=C3=A1l?= Date: Fri, 15 Mar 2019 14:43:10 +0100 Subject: [PATCH 1/5] Fix text output iteration over Beholder results --- Jyxo/Beholder/Output/TextOutput.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jyxo/Beholder/Output/TextOutput.php b/Jyxo/Beholder/Output/TextOutput.php index 2342fda..4ecde5c 100644 --- a/Jyxo/Beholder/Output/TextOutput.php +++ b/Jyxo/Beholder/Output/TextOutput.php @@ -47,7 +47,7 @@ public function __toString(): string $return .= sprintf("%-9s %10s %-10s %-7s %-35s %s\n", 'Run Order', 'Duration', 'Ident', 'Status', 'Test Name', 'Description'); - foreach ($this->testsData as $data) { + foreach ($this->result->getTestsData() as $data) { $return .= sprintf("%9d %9.2fs %-10s %-7s %-35s %s\n", $data['order'], $data['duration'], From f801232c5c62e542f34c8ae4ecdab6c9cb4a0fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Hump=C3=A1l?= Date: Fri, 15 Mar 2019 15:45:08 +0100 Subject: [PATCH 2/5] Warn about missing tidy extension; skip test --- Jyxo/Html.php | 5 +++++ tests/Jyxo/HtmlTest.php | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Jyxo/Html.php b/Jyxo/Html.php index 8c41e41..7b622cd 100644 --- a/Jyxo/Html.php +++ b/Jyxo/Html.php @@ -80,6 +80,11 @@ public static function repair(string $html): string // 'drop-proprietary-attributes' => true, // Removes proprietary attributes (it would remove e.g. the background attribute) // 'drop-font-tags' => true // Removes and
tags ]; + + if (!function_exists('\tidy_repair_string')) { + throw new \Jyxo\Exception('Missing "tidy" extension.'); + } + $html = tidy_repair_string($html, $config, 'utf8'); // Removes namespace generated by MS Word diff --git a/tests/Jyxo/HtmlTest.php b/tests/Jyxo/HtmlTest.php index 5245552..c678a58 100644 --- a/tests/Jyxo/HtmlTest.php +++ b/tests/Jyxo/HtmlTest.php @@ -71,6 +71,10 @@ public function testIs() */ public function testRepair() { + if (!function_exists('\tidy_repair_string')) { + $this->markTestSkipped('Skipping, missing "tidy" extension.'); + } + $this->assertStringEqualsFile( $this->filePath . '/repair-expected.html', Html::repair(file_get_contents($this->filePath . '/repair.html')) From 6a29cf6d6b9f95e4117449531775048894d9d25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Hump=C3=A1l?= Date: Fri, 15 Mar 2019 15:46:53 +0100 Subject: [PATCH 3/5] Use composer autoloading for tests --- composer.json | 6 +++++- tests/bootstrap.php | 15 +-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index b87c234..a81f41f 100644 --- a/composer.json +++ b/composer.json @@ -21,11 +21,15 @@ "ext-curl": "To use Jyxo\\Rpc client/server or Jyxo\\Webdav client", "ext-json": "To use Jyxo\\Rpc\\Json client/server or Jyxo\\FirePHP logger", "ext-xmlrpc": "To use Jyxo\\Rpc\\Xml client/server", - "ext-imap": "To use Jyxo\\Mail\\Parser" + "ext-imap": "To use Jyxo\\Mail\\Parser", + "ext-tidy": "To use Jyxo\\Html extended capabilities" }, "autoload": { "psr-4": { "Jyxo\\": ["Jyxo/"] } }, + "autoload-dev": { + "psr-4": { "Jyxo\\": ["tests/Jyxo"] } + }, "config": { "bin-dir": "bin", "optimize-autoloader": true, diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 68255a9..4c9fc18 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -14,20 +14,7 @@ // Because of SessionTest session_start(); -// Autoload -spl_autoload_register(function($className) { - if (strpos($className, 'Jyxo') !== 0) { - return; - } - - $file = str_replace('\\', '/', $className) . '.php'; - foreach ([realpath(__DIR__ . '/..'), __DIR__] as $dir) { - $filePath = $dir . '/' . $file; - if (false !== stream_resolve_include_path($filePath)) { - require_once $filePath; - } - } -}); +require __DIR__ . '/../vendor/autoload.php'; // File path define('DIR_FILES', __DIR__ . '/files'); From f76b2542100d7d75fa1330a701611725cdc159c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Hump=C3=A1l?= Date: Fri, 15 Mar 2019 15:47:52 +0100 Subject: [PATCH 4/5] Port in Memchached beholder test case has to be an integer --- tests/Jyxo/Beholder/TestCase/MemcachedTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Jyxo/Beholder/TestCase/MemcachedTest.php b/tests/Jyxo/Beholder/TestCase/MemcachedTest.php index 78296cc..b7cedd7 100644 --- a/tests/Jyxo/Beholder/TestCase/MemcachedTest.php +++ b/tests/Jyxo/Beholder/TestCase/MemcachedTest.php @@ -41,7 +41,7 @@ public function testConnectionFailure() } $ip = '127.0.0.1'; - $port = '12345'; + $port = 12345; $test = new Memcached('Memcached', $ip, $port); // @ on purpose From 61fd1c15198eca0ecfae2e9d82cf87a90144ad65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Hump=C3=A1l?= Date: Fri, 15 Mar 2019 15:59:12 +0100 Subject: [PATCH 5/5] Fix cookie magic Time property format --- tests/Jyxo/Time/TimeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Jyxo/Time/TimeTest.php b/tests/Jyxo/Time/TimeTest.php index 5a91a1f..6129f78 100644 --- a/tests/Jyxo/Time/TimeTest.php +++ b/tests/Jyxo/Time/TimeTest.php @@ -176,7 +176,7 @@ public function testMagicGet() $this->assertEquals('2009-10-10T00:00:00+0700', $time->sql); $this->assertEquals('Sat, 10 Oct 09 00:00:00 +0700', $time->email); $this->assertEquals('2009-10-10T00:00:00+07:00', $time->web); - $this->assertEquals('Saturday, 10-Oct-2009 00:00:00 GMT-7', $time->cookie); + $this->assertEquals('Saturday, 10-Oct-2009 00:00:00 +07', $time->cookie); $this->assertEquals('Sat, 10 Oct 2009 00:00:00 +0700', $time->rss); $this->assertEquals('1255107600', $time->unix); $this->assertEquals('Fri, 09 Oct 2009 17:00:00 GMT', $time->http);