Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Splash is a PHP router. It takes an HTTP request and dispatches it to the approp
- With [Wordpress (through Moufpress, a plugin that adds a Splash-compatible MVC framework)](http://mouf-php.com/packages/mouf/integration.wordpress.moufpress),
- With [Joomla (through Moufla, a plugin that adds a Splash-compatible MVC framework)](http://mouf-php.com/packages/mouf/integration.wordpress.moufpress),
- With [Magento (through Moufgento, a plugin that adds a Splash-compatible MVC framework)](http://mouf-php.com/packages/mouf/integration.magento.moufgento),

- And it supports emoji routes (mydomain.com/😍)


Clean controllers
Expand Down
2 changes: 1 addition & 1 deletion src/Mouf/Mvc/Splash/Routers/SplashDefaultRouter.php
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private function route(ServerRequestInterface $request, ResponseInterface $respo
}

$tailing_url = substr($request_path, $pos + strlen($this->rootUrl));

$tailing_url = urldecode($tailing_url);
$splashRoute = $urlNodes->walk($tailing_url, $request);

if ($splashRoute === null) {
Expand Down
27 changes: 27 additions & 0 deletions tests/Mouf/Mvc/Splash/Fixtures/TestController3.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace Mouf\Mvc\Splash\Fixtures;

use Mouf\Mvc\Splash\Annotations\Action;
use Mouf\Mvc\Splash\Annotations\Delete;
use Mouf\Mvc\Splash\Annotations\Get;
use Mouf\Mvc\Splash\Annotations\Post;
use Mouf\Mvc\Splash\Annotations\Put;
use Mouf\Mvc\Splash\Annotations\Title;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\JsonResponse;
use Mouf\Mvc\Splash\Annotations\URL;

class TestController3
{

/**
* @URL("/🍕")
*/
public function action1()
{
return new JsonResponse([
'type' => 'success'
]);
}
}
22 changes: 22 additions & 0 deletions tests/Mouf/Mvc/Splash/Routers/SplashDefaultRouterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Zend\Diactoros\Response\JsonResponse;
use Zend\Diactoros\Response\RedirectResponse;
use Zend\Diactoros\ServerRequest;
use Mouf\Mvc\Splash\Fixtures\TestController3;

class SplashDefaultRouterTest extends \PHPUnit_Framework_TestCase
{
Expand Down Expand Up @@ -100,6 +101,27 @@ public function testUnknownRoute()
$response = $defaultRouter($request, $response);
}


public function testEmojiRoute()
{
$container = new Picotainer([
'controller' => function () {
return new TestController3();
},
]);
$parameterFetcherRegistry = ParameterFetcherRegistry::buildDefaultControllerRegistry();
$controllerAnalyzer = new ControllerAnalyzer($container, $parameterFetcherRegistry, new AnnotationReader());
$controllerRegistry = new ControllerRegistry($controllerAnalyzer, ['controller']);
$defaultRouter = new SplashDefaultRouter($container, [
$controllerRegistry,
], $parameterFetcherRegistry);

$request = new ServerRequest([], [], '/'.urlencode('🍕'), 'GET');
$response = new HtmlResponse('');
$response = $defaultRouter($request, $response);
$this->assertInstanceOf(JsonResponse::class, $response);
}

public function testUnknownRouteWith404Handler()
{
$container = new Picotainer([
Expand Down