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

Fix cs

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/FormatInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/Exception/BadFormattedStringException.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatter/FormatterInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php
	modifié:         core/lib/Thelia/Tests/Tools/FakeFileDownloader.php
	modifié:         core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
This commit is contained in:
Benjamin Perche
2014-07-04 10:01:29 +02:00
parent 7136371960
commit 2e4987a47c
23 changed files with 295 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
View File

@@ -457,7 +457,7 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
$this->tar->formatDirectoryPath("//foo/bar///baz/")
);
}
public function testFormatFilePath()
{
$this->assertEquals(
@@ -522,5 +522,9 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
$this->tar->getCompression()
);
}
<<<<<<< HEAD
}
>>>>>>> Finish tar, tar.gz, tar.bz2 and tests
=======
}
>>>>>>> Fix cs

4
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php
View File

@@ -36,7 +36,11 @@ class TarBz2ArchiveBuilderTest extends TarArchiveBuilderTest
);
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> Finish tar, tar.gz, tar.bz2 and tests
=======
}
>>>>>>> Fix cs

7
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php
View File

@@ -13,9 +13,12 @@
namespace Thelia\Tests\FileFormat\Archive\ArchiveBuilder;
use Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder;
<<<<<<< HEAD
<<<<<<< HEAD
=======
use Thelia\Core\HttpFoundation\Response;
>>>>>>> Finish tar, tar.gz, tar.bz2 and tests
=======
>>>>>>> Fix cs
/**
* Class TarGzArchiveBuilderTest
@@ -40,7 +43,11 @@ class TarGzArchiveBuilderTest extends TarArchiveBuilderTest
);
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> Finish tar, tar.gz, tar.bz2 and tests
=======
}
>>>>>>> Fix cs

4
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
View File

@@ -693,6 +693,7 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
);
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
@@ -701,3 +702,6 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
=======
}
>>>>>>> Finish implementing and testing zip
=======
}
>>>>>>> Fix cs

4
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
View File

@@ -72,8 +72,12 @@ class ArchiveBuilderManagerTest extends \PHPUnit_Framework_TestCase
$this->manager->delete("foo");
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> Define archive builders and formatters
=======
}
>>>>>>> Fix cs

2
core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php
View File

@@ -71,4 +71,4 @@ class FormatterManagerTest extends \PHPUnit_Framework_TestCase
{
$this->manager->delete("foo");
}
}
}

9
core/lib/Thelia/Tests/Tools/FakeFileDownloader.php
View File

@@ -22,6 +22,7 @@ use Thelia\Tools\FileDownload\FileDownloader;
class FakeFileDownloader extends FileDownloader
{
/**
<<<<<<< HEAD
<<<<<<< HEAD
* @param string $url
* @param string $pathToStore
@@ -29,6 +30,10 @@ class FakeFileDownloader extends FileDownloader
* @param string $url
* @param string $pathToStore
>>>>>>> Define archive builders and formatters
=======
* @param string $url
* @param string $pathToStore
>>>>>>> Fix cs
* @throws \Thelia\Exception\FileNotFoundException
* @throws \ErrorException
* @throws \HttpUrlException
@@ -46,8 +51,12 @@ class FakeFileDownloader extends FileDownloader
}
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> Define archive builders and formatters
=======
}
>>>>>>> Fix cs

4
core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
View File

@@ -69,7 +69,11 @@ class FileDownloaderTest extends \PHPUnit_Framework_TestCase
$this->downloader->download("https://github.com/thelia/thelia", "php://temp");
}
<<<<<<< HEAD
<<<<<<< HEAD
}
=======
}
>>>>>>> Define archive builders and formatters
=======
}
>>>>>>> Fix cs