diff --git a/src/Package/PHP/Convey/Command/Pecl.php b/src/Package/PHP/Convey/Command/Pecl.php index 2bd7fca..d138a4c 100644 --- a/src/Package/PHP/Convey/Command/Pecl.php +++ b/src/Package/PHP/Convey/Command/Pecl.php @@ -76,20 +76,14 @@ protected function prepare() $this->name = $matches['package']; $this->url = WebsiteFactory::getWebsite()->getBaseUrl() . '/get/' . $matches['package']; - if (isset($matches['stability']) && $matches['stability'] !== '') { - $this->stability = $matches['stability']; - $this->url .= '-' . $matches['stability']; - } else { - $this->stability = 'stable'; - } + $this->stability = isset($matches['stability']) && $matches['stability'] !== '' ? $matches['stability'] : 'stable'; + $this->version = isset($matches['version']) && $matches['version'] !== '' ? $matches['version'] : 'latest'; + $this->prettyVersion = $this->version === 'latest' ? 'latest-' . $this->stability : $this->version; - if (isset($matches['version']) && $matches['version'] !== '') { - $this->url .= '/' . $matches['version']; - $this->prettyVersion = $matches['version']; - $this->version = $matches['version']; + if ($this->version === 'latest') { + $this->url .= '-' . $this->stability; } else { - $this->version = 'latest'; - $this->prettyVersion = 'latest-' . $this->stability; + $this->url .= '/' . $this->version; } } diff --git a/tests/pecl-website/assets/sqlsrv-5.10.1.tgz b/tests/pecl-website/assets/sqlsrv-5.10.1.tgz new file mode 100644 index 0000000..b3d1acc Binary files /dev/null and b/tests/pecl-website/assets/sqlsrv-5.10.1.tgz differ diff --git a/tests/pecl-website/assets/sqlsrv-5.9.0beta2.tgz b/tests/pecl-website/assets/sqlsrv-5.9.0beta2.tgz deleted file mode 100644 index 08dcc25..0000000 Binary files a/tests/pecl-website/assets/sqlsrv-5.9.0beta2.tgz and /dev/null differ diff --git a/tests/pecl-website/web/index.php b/tests/pecl-website/web/index.php index 7e470c1..66b8af8 100644 --- a/tests/pecl-website/web/index.php +++ b/tests/pecl-website/web/index.php @@ -53,23 +53,22 @@ static function ($errno, $errstr, $errfile, $errline): void { } $filesMap = [ '/get/amqp/1.4.0' => "{$assetsDir}/amqp-1.4.0.tgz", - '/get/apc' => "{$assetsDir}/APC-3.1.13.tgz", '/get/apc-stable' => "{$assetsDir}/APC-3.1.9.tgz", '/get/apc/3.1.13' => "{$assetsDir}/APC-3.1.13.tgz", - '/get/apcu' => "{$assetsDir}/apcu-5.1.19.tgz", + '/get/apcu-stable' => "{$assetsDir}/apcu-5.1.19.tgz", '/get/apcu-beta' => "{$assetsDir}/apcu-5.1.0.tgz", '/get/apcu/4.0.6' => "{$assetsDir}/apcu-4.0.6.tgz", '/get/memcache-beta' => "{$assetsDir}/memcache-3.0.8.tgz", '/get/memcache/3.0.8' => "{$assetsDir}/memcache-3.0.8.tgz", '/get/memcache/8.0' => "{$assetsDir}/memcache-8.0.tgz", - '/get/mongo' => "{$assetsDir}/mongo-1.6.16.tgz", + '/get/mongo-stable' => "{$assetsDir}/mongo-1.6.16.tgz", '/get/mongo/1.5.4' => "{$assetsDir}/mongo-1.5.4.tgz", '/get/oci8/2.0.8' => "{$assetsDir}/oci8-2.0.8.tgz", - '/get/sqlsrv' => "{$assetsDir}/sqlsrv-5.9.0beta2.tgz", - '/get/swoole' => "{$assetsDir}/swoole-4.6.2.tgz", - '/get/tensor' => "{$assetsDir}/tensor-2.1.4.tgz", - '/get/yaml' => "{$assetsDir}/yaml-2.2.1.tgz", - '/get/zstd' => "{$assetsDir}/zstd-0.10.0.tgz", + '/get/sqlsrv-stable' => "{$assetsDir}/sqlsrv-5.10.1.tgz", + '/get/swoole-stable' => "{$assetsDir}/swoole-4.6.2.tgz", + '/get/tensor-stable' => "{$assetsDir}/tensor-2.1.4.tgz", + '/get/yaml-stable' => "{$assetsDir}/yaml-2.2.1.tgz", + '/get/zstd-stable' => "{$assetsDir}/zstd-0.10.0.tgz", ]; $tgzToTarMap = [ '/get/amqp/1.4.0?uncompress=1' => "{$assetsDir}/amqp-1.4.0.tgz",