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

Fixed image tests

Browse Source
This commit is contained in:
franck
2013-09-04 17:59:07 +02:00
parent 866036a0bf
commit 31c074d492
6 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/Category.php
View File

@@ -25,7 +25,7 @@ class Category extends BaseCategory
public function getUrl($locale)
{
return URL::getInstance()->retrieve('category', $this->getId(), $locale);
return URL::getInstance()->retrieve('category', $this->getId(), $locale)->toString();
}
/**

2
core/lib/Thelia/Model/Content.php
View File

@@ -9,6 +9,6 @@ class Content extends BaseContent
{
public function getUrl($locale)
{
return URL::getInstance()->retrieve('content', $this->getId(), $locale);
return URL::getInstance()->retrieve('content', $this->getId(), $locale)->toString();
}
}

2
core/lib/Thelia/Model/Folder.php
View File

@@ -17,7 +17,7 @@ class Folder extends BaseFolder
public function getUrl($locale)
{
return URL::getInstance()->retrieve('folder', $this->getId(), $locale);
return URL::getInstance()->retrieve('folder', $this->getId(), $locale)->toString();
}
/**

2
core/lib/Thelia/Model/Product.php
View File

@@ -9,6 +9,6 @@ class Product extends BaseProduct
{
public function getUrl($locale)
{
return URL::getInstance()->retrieve('product', $this->getId(), $locale);
return URL::getInstance()->retrieve('product', $this->getId(), $locale)->toString();
}
}

9
core/lib/Thelia/Tests/Action/ImageTest.php
View File

@@ -30,6 +30,7 @@ use Thelia\Core\HttpFoundation\Session\Session;
use Thelia\Action\Image;
use Thelia\Core\Event\ImageEvent;
use Thelia\Model\ConfigQuery;
use Thelia\Tools\URL;
/**
* Class ImageTest
@@ -48,7 +49,15 @@ class ImageTest extends \PHPUnit_Framework_TestCase
$dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface");
$url = new URL($container, 'dev');
$container->set("event_dispatcher", $dispatcher);
$container->set("thelia.url.manager", $dispatcher);
$request = new Request();
$request->setSession($this->session);
$container->set("request", $request);
return $container;
}

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

@@ -55,8 +55,6 @@ class URL
$this->retriever = new RewritingRetriever();
$this->resolver = new RewritingResolver();
echo "instanciation ok !";
}
/**
@@ -79,10 +77,7 @@ class URL
*/
public function getBaseUrl()
{
$lang = $this->container
->get('request')
->getSession()
->getLang();
$lang = $this->container->get('request')->getSession()->getLang();
// Check if we have a specific URL for each lang.
$one_domain_foreach_lang = ConfigQuery::read("one_domain_foreach_lang", false);
@@ -197,70 +192,65 @@ class URL
return $this->absoluteUrl($path, $parameters);
}
/**
* Retrieve a rewritten URL from a view, a view id and a locale
*
* @param $view
* @param $viewId
* @param $viewLocale
*
* @return RewritingRetriever You can access $url and $rewrittenUrl properties
*/
public function retrieve($view, $viewId, $viewLocale)
{
if(ConfigQuery::isRewritingEnable()) {
$this->retriever->loadViewUrl($view, $viewLocale, $viewId);
}
/**
* Retrieve a rewritten URL from a view, a view id and a locale
*
* @param $view
* @param $viewId
* @param $viewLocale
*
* @return RewritingRetriever You can access $url and $rewrittenUrl properties
*/
public function retrieve($view, $viewId, $viewLocale)
{
if(ConfigQuery::isRewritingEnable()) {
$this->retriever->loadViewUrl($view, $viewLocale, $viewId);
}
return $this->retriever;
}
// Bug: $rewrittenUrl n'est pas initialisé
//return $rewrittenUrl === null ? $this->viewUrl($view, array($view . '_id' => $viewId, 'locale' => $viewLocale)) : $rewrittenUrl;
return $this->viewUrl($view, array($view . '_id' => $viewId, 'locale' => $viewLocale));
}
/**
* Retrieve a rewritten URL from the current GET parameters
*
* @param Request $request
*
* @return RewritingRetriever You can access $url and $rewrittenUrl properties or use toString method
*/
public function retrieveCurrent(Request $request)
{
if(ConfigQuery::isRewritingEnable()) {
$view = $request->query->get('view', null);
$viewLocale = $request->query->get('locale', null);
$viewId = $view === null ? null : $request->query->get($view . '_id', null);
/**
* Retrieve a rewritten URL from the current request GET parameters
*
* @return RewritingRetriever You can access $url and $rewrittenUrl properties or use toString method
*/
public function retrieveCurrent()
{
if (ConfigQuery::isRewritingEnable()) {
$allOtherParameters = $request->query->all();
if($view !== null) {
unset($allOtherParameters['view']);
}
if($viewLocale !== null) {
unset($allOtherParameters['locale']);
}
if($viewId !== null) {
unset($allOtherParameters[$view . '_id']);
}
$query = $this->container->get('request')->query;
$this->retriever->loadSpecificUrl($view, $viewLocale, $viewId, $allOtherParameters);
}
$view = $query->get('view', null);
$viewLocale = $query->get('locale', null);
$viewId = $view === null ? null : $query->get($view . '_id', null);
return $this->retriever;
}
$allOtherParameters = $query->all();
if($view !== null) {
unset($allOtherParameters['view']);
}
if($viewLocale !== null) {
unset($allOtherParameters['locale']);
}
if($viewId !== null) {
unset($allOtherParameters[$view . '_id']);
}
$this->retriever->loadSpecificUrl($view, $viewLocale, $viewId, $allOtherParameters);
}
return $this->retriever;
}
/**
* Retrieve a rewritten URL from the current GET parameters or use toString method
*
* @param $url
*
* @return RewritingResolver
*/
public function resolve($url)
{
$this->resolver->load($url);
return $this->resolver;
}
/**
* Retrieve a rewritten URL from the current GET parameters or use toString method
*
* @param $url
*
* @return RewritingResolver
*/
public function resolve($url)
{
$this->resolver->load($url);
return $this->resolver;
}
}