From: Marcus Boerger <helly@php.net>
Date: Fri, 18 May 2007 17:50:39 +0000 (+0000)
Subject: - Add Phar::getAlias()
X-Git-Tag: RELEASE_1_4~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e561453ecea5c31f4c1dbb708c0ebe1274a48ba;p=php

- Add Phar::getAlias()
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index ab191e9375..da8d933731 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -193,7 +193,7 @@ PHP_METHOD(Phar, __construct)
 	phar_archive_data   *phar_data;
 	zval *zobj = getThis(), arg1, arg2;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &fname, &fname_len, &flags, &alias, &alias_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls!", &fname, &fname_len, &flags, &alias, &alias_len) == FAILURE) {
 		return;
 	}
 
@@ -263,6 +263,19 @@ PHP_METHOD(Phar, count)
 }
 /* }}} */
 
+/* {{{ proto int Phar::getAlias()
+ * Returns the alias for the PHAR or NULL
+ */
+PHP_METHOD(Phar, getAlias)
+{
+	PHAR_ARCHIVE_OBJECT();
+
+	if (phar_obj->arc.archive->alias && phar_obj->arc.archive->alias != phar_obj->arc.archive->fname) {
+		RETURN_STRINGL(phar_obj->arc.archive->alias, phar_obj->arc.archive->alias_len, 1);
+	}
+}
+/* }}} */
+
 /* {{{ proto string Phar::getVersion()
  * Return version info of Phar archive
  */
@@ -1368,6 +1381,7 @@ zend_function_entry php_archive_methods[] = {
 	PHP_ME(Phar, compressAllFilesBZIP2, NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, count,                 NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, delMetadata,           NULL,                      ZEND_ACC_PUBLIC)
+	PHP_ME(Phar, getAlias,              NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, getMetadata,           NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, getModified,           NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, getSignature,          NULL,                      ZEND_ACC_PUBLIC)