From 1b69747008992cbaf3af54335fb503ee51f895d9 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Thu, 14 Aug 2014 14:21:49 +0200 Subject: [PATCH 1/6] Updated version to 0.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8687ce5..40ade93 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "target-dir": "BeSimple/SoapClient", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "0.3-dev" } } } From 66bb9b16e6b08be6e6d2ed062ee7b92bc5986eaa Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Thu, 14 Aug 2014 14:56:39 +0200 Subject: [PATCH 2/6] Updated BeSimpleSoap vendor requierement to 0.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 40ade93..e539aaf 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "php": ">=5.3.0", "ext-soap": "*", "ext-curl": "*", - "besimple/soap-common": "0.2.*", + "besimple/soap-common": "0.3.*", "ass/xmlsecurity": "~1.0" }, "require-dev": { From 1cc05bd8adb70caa58dafbab8aae1322535c7681 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Thu, 14 Aug 2014 14:51:42 +0200 Subject: [PATCH 3/6] Revert "[SoapClient] [Tests] Down required version of symfony/filesystem vendor" This reverts commit 726ee89936aa92c27b09589c8c4355930a414665. Conflicts: composer.json src/BeSimple/SoapClient/composer.json --- Tests/WsdlDownloaderTest.php | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/WsdlDownloaderTest.php b/Tests/WsdlDownloaderTest.php index 2027b2d..9597ca6 100644 --- a/Tests/WsdlDownloaderTest.php +++ b/Tests/WsdlDownloaderTest.php @@ -274,7 +274,7 @@ public static function setUpBeforeClass() $content = file_get_contents(self::$fixturesPath.$file); $content = preg_replace('#'.preg_quote('%location%').'#', sprintf('localhost:%d', WEBSERVER_PORT), $content); - file_put_contents(self::$fixturesPath.'build_include'.DIRECTORY_SEPARATOR.pathinfo($file, PATHINFO_BASENAME), $content); + self::$filesystem->dumpFile(self::$fixturesPath.'build_include'.DIRECTORY_SEPARATOR.pathinfo($file, PATHINFO_BASENAME), $content); } } diff --git a/composer.json b/composer.json index e539aaf..81696f3 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "mikey179/vfsStream": "~1.0", - "symfony/filesystem": "~2.0", + "symfony/filesystem": "~2.3", "symfony/process": "~2.3" }, "autoload": { From 4fdeb99e4d5314f0c4640a7ed335f2ecab2e7c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Siv=C3=A1k?= Date: Fri, 22 Feb 2019 11:48:52 +0100 Subject: [PATCH 4/6] Added CURLOPT_TIMEOUT, CURLOPT_SSL_VERIFYHOST for Curl --- Curl.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Curl.php b/Curl.php index e777fc8..c12ec24 100644 --- a/Curl.php +++ b/Curl.php @@ -80,6 +80,12 @@ public function __construct(array $options = array(), $followLocationMaxRedirect if (isset($options['connection_timeout'])) { curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, $options['connection_timeout']); } + if (isset($options['timeout'])) { + curl_setopt($this->ch, CURLOPT_TIMEOUT, $options['timeout']); + } + if (isset($options['ssl_verifyhost'])) { + curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, $options['ssl_verifyhost']); + } if (isset($options['proxy_host'])) { if (false !== $options['proxy_host']) { From ae8a6c9f2b0482bc448a9d8382a910a5e4171d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zima=20Ji=C5=99=C3=AD=2C=20DATRON=2C=20a=2Es?= Date: Tue, 23 Jun 2020 10:37:20 +0200 Subject: [PATCH 5/6] Fixed PHP 7.4 deprecated bracers in WsdlDownloader.php --- WsdlDownloader.php | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WsdlDownloader.php b/WsdlDownloader.php index 97a7d67..eab69e1 100644 --- a/WsdlDownloader.php +++ b/WsdlDownloader.php @@ -214,7 +214,7 @@ private function resolveRelativePathInUrl($base, $relative) $urlParts = parse_url($base); // combine base path with relative path - if (isset($urlParts['path']) && '/' === $relative{0}) { + if (isset($urlParts['path']) && '/' === $relative[0]) { // $relative is absolute path from domain (starts with /) $path = $relative; } elseif (isset($urlParts['path']) && strrpos($urlParts['path'], '/') === (strlen($urlParts['path']) )) { diff --git a/composer.json b/composer.json index 81696f3..b76d6a2 100644 --- a/composer.json +++ b/composer.json @@ -20,10 +20,10 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=7.2", "ext-soap": "*", "ext-curl": "*", - "besimple/soap-common": "0.3.*", + "besimple/soap-common": "@dev", "ass/xmlsecurity": "~1.0" }, "require-dev": { From 93176c064289c727b39e72039adcb3512d4579e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zima=20Ji=C5=99=C3=AD=2C=20DATRON=2C=20a=2Es?= Date: Mon, 15 Nov 2021 08:59:37 +0100 Subject: [PATCH 6/6] Fixed proxyHost settings in Curl --- .gitignore | 1 + Curl.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index db0e5ff..38584b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vendor/ composer.lock phpunit.xml Tests/Fixtures/build_include/ +.idea/ diff --git a/Curl.php b/Curl.php index c12ec24..23fb5b0 100644 --- a/Curl.php +++ b/Curl.php @@ -89,7 +89,7 @@ public function __construct(array $options = array(), $followLocationMaxRedirect if (isset($options['proxy_host'])) { if (false !== $options['proxy_host']) { - $proxyHost = $options['proxy_host'].(isset($options['proxy_port']) ? $options['proxy_port'] : 8080); + $proxyHost = $options['proxy_host'].':'.(isset($options['proxy_port']) ? $options['proxy_port'] : 8080); } else { $proxyHost = false; }