geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-15 18:23:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-development' of github.com:skipperbent/simple-php-router into v4-development

Browse Source
This commit is contained in:
Simon Sessingø
2021-03-17 20:20:56 +01:00
parent ca88e86c3d 5a24dfd4a1
commit ff8ef9d412
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -484,13 +484,13 @@ SimpleRouter::get('/user/{name}', function ($name) {
// ... do stuff
})->where('name', '[A-Za-z]+');
})->where([ 'name' => '[A-Za-z]+' ]);
SimpleRouter::get('/user/{id}', function ($id) {
// ... do stuff
})->where('id', '[0-9]+');
})->where([ 'id' => '[0-9]+' ]);
SimpleRouter::get('/user/{id}/{name}', function ($id, $name) {

13
src/Pecee/Http/Input/InputHandler.php
View File

@@ -303,13 +303,22 @@ class InputHandler
// Append any PHP-input json
if (strpos(trim($contents), '{') === 0) {
$post = json_decode($contents, true);
if ($post !== false) {
$output += $post;
}
}
}
return (\count($filter) > 0) ? array_intersect_key($output, array_flip($filter)) : $output;
$output = (\count($filter) > 0) ? array_intersect_key($output, array_flip($filter)) : $output;
foreach ($filter as $filterKey) {
if (array_key_exists($filterKey, $output) === false) {
$output[$filterKey] = null;
}
}
return $output;
}
/**
@@ -345,4 +354,4 @@ class InputHandler
$this->file[$key] = $item;
}
}
}

2
src/Pecee/Http/Security/CookieTokenProvider.php
View File

@@ -63,7 +63,7 @@ class CookieTokenProvider implements ITokenProvider
public function setToken(string $token): void
{
$this->token = $token;
setcookie(static::CSRF_KEY, $token, (time() + 60) * $this->cookieTimeoutMinutes, '/', ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
setcookie(static::CSRF_KEY, $token, time() + (60 * $this->cookieTimeoutMinutes), '/', ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
}
/**

4
src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php
View File

@@ -53,7 +53,7 @@ class ClassLoader implements IClassLoader
* @return mixed
* @throws NotFoundHttpException
*/
public function loadClosure(\Closure $closure, array $parameters)
public function loadClosure(Callable $closure, array $parameters)
{
if ($this->useDependencyInjection === true) {
$container = $this->getContainer();
@@ -115,4 +115,4 @@ class ClassLoader implements IClassLoader
return $this->useDependencyInjection;
}
}
}

4
src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php
View File

@@ -7,6 +7,6 @@ interface IClassLoader
public function loadClass(string $class);
public function loadClosure(\Closure $closure, array $parameters);
public function loadClosure(Callable $closure, array $parameters);
}
}