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

Refactor services

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Model/Country.php
	modifié:         core/lib/Thelia/Model/Currency.php
	modifié:         core/lib/Thelia/Tools/URL.php
This commit is contained in:
Benjamin Perche
2014-07-10 11:19:49 +02:00
parent 658c848171
commit 7727c14440
2 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -108,10 +108,6 @@
<argument >%kernel.debug%</argument>
</service>
<<<<<<< HEAD
=======
>>>>>>> Readd services
<!-- The file manager -->
<service id="thelia.file_manager" class="Thelia\Files\FileManager">
<argument>%file_model.classes%</argument>
@@ -141,11 +137,6 @@
<service id="session.listener" class="Thelia\Core\EventListener\SessionListener">
<tag name="kernel.event_subscriber"/>
</service>
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> Readd services
<!-- Archive builders -->
@@ -154,69 +145,27 @@
</service>
<!-- zip -->
<service id="thelia.archive_builder.zip_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\ZipArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- tar -->
<service id="thelia.archive_builder.tar_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- tar.gz -->
<service id="thelia.archive_builder.tar_gz_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- tar.bz2 -->
<service id="thelia.archive_builder.tar_bz2_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarBz2ArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- Formatters -->
<<<<<<< HEAD
<service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
<<<<<<< HEAD
<<<<<<< HEAD
</services>
>>>>>>> Add archive builder manager and formatter manager services
<!-- Archive builders -->
<service id="thelia.manager.archive_builder_manager" class="Thelia\Core\FileFormat\Archive\ArchiveBuilderManager">
<argument>%kernel.environment%</argument>
</service>
<!-- zip -->
<service id="thelia.manager.zip_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\ZipArchiveBuilder">
<service id="thelia.archive_builder.zip" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\ZipArchiveBuilder">
<tag name="thelia.manager.archive_builder" />
</service>
<!-- tar -->
<service id="thelia.manager.tar_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarArchiveBuilder">
<tag name="thelia.manager.archive_builder" />
<service id="thelia.archive_builder.tar" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- tar.gz -->
<service id="thelia.manager.tar_gz_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder">
<tag name="thelia.manager.archive_builder" />
<service id="thelia.archive_builder.tar_gz" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- tar.bz2 -->
<service id="thelia.manager.tar_bz2_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarBz2ArchiveBuilder">
<tag name="thelia.manager.archive_builder" />
<service id="thelia.archive_builder.tar_bz2" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarBz2ArchiveBuilder">
<tag name="thelia.archive_builder" />
</service>
<!-- Formatters -->
<service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
=======
>>>>>>> Fix services
=======
>>>>>>> Readd services
=======
<service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatting\FormatterManager" />
<service id="thelia.formatter.xml_formatter" class="Thelia\Core\FileFormat\Formatting\Formatter\XMLFormatter">
@@ -226,6 +175,5 @@
<service id="thelia.formatter.json_formatter" class="Thelia\Core\FileFormat\Formatting\Formatter\JsonFormatter">
<tag name="thelia.formatter" />
</service>
>>>>>>> Begin import export management
</services>
</config>

8
core/lib/Thelia/Tools/URL.php
View File

@@ -315,15 +315,7 @@ class URL
$clean;
}
<<<<<<< HEAD
<<<<<<< HEAD
public static function checkUrl($url, array $protocols = ["http", "https"])
=======
public function checkUrl($url, array $protocols = ["http", "https"])
>>>>>>> Define archive builders and formatters
=======
public static function checkUrl($url, array $protocols = ["http", "https"])
>>>>>>> Fix FileDownloader test
{
$pattern = sprintf(UrlValidator::PATTERN, implode('|', $protocols));