From b5bd2d03c9fdf3985b58ef8f00655051d8feb1e8 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 26 Nov 2018 12:57:42 +0900 Subject: [PATCH 1/4] Fixed OpenSSL.Light 1.1.1 see https://github.com/EC-CUBE/ec-cube/pull/3952 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 74f9cc1e7c..db9bdddb51 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ services: # Install scripts. (runs after repo cloning) install: - - cinst -y OpenSSL.Light + - cinst -y OpenSSL.Light --version 1.1.1 - SET PATH=C:\Program Files\OpenSSL;%PATH% - sc config wuauserv start= auto - net start wuauserv From fe473998aecb1d4c9ce43f1847bc91529ac98d3a Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 26 Nov 2018 15:03:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?AppVeyor=20=E3=81=8C=E8=90=BD=E3=81=A1?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=82=B9=E3=82=AD=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/class/module/Cache_Lite/NestedOutputTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/class/module/Cache_Lite/NestedOutputTest.php b/tests/class/module/Cache_Lite/NestedOutputTest.php index 00499aa3f8..956d0be321 100644 --- a/tests/class/module/Cache_Lite/NestedOutputTest.php +++ b/tests/class/module/Cache_Lite/NestedOutputTest.php @@ -15,6 +15,10 @@ class NestedOutputTest extends Common_TestCase { + public function setUp() + { + $this->markTestSkipped('EC-CUBE not using library'); + } /** * "Test" used for documenting the nested output buffering feature of php */ From b0af94442de621b83f9ec1a9146e8709e5534690 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 26 Nov 2018 15:30:43 +0900 Subject: [PATCH 3/4] Fix HTTP_URL --- eccube_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eccube_install.sh b/eccube_install.sh index d242ff092c..412c3ce40e 100755 --- a/eccube_install.sh +++ b/eccube_install.sh @@ -30,7 +30,7 @@ CONFIG_PHP="data/config/config.php" ADMIN_MAIL=${ADMIN_MAIL:-"admin@example.com"} SHOP_NAME=${SHOP_NAME:-"EC-CUBE SHOP"} -HTTP_URL=${HTTP_URL:-"http://test.local"} +HTTP_URL=${HTTP_URL:-"http://test.local/"} HTTPS_URL=${HTTPS_URL:-"http://test.local/"} ROOT_URLPATH=${ROOT_URLPATH:-"/"} DOMAIN_NAME=${DOMAIN_NAME:-""} From e7d131cd1bf085c874a072d3a798664449bf3666 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 26 Nov 2018 15:51:24 +0900 Subject: [PATCH 4/4] Removed --- .../module/Cache_Lite/NestedOutputTest.php | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 tests/class/module/Cache_Lite/NestedOutputTest.php diff --git a/tests/class/module/Cache_Lite/NestedOutputTest.php b/tests/class/module/Cache_Lite/NestedOutputTest.php deleted file mode 100644 index 956d0be321..0000000000 --- a/tests/class/module/Cache_Lite/NestedOutputTest.php +++ /dev/null @@ -1,69 +0,0 @@ - - */ - -//require_once __DIR__ . '/../Cache/Lite/NestedOutput.php'; - -class NestedOutputTest extends Common_TestCase -{ - public function setUp() - { - $this->markTestSkipped('EC-CUBE not using library'); - } - /** - * "Test" used for documenting the nested output buffering feature of php - */ - public function testPhpObNesting() - { - $outsideText = "This is the outside"; - $insideText = "This is the inside"; - ob_start(); - echo $outsideText; - ob_start(); - echo $insideText; - $innerContents = ob_get_contents(); - ob_end_clean(); - $outerContents = ob_get_contents(); - ob_end_clean(); - - $this->assertEquals( $insideText, $innerContents ); - $this->assertEquals( $outsideText, $outerContents ); - } - - /** - * Test for Cache_Lite_NestedOutput - */ - public function testCacheLiteOutputNesting() - { - $outsideText = "This is the outside"; - $insideText = "This is the inside"; - - $options = array( - 'caching' => true, - 'cacheDir' => '/tmp/', - 'lifeTime' => 10 - ); - $cache = new Cache_Lite_NestedOutput($options); - $this->assertFalse($cache->start('foo', 'a')); - echo $outsideText; - $this->assertFalse($cache->start('bar', 'b')); - echo $insideText; - $inside = $cache->end(); - $outside = $cache->end(); - $this->assertEquals($outsideText, $outside, 'Validate outside'); - $this->assertEquals($insideText, $inside, 'Validate inside'); - - $cache = new Cache_Lite_NestedOutput($options); - $this->assertEquals($outsideText, $cache->start('foo', 'a'), 'Validate outside'); - $this->assertEquals($insideText, $cache->start('bar', 'b'), 'Validate inside'); - } -}