From 9d928c1f5305c69dc179938b8a261bc3a6001cc0 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Thu, 3 Jul 2014 13:43:59 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20FileDownloader=20test=20=09modifi=C3=A9:?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20core/lib/Thelia/Core/FileFormat/Arch?=
 =?UTF-8?q?ive/ArchiveBuilder/ZipArchiveBuilder.php=20=09modifi=C3=A9:=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20core/lib/Thelia/Tests/FileFormat/Archiv?=
 =?UTF-8?q?e/ArchiveBuilder/TarArchiveBuilderTest.php=20=09modifi=C3=A9:?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20core/lib/Thelia/Tests/Tools/FileDown?=
 =?UTF-8?q?loaderTest.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php   | 2 +-
 .../Archive/ArchiveBuilder/TarArchiveBuilderTest.php          | 4 +++-
 core/lib/Thelia/Tests/Tools/FileDownloaderTest.php            | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
index 4cee2676b..796be2fe1 100644
--- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
+++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
@@ -547,7 +547,7 @@ class ZipArchiveBuilder extends AbstractArchiveBuilder
          */
         $initialString = preg_replace("#\/{2,}#", "/", $initialString);
 
-        if (preg_match("#\/?[^\/]+\/[^/]+\/?#", $initialString)) {
+        if (preg_match("#\/?[^\/]+\/[^\/]+\/?#", $initialString)) {
             $initialString = "/" . $initialString;
         }
         return $initialString;
diff --git a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
index fb4f5c86b..cf65ea3d1 100644
--- a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
+++ b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
@@ -97,6 +97,7 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testAddValidFileFromString()
     {
+<<<<<<< HEAD
         $this->tar->addFileFromString(
 <<<<<<< HEAD
             "foo", "bar"
@@ -306,8 +307,9 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
 } 
 >>>>>>> Finish implementing and testing zip
 =======
+=======
+>>>>>>> Fix FileDownloader test
 
-        )
     }
 } 
 >>>>>>> Complete zip tests
diff --git a/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php b/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
index 457a8e634..263d67db7 100644
--- a/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
+++ b/core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
@@ -15,10 +15,14 @@ use Symfony\Component\DependencyInjection\Container;
 use Thelia\Core\Translation\Translator;
 use Thelia\Log\Tlog;
 <<<<<<< HEAD
+<<<<<<< HEAD
 use Thelia\Tools\FileDownload\FileDownloader;
 =======
 use Thelia\Tools\FileDownloader;
 >>>>>>> Define archive builders and formatters
+=======
+use Thelia\Tools\FileDownload\FileDownloader;
+>>>>>>> Fix FileDownloader test
 
 /**
  * Class FileDownloaderTest