TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
This commit is contained in:
Benjamin Perche
2014-07-29 10:25:15 +02:00
parent bf9ffedefd
commit 1aded1b6d6
3 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
View File

@@ -73,7 +73,11 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
public function addFile($filePath, $directoryInArchive = "/", $name = null, $isOnline = false)
{
if (!empty($name)) {
$directoryInArchive .= DS . dirname($name);
$dirName = dirname($name);
if ($dirName == ".") {
$dirName = "";
}
$directoryInArchive .= DS . $dirName;
}
if (empty($name) || !is_scalar($name)) {

57
core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
View File

@@ -28,6 +28,7 @@ use Thelia\Model\FolderDocumentQuery;
use Thelia\Model\FolderImageQuery;
use Thelia\Model\Lang;
use Thelia\Model\Map\ContentDocumentTableMap;
use Thelia\Model\Map\ContentFolderTableMap;
use Thelia\Model\Map\ContentI18nTableMap;
use Thelia\Model\Map\ContentTableMap;
use Thelia\Model\Map\FolderDocumentTableMap;
@@ -84,14 +85,31 @@ class ContentExport extends ExportHandler implements
$query = ContentQuery::create()
->select([
ContentTableMap::ID,
ContentTableMap::VISIBLE,
"content_TITLE",
"content_CHAPO",
"content_DESCRIPTION",
"content_CONCLUSION",
"content_seo_TITLE",
"content_seo_DESCRIPTION",
"content_seo_KEYWORDS",
"url_URL",
"folder_TITLE",
"folder_ID",
"folder_IS_DEFAULT"
])
->_if($this->isImageExport())
->useContentImageQuery("content_image_join", Criteria::LEFT_JOIN)
->addAsColumn("content_IMAGES", "GROUP_CONCAT(DISTINCT `content_image_join`.FILE)")
->addSelectColumn("content_IMAGES")
->endUse()
->_endif()
->_if($this->isDocumentExport())
->useContentDocumentQuery()
->addAsColumn("content_DOCUMENTS", "GROUP_CONCAT(DISTINCT ".ContentDocumentTableMap::FILE.")")
->addSelectColumn("content_DOCUMENTS")
->endUse()
->_endif()
->useContentFolderQuery(null, Criteria::LEFT_JOIN)
@@ -99,11 +117,13 @@ class ContentExport extends ExportHandler implements
->_if($this->isDocumentExport())
->useFolderDocumentQuery()
->addAsColumn("folder_DOCUMENTS", "GROUP_CONCAT(DISTINCT ".FolderDocumentTableMap::FILE.")")
->addSelectColumn("folder_DOCUMENTS")
->endUse()
->_endif()
->_if($this->isImageExport())
->useFolderImageQuery(null, Criteria::LEFT_JOIN)
->addAsColumn("folder_IMAGES", "GROUP_CONCAT(DISTINCT ".FolderImageTableMap::FILE.")")
->addSelectColumn("folder_IMAGES")
->endUse()
->_endif()
->addJoinObject($folderI18nJoin, "folder_i18n_join")
@@ -111,6 +131,7 @@ class ContentExport extends ExportHandler implements
->addAsColumn("folder_TITLE", FolderI18nTableMap::TITLE)
->addAsColumn("folder_ID", FolderTableMap::ID)
->endUse()
->addAsColumn("folder_IS_DEFAULT", ContentFolderTableMap::DEFAULT_FOLDER)
->endUse()
->addJoinObject($contentI18nJoin, "content_i18n_join")
->addJoinCondition("content_i18n_join", ContentI18nTableMap::LOCALE . " = ?", $locale, null, \PDO::PARAM_STR)
@@ -137,44 +158,10 @@ class ContentExport extends ExportHandler implements
\PDO::PARAM_STR
)
->addAsColumn("url_URL", RewritingUrlTableMap::URL)
->select([
ContentTableMap::ID,
ContentTableMap::VISIBLE,
"content_TITLE",
"content_CHAPO",
"content_DESCRIPTION",
"content_CONCLUSION",
"content_seo_TITLE",
"content_seo_DESCRIPTION",
"content_seo_KEYWORDS",
"url_URL",
"folder_TITLE",
"folder_ID",
])
->groupBy(ContentTableMap::ID)
->groupBy("folder_ID")
;
/**
* @var ContentQuery $query
*/
if ($this->isDocumentExport()) {
$query->select($query->getSelect() + [
"folder_DOCUMENTS",
"content_DOCUMENTS",
]);
}
/**
* @var ContentQuery $query
*/
if ($this->isImageExport()) {
$query->select($query->getSelect() + [
"folder_IMAGES",
"content_IMAGES",
]);
}
$dataSet = $query
->find()
->toArray()
@@ -227,6 +214,7 @@ class ContentExport extends ExportHandler implements
"seo_keywords",
"url",
"folder_id",
"is_default_folder",
"folder_title",
];
}
@@ -246,6 +234,7 @@ class ContentExport extends ExportHandler implements
"url_URL" => "url",
"folder_TITLE" => "folder_title",
"folder_ID" => "folder_id",
"folder_IS_DEFAULT" => "is_default_folder"
];
}

8
core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
View File

@@ -85,6 +85,11 @@ class ContentExportTest extends \PHPUnit_Framework_TestCase
$folder->getTitle(),
$data[$i]["folder_title"]
);
$this->assertEquals(
$contentFolder->getDefaultFolder(),
(bool)((int)$data[$i]["is_default_folder"])
);
}
} while (
isset($data[++$i]["id"]) &&
@@ -121,7 +126,7 @@ class ContentExportTest extends \PHPUnit_Framework_TestCase
$j = 1;
while ($data[$i-$j]["id"] === $data[$i]["id"]) {
if (!empty($data[$i - $j++]["content_images"])) {
$data[$i]["content_images"] = $data[$i-$j-1]["content_images"];
$data[$i]["content_images"] = $data[$i-$j+1]["content_images"];
break;
}
}
@@ -133,6 +138,7 @@ class ContentExportTest extends \PHPUnit_Framework_TestCase
->useFolderQuery()
->useContentFolderQuery()
->filterByContentId($data[$i]["id"])
->filterByFolderId($data[$i]["folder_id"])
->endUse()
->endUse()
->select(FolderImageTableMap::FILE)