PR #297 / Bug #60953

- removed backwards compatibility file name extension code
- fixed all tests and their cleanup to reflect new file name suffixes

Author: ralphschindler

ext/phar/phar_object.c

@@ -2005,7 +2005,7 @@ static zend_object *phar_rename_archive(phar_archive_data *phar, char *ext, zend
 	char *basename = NULL, *basepath = NULL;
 	char *newbasename = NULL, *newname = NULL, *newpath = NULL;
 	char *oldname_ext = NULL;
-	zval *ret, arg1;
+	zval ret, arg1;
 	zend_class_entry *ce;
 	char *error;
 	const char *pcr_error;
@@ -2081,30 +2081,33 @@ static zend_object *phar_rename_archive(phar_archive_data *phar, char *ext, zend
 
 	basename = estrndup(oldname, oldname_len);
 
-	/* find extension name, .phar for executable phars, .zip* and .tar* for data only phars */
+	/* find extension name: .phar suffixed with anything and .zip* and .tar* without .phar for data archives */
 	oldname_ext = strstr(basename, ".phar");
-	if (oldname_ext == NULL && phar->is_data) {
+	if (oldname_ext == NULL) {
 		oldname_ext = strstr(basename, ".tar");
 		if (oldname_ext == NULL) {
-			oldname_ext = strstr(basename, ".zip");
+			oldname_ext = strstr(basename, ".tgz");
+			if (oldname_ext == NULL) {
+				oldname_ext = strstr(basename, ".zip");
+			}
 		}
 	}
 
-	if (oldname_ext == NULL) {
-		/* old behavior for BC, take anything after first . */
-		oldname_ext = strstr(basename, ".");
+	newbasename = basename;
+
+	if (oldname_ext != NULL) {
+		newbasename = estrndup(basename, (oldname_ext - basename));
 	}
 
-	newbasename = estrndup(basename, (oldname_ext - basename));
 	spprintf(&newname, 0, "%s.%s", newbasename, ext);
+	efree(newbasename);
 	efree(basename);
 
 	basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len));
 	phar->fname_len = spprintf(&newpath, 0, "%s%s", basepath, newname);
 	phar->fname = newpath;
 	phar->ext = newpath + phar->fname_len - strlen(ext) - 1;
 	efree(basepath);
-	efree(newbasename);
 	efree(newname);
 
 	if (PHAR_G(manifest_cached) && NULL != (pphar = zend_hash_str_find_ptr(&cached_phars, newpath, phar->fname_len))) {

ext/phar/tests/bug48377.2.phpt

@@ -12,7 +12,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.zip';
 $phar = new PharData($fname);
 $phar['x'] = 'hi';
 try {
-	$phar->convertToData(Phar::ZIP, Phar::NONE, '.2.phar.zip');
+	$phar->convertToData(Phar::ZIP, Phar::NONE, 'zip');
 } catch (BadMethodCallException $e) {
 	echo $e->getMessage(),"\n";
 }
@@ -21,5 +21,5 @@ try {
 --CLEAN--
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');?>
 --EXPECTF--
-data phar "%sbug48377.2.phar.zip" has invalid extension 2.phar.zip
+Unable to add newly converted phar "%sbug48377.2.zip" to the list of phars, a phar with that name already exists
 ===DONE===

ext/phar/tests/phar_convert_repeated_b.phpt

@@ -82,9 +82,9 @@ try {
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar.gz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
-unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.zip');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.2.tar');
 ?>
 --EXPECT--
 =================== new PharData() ==================

ext/phar/tests/stat2_5.3.phpt

@@ -14,7 +14,6 @@ is_link();
 var_dump(is_file(__FILE__));
 
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
-$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar';
 copy(dirname(__FILE__) . '/tar/files/links.tar', $fname2);
 $a = new PharData($fname2);
 $b = $a->convertToExecutable(Phar::TAR, Phar::NONE);
@@ -33,7 +32,7 @@ $b->addEmptyDir('foo/bar/blah');
 $b->setStub('<?php
 include "phar://" . __FILE__ . "/foo/stat.php";
 __HALT_COMPILER();');
-include $fname3;
+include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar';
 ?>
 ===DONE===
 --CLEAN--