"classmap" : ["."]
},
"require": {
+ "psr/http-message": "~1.0",
+ "guzzlehttp/psr7": "^1",
"pear/archive_tar": "1.3.*",
"doctrine/dbal": "^2.5",
"d11wtq/boris": "~1",
"andy128k/missing-tools": "~0.3",
"andy128k/pegp": "~0.2",
"pimple/pimple": "~3.0",
- "twig/twig": "~1"
+ "twig/twig": "~1",
+ "http-interop/response-sender": "^1.0",
+ "dflydev/fig-cookies": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~5"
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "644aeae9afe6d53dd080f9d189b994f5",
+ "content-hash": "033acffc1357df5be748520f701b68c8",
"packages": [
{
"name": "andy128k/missing-tools",
"description": "A tiny, but robust REPL (Read-Evaluate-Print-Loop) for PHP.",
"time": "2015-03-01T08:05:19+00:00"
},
+ {
+ "name": "dflydev/fig-cookies",
+ "version": "v1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/dflydev/dflydev-fig-cookies.git",
+ "reference": "883233c159d00d39e940bd12cfe42c0d23420c1c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/dflydev/dflydev-fig-cookies/zipball/883233c159d00d39e940bd12cfe42c0d23420c1c",
+ "reference": "883233c159d00d39e940bd12cfe42c0d23420c1c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4",
+ "psr/http-message": "~1.0"
+ },
+ "require-dev": {
+ "codeclimate/php-test-reporter": "~0.1@dev",
+ "phpunit/phpunit": "~4.5",
+ "squizlabs/php_codesniffer": "~2.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Dflydev\\FigCookies\\": "src/Dflydev/FigCookies"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Beau Simensen",
+ "email": "beau@dflydev.com"
+ }
+ ],
+ "description": "Cookies for PSR-7 HTTP Message Interface.",
+ "keywords": [
+ "cookies",
+ "psr-7",
+ "psr7"
+ ],
+ "time": "2016-03-28T09:10:18+00:00"
+ },
{
"name": "doctrine/annotations",
"version": "v1.4.0",
],
"time": "2014-09-09T13:34:57+00:00"
},
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "1.5.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0",
+ "psr/http-message": "~1.0",
+ "ralouphie/getallheaders": "^2.0.5"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.5-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
+ }
+ ],
+ "description": "PSR-7 message implementation that also provides common utility methods",
+ "keywords": [
+ "http",
+ "message",
+ "psr-7",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "time": "2018-12-04T20:46:45+00:00"
+ },
+ {
+ "name": "http-interop/response-sender",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/http-interop/response-sender.git",
+ "reference": "fd63be06cd6c9216ef3c725af1a3f6b155eebc84"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/http-interop/response-sender/zipball/fd63be06cd6c9216ef3c725af1a3f6b155eebc84",
+ "reference": "fd63be06cd6c9216ef3c725af1a3f6b155eebc84",
+ "shasum": ""
+ },
+ "require": {
+ "psr/http-message": "^1.0"
+ },
+ "require-dev": {
+ "guzzlehttp/psr7": "^1.4",
+ "php-mock/php-mock-phpunit": "^1.1",
+ "phpunit/phpunit": "^5.6"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Woody Gilk",
+ "email": "woody.gilk@gmail.com"
+ }
+ ],
+ "description": "A function to convert PSR-7 Response to HTTP output",
+ "time": "2017-03-17T15:46:19+00:00"
+ },
{
"name": "pear/archive_tar",
"version": "1.3.16",
],
"time": "2017-02-14T16:28:37+00:00"
},
+ {
+ "name": "psr/http-message",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2016-08-06T14:39:51+00:00"
+ },
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "2.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7.0",
+ "satooshi/php-coveralls": ">=1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "time": "2016-02-11T07:05:27+00:00"
+ },
{
"name": "symfony/polyfill-ctype",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ "reference": "82ebae02209c21113908c229e9883c419720738a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+ "reference": "82ebae02209c21113908c229e9883c419720738a",
"shasum": ""
},
"require": {
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.11-dev"
}
},
"autoload": {
"polyfill",
"portable"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2019-02-06T07:57:58+00:00"
},
{
"name": "twig/twig",
- "version": "v1.38.2",
+ "version": "v1.38.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "874adbd9222f928f6998732b25b01b41dff15b0c"
+ "reference": "7732e9e7017d751313811bd118de61302e9c8b35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/874adbd9222f928f6998732b25b01b41dff15b0c",
- "reference": "874adbd9222f928f6998732b25b01b41dff15b0c",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/7732e9e7017d751313811bd118de61302e9c8b35",
+ "reference": "7732e9e7017d751313811bd118de61302e9c8b35",
"shasum": ""
},
"require": {
"keywords": [
"templating"
],
- "time": "2019-03-12T18:45:24+00:00"
+ "time": "2019-03-23T14:27:19+00:00"
}
],
"packages-dev": [
},
{
"name": "symfony/yaml",
- "version": "v3.4.23",
+ "version": "v3.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c"
+ "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/57f1ce82c997f5a8701b89ef970e36bb657fd09c",
- "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996",
+ "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996",
"shasum": ""
},
"require": {
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-02-23T15:06:07+00:00"
+ "time": "2019-03-25T07:48:46+00:00"
},
{
"name": "webmozart/assert",
<?php
+use GuzzleHttp\Psr7\ServerRequest;
use IPF\BootstrapProvider;
use Pimple\Container;
if (php_sapi_name() === 'cli') {
$container['cli']->run();
} else {
- $request = new IPF_HTTP_Request;
+ $request = ServerRequest::fromGlobals();
$pipeline = $container['pipeline'];
$response = $pipeline->call($request);
- $response->render($request->method !== 'HEAD');
+ \Http\Response\send($response);
}
}
/** @var IPF_Router $router */
$router = $container['router'];
$loginPage = $router->reverse(['IPF_Admin_User_Controller', 'login']);
- return new IPF_HTTP_Response_Redirect($loginPage);
+ return IPF_HTTP_Response::redirect($loginPage);
}
}
{
public function response($container, $request)
{
- return new IPF_HTTP_Response_NotFound($container, $request);
+ return IPF_HTTP_Response::notFound($container, $request);
}
}
<?php
use PFF\HtmlBuilder\Tag as Tag;
+use Psr\Http\Message\ServerRequestInterface;
interface IPF_Admin_ListFilter
{
abstract class IPF_Admin_Component
{
public $perPage = 50;
- public $app = null, $request = null;
+ public $app = null;
+ /** @var ServerRequestInterface */
+ public $request = null;
/** @var IPF_Admin_ILog|null */
public $admin_log;
/** @var IPF_Auth_App */
return array('view', 'add', 'change', 'delete');
}
- public function isAccessible($what, $request)
+ public function isAccessible($what, ServerRequestInterface $request)
{
if (!$request)
throw new IPF_Exception('No request.');
return $prefix . $action;
}, $what);
- return $this->auth_app->userCan($request->user, $authPermissions);
+ return $this->auth_app->userCan($request->getAttribute('user'), $authPermissions);
}
protected function context($request)
protected function referrerOfChangeAction()
{
return
- \PFF\Arr::get($this->request->REQUEST, 'ipf_referrer',
- \PFF\Arr::get($this->request->SERVER, 'HTTP_REFERER',
+ \PFF\Arr::get(array_merge((array)$this->request->getQueryParams(), (array)$this->request->getParsedBody()), 'ipf_referrer',
+ \PFF\Arr::get($this->request->getServerParams(), 'HTTP_REFERER',
''));
}
protected function changeSucceed()
{
- $url = @$this->request->POST['ipf_referrer'];
+ $url = @$this->request->getParsedBody()['ipf_referrer'];
if (!$url)
$url = $this->router->reverse(array('IPF_Admin_Components_Controller', 'listItems'), array($this->app->slug(), $this->slug()));
- return new IPF_HTTP_Response_Redirect($url);
+ return IPF_HTTP_Response::redirect($url);
}
public function addItem()
);
$errors = false;
- if ($this->request->method == 'POST') {
- $form = $this->_getAddForm(null, $this->request->getFormData(), $extra);
+ if ($this->request->getMethod() == 'POST') {
+ $form = $this->_getAddForm(null, array_merge_recursive($this->request->getParsedBody(), $this->request->getUploadedFiles()), $extra);
$this->_setupAddForm($form);
if ($form->isValid()) {
if (!$object)
throw new IPF_HTTP_Error404;
- if ($this->request->method == 'POST') {
+ if ($this->request->getMethod() == 'POST') {
$this->admin_log->logObject($this, 'delete', $object);
$this->deleteObject($object);
return $this->changeSucceed();
);
$errors = false;
- if ($this->request->method == 'POST') {
- $form = $this->_getEditForm($object, $this->request->getFormData(), $extra);
+ if ($this->request->getMethod() == 'POST') {
+ $form = $this->_getEditForm($object, array_merge_recursive($this->request->getParsedBody(), $this->request->getUploadedFiles()), $extra);
$this->_setupEditForm($form);
if ($form->isValid()) {
public function listItems()
{
- $searchValue = @$this->request->GET['q'];
+ $params = $this->request->getQueryParams();
+
+ $searchValue = @$params['q'];
$filters = $this->listFilters();
foreach ($filters as $f)
- $f->setParams($this->request->GET);
+ $f->setParams($params);
- $currentPage = (int)@$this->request->GET['page'];
+ $currentPage = (int)@$params['page'];
if (!$currentPage)
$currentPage = 1;
function renderFilter($filter)
{
- $params = $this->request->GET;
+ $params = $this->request->getQueryParams();
$paramName = $filter->paramName();
$ul = Tag::ul();
<?php
+use GuzzleHttp\Psr7\Response;
+
abstract class IPF_Admin_Base_Controller extends IPF_Controller
{
protected function ensureUserIsStaff()
{
- if ($this->request->user->isAnonymous())
+ $user = $this->request->getAttribute('user');
+ if (!$user || $user->isAnonymous())
throw new IPF_Admin_LoginRequired;
- if (!$this->request->user->is_staff && !$this->request->user->is_superuser)
+ if (!$user->is_staff && !$user->is_superuser)
throw new IPF_Admin_LoginRequired;
}
protected function render($template, $params)
{
$body = $this->container['template']->render($template, $params, $this->request);
- return new IPF_HTTP_Response($body);
+ return new Response(200, [], $body);
}
/**
<?php
+use Psr\Http\Message\ResponseInterface;
+
class IPF_Admin_Components_Controller extends IPF_Admin_Base_Controller
{
function listItems()
{
$this->checkPermissions('view', 'change');
- if (!isset($this->request->POST['ids']) || !is_array($this->request->POST['ids']))
- return new IPF_HTTP_Response_NotFound($this->container, $this->request);
+ $post = $this->request->getParsedBody();
+ if (!isset($post['ids']) || !is_array($post['ids']))
+ return IPF_HTTP_Response::notFound($this->container, $this->request);
- if ($this->component->reorder($this->request->POST['ids']))
- return new IPF_HTTP_Response_Json("Ok");
+ if ($this->component->reorder($post['ids']))
+ return IPF_HTTP_Response::json("Ok");
else
- return new IPF_HTTP_Response_Json('Cannot find model');
+ return IPF_HTTP_Response::json('Cannot find model');
}
// protected
{
$this->ensureUserIsStaff();
- $this->component = $this->adminApplication()->getComponentBySlugs($this->request->params[1], $this->request->params[2]);
+ $params = $this->request->getAttribute('params');
+ $this->component = $this->adminApplication()->getComponentBySlugs($params[1], $params[2]);
if (!$this->component)
throw new IPF_HTTP_Error404;
protected function after__listItems__addItem__editItem__deleteItem($action, $response)
{
list($template, $context) = $response;
- if ($context instanceof IPF_HTTP_Response)
+ if ($context instanceof ResponseInterface)
return $context;
else
return $this->render($template, $context);
function log()
{
- $currentPage = (int)@$this->request->GET['page'];
+ $currentPage = (int)@$this->request->getQueryParams()['page'];
if (!$currentPage)
$currentPage = 1;
function listDirectory()
{
- $dir = $this->validateDirectory($this->request->GET['dir']);
+ $dir = $this->validateDirectory($this->request->getQueryParams()['dir']);
list($dirs, $files) = self::listDir($dir);
- return new IPF_HTTP_Response_Json([
+ return IPF_HTTP_Response::json([
'dirs' => $dirs,
'files' => $files,
]);
function rename()
{
- $dir = $this->validateDirectory($this->request->POST['dir']);
- $old_name = $this->validateName($this->request->POST['old_name']);
- $new_name = $this->validateName($this->request->POST['new_name']);
+ $post = $this->request->getParsedBody();
+ $dir = $this->validateDirectory($post['dir']);
+ $old_name = $this->validateName($post['old_name']);
+ $new_name = $this->validateName($post['new_name']);
rename($dir . $old_name, $dir . $new_name);
- return $this->noContent();
+ return IPF_HTTP_Response::noContent();
}
function move()
{
- $dir = $this->validateDirectory($this->request->POST['dir']);
- $destination = $this->validateDirectory($this->request->POST['destination']);
- $name = $this->validateName($this->request->POST['name']);
+ $post = $this->request->getParsedBody();
+ $dir = $this->validateDirectory($post['dir']);
+ $destination = $this->validateDirectory($post['destination']);
+ $name = $this->validateName($post['name']);
rename($dir . $name, $destination . $name);
- return $this->noContent();
+ return IPF_HTTP_Response::noContent();
}
function mkdir()
{
- $dir = $this->validateDirectory($this->request->POST['dir']);
- $name = $this->validateName($this->request->POST['name']);
+ $post = $this->request->getParsedBody();
+ $dir = $this->validateDirectory($post['dir']);
+ $name = $this->validateName($post['name']);
mkdir($dir . $name);
- return $this->noContent();
+ return IPF_HTTP_Response::noContent();
}
function delete()
{
- $dir = $this->validateDirectory($this->request->POST['dir']);
- $name = $this->validateName($this->request->POST['name']);
+ $post = $this->request->getParsedBody();
+ $dir = $this->validateDirectory($post['dir']);
+ $name = $this->validateName($post['name']);
IPF_Utils::removeDirectories($dir . $name);
- return $this->noContent();
+ return IPF_HTTP_Response::noContent();
}
function upload()
{
- $dir = $this->validateDirectory($this->request->POST['dir']);
- foreach ($this->request->FILES['files'] as $file) {
+ $post = $this->request->getParsedBody();
+ $dir = $this->validateDirectory($post['dir']);
+ foreach ($this->request->getUploadedFiles()['files'] as $file) {
$uploadfile = $dir . basename($file['name']);
move_uploaded_file($file['tmp_name'], $uploadfile);
}
- return $this->noContent();
+ return IPF_HTTP_Response::noContent();
}
private function validateDirectory($path)
return 0;
return ($a['name'] < $b['name']) ? -1 : 1;
}
-
- /**
- * @return IPF_HTTP_Response
- */
- private function noContent()
- {
- $response = new IPF_HTTP_Response();
- $response->status_code = 204;
- return $response;
- }
}
function login()
{
- $success_url = trim(\PFF\Arr::get($this->request->REQUEST, 'next', ''));
- if (!$success_url)
- $success_url = $this->container['router']->reverse(array('IPF_Admin_Dashboard_Controller', 'index'));
+ $success_url = $this->getNextUrl();
$auth_app = $this->authApp();
$auth_serice = $this->container['auth_service'];
- if ($this->request->method == 'POST') {
- $form = new IPF_Admin_Forms_Login($this->request->POST, array('auth_app' => $auth_app, 'auth_service' => $auth_serice));
+ if ($this->request->getMethod() == 'POST') {
+ $form = new IPF_Admin_Forms_Login($this->request->getParsedBody(), array('auth_app' => $auth_app, 'auth_service' => $auth_serice));
if ($form->isValid()) {
$auth_app->login($this->request, $form->user);
- return new IPF_HTTP_Response_Redirect($success_url);
+ return IPF_HTTP_Response::redirect($success_url);
}
} else {
- $form = new IPF_Admin_Forms_Login(array('next'=>$success_url), array('auth_app' => $auth_app, 'auth_service' => $auth_serice));
+ $form = new IPF_Admin_Forms_Login(array('next' => $success_url), array('auth_app' => $auth_app, 'auth_service' => $auth_serice));
}
$context = array(
function impersonate()
{
- $success_url = trim(\PFF\Arr::get($this->request->REQUEST, 'next', ''));
- if (!$success_url)
- $success_url = $this->container['router']->reverse(array('IPF_Admin_Dashboard_Controller', 'index'));
+ $success_url = $this->getNextUrl();
- if (!$this->request->user->isAnonymous() && $this->request->user->is_superuser) {
+ $user1 = $this->request->getAttribute('user');
+ if (!$user1->isAnonymous() && $user1->is_superuser) {
$user = $this->authApp()->findUser($this->params[1]);
if (!$user)
- return new IPF_HTTP_Response_NotFound($this->container, $this->request);
+ return IPF_HTTP_Response::notFound($this->container, $this->request);
$this->authApp()->login($this->request, $user);
}
- return new IPF_HTTP_Response_Redirect($success_url);
+ return IPF_HTTP_Response::redirect($success_url);
+ }
+
+ /**
+ * @return string
+ */
+ private function getNextUrl()
+ {
+ return \PFF\Arr::get(
+ array_merge(
+ (array)$this->request->getQueryParams(),
+ (array)$this->request->getParsedBody()
+ ),
+ 'next',
+ $this->container['router']->reverse(array('IPF_Admin_Dashboard_Controller', 'index'))
+ );
}
}
* @param mixed $object
* @param int|null $object_id
*/
- public function logObject($component, $action, $object, $object_id=null);
+ public function logObject(IPF_Admin_Component $component, $action, $object, $object_id=null);
}
class IPF_Admin_Log implements IPF_Admin_ILog
$stmt->execute();
}
- public function logObject($component, $action, $object, $object_id=null)
+ public function logObject(IPF_Admin_Component $component, $action, $object, $object_id=null)
{
$url = $object_id
? $this->router->reverse(['IPF_Admin_Components_Controller', 'editItem'], [$component->app->slug(), $component->slug(), $object_id])
: '';
- $this->log($component->request->user, $action, (string)$object, $component->verbose_name(), $url);
+ $this->log($component->request->getAttribute('user'), $action, (string)$object, $component->verbose_name(), $url);
}
}
<div id="toolbar">
<form id="changelist-search" method="get" action="">
<div>
- {% for k, v in request.GET %}
+ {% for k, v in request.getQueryParams %}
{% if k != 'q' %}
<input type="hidden" name="{{ k }}" value="{{ v }}">
{% endif %}
<input id="searchbar" type="text" value="{{ search_value }}" name="q" size="40"/>
<input type="submit" value="Go"/>
{% if search_value %}
- <span class="small quiet">{{ count }} results (<a href="?{{ params(request.GET, 'q', null) }}">reset</a>)</span>
+ <span class="small quiet">{{ count }} results (<a href="?{{ params(request.getQueryParams, 'q', null) }}">reset</a>)</span>
{% endif %}
</div>
</form>
{% if p == current_page %}
<span class="this-page">{{ p }}</span>
{% else %}
- <a href="?{{ params(request.GET, 'page', p) }}">{{ p }}</a>
+ <a href="?{{ params(request.getQueryParams, 'page', p) }}">{{ p }}</a>
{% endif %}
{% else %}
…
{% if p == current_page %}
<span class="this-page">{{ p }}</span>
{% else %}
- <a href="?{{ params(request.GET, 'page', p) }}">{{ p }}</a>
+ <a href="?{{ params(request.getQueryParams, 'page', p) }}">{{ p }}</a>
{% endif %}
{% else %}
…
use IPF\Auth\AuthServiceDefault;
use IPF\Auth\User;
use Pimple\Container;
+use Psr\Http\Message\ServerRequestInterface;
class IPF_Auth_App extends IPF_Application
{
return new $className;
}
- function login($request, $user)
+ function login(ServerRequestInterface $request, $user)
{
- $request->user = $user;
- $request->session->data = array(
- 'login_time' => gmdate('Y-m-d H:i:s')
- );
+ $session = $request->getAttribute('session');
+ $session->data[\IPF\Auth\Middleware::SessionKey] = $user->id;
+ $session->data['login_time'] = gmdate('Y-m-d H:i:s');
}
- function logout($request)
+ function logout(ServerRequestInterface $request)
{
- $request->user = new \IPF\Auth\AnonymousUser;
- $request->session->data = array(
- 'login_time' => gmdate('Y-m-d H:i:s')
- );
+ $session = $request->getAttribute('session');
+ unset($session->data[\IPF\Auth\Middleware::SessionKey]);
+ $session->data['login_time'] = gmdate('Y-m-d H:i:s');
}
private $permissionsEnabled = null;
namespace IPF\Auth;
use Doctrine\DBAL\Connection;
+use Psr\Http\Message\ServerRequestInterface;
class Middleware extends \IPF_Middleware
{
const SessionKey = 'IPF_User_auth';
- function processRequest($request)
+ function call(ServerRequestInterface $request)
{
- $request->user = null;
+ $session = $request->getAttribute('session');
+ $user = null;
- $user_id = \PFF\Arr::get($request->session->data, self::SessionKey, 0);
+ $user_id = \PFF\Arr::get($session->data, self::SessionKey, 0);
if ($user_id > 0) {
$connection = $this->getConnection();
- $request->user = $this->getAuthApp()->findUser($user_id);
- if ($request->user && 43200 < time() - strtotime($request->user->last_login.' GMT')) {
- $request->user->last_login = gmdate('Y-m-d H:i:s');
- $request->user->save($connection);
+ $user = $this->getAuthApp()->findUser($user_id);
+ if ($user && 43200 < time() - strtotime($user->last_login.' GMT')) {
+ $user->last_login = gmdate('Y-m-d H:i:s');
+ $user->save($connection);
}
}
- if (!$request->user)
- $request->user = new \IPF\Auth\AnonymousUser;
+ if (!$user)
+ $user = new \IPF\Auth\AnonymousUser;
- return false;
- }
+ $response = $this->next->call(
+ $request->withAttribute('user', $user)
+ );
- function processResponse($request, $response)
- {
- $request->session->data[self::SessionKey] = $request->user->id;
return $response;
}
<?php
use Pimple\Container;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
class IPF_Controller
{
- /** @var IPF_HTTP_Request */
+ /** @var ServerRequestInterface */
protected $request;
protected $params;
/** @var Container */
$this->params = $matches;
$response = $this->before($action);
- if ($response instanceof IPF_HTTP_Response)
+ if ($response instanceof ResponseInterface)
return $response;
$response = $this->$action();
<?php
-$desc = get_class($this->exception) . ' making ' . $this->request->method . ' request to ' . $this->request->SERVER['REQUEST_URI'];
+/** @var \Psr\Http\Message\ServerRequestInterface $request */
+$request = $this->request;
+
+$desc = get_class($this->exception) . ' making ' . $request->getMethod() . ' request to ' . $request->getRequestTarget();
$msg = $this->exception->getMessage();
if ($this->exception->getCode())
<div id="summary">
<h1><?php $this->e($desc) ?></h1>
<h2><?php $this->e($msg) ?></h2>
- <p><?php echo $this->request->method ?> <?php $this->e($this->request->SERVER['REQUEST_URI']) ?></p>
+ <p><?php echo $request->getMethod() ?> <?php $this->e($request->getRequestTarget()) ?></p>
</div>
<!-- /Summary -->
<?php $this->values('$_ENV', $_ENV) ?>
- <?php $this->values('Raw Headers', $this->request->getHeaders()) ?>
+ <?php $this->values('Raw Headers', $request->getHeaders()) ?>
- <?php if ($this->request->getBody()): ?>
+ <?php if ($request->getBody()): ?>
<h3>Raw Body</h3>
- <div class="dump"><?php $this->e($this->request->getBody()) ?></div>
+ <div class="dump"><?php $this->e((string)$request->getBody()) ?></div>
<?php endif; ?>
</div>
<?php
+use GuzzleHttp\Psr7\UploadedFile;
+
class IPF_Form_Field_File extends IPF_Form_Field
{
public $widget = 'IPF_Form_Widget_FileInput';
return IPF_Utils::cleanFileName($value['name'], $this->getAbsolutePath('')); // initial
}
- switch (\PFF\Arr::get($value['file'], 'error')) {
+ /** @var UploadedFile $data */
+ $data = $value['file'];
+ switch ($data->getError()) {
case UPLOAD_ERR_OK:
break;
default:
return $oldname;
}
- $data = $value['file'];
- switch ($data['error']) {
+ switch ($data->getError()) {
case UPLOAD_ERR_OK:
break;
case UPLOAD_ERR_INI_SIZE:
default:
throw new IPF_Exception_Form(__('An error occured when upload the file. Please try to send the file again.'));
}
- if ($data['size'] > $this->max_size) {
+ if ($data->getSize() > $this->max_size) {
throw new IPF_Exception_Form(sprintf(__('The uploaded file is to big (%1$s). Reduce the size to less than %2$s and try again.'),
- IPF_Utils::prettySize($data['size']),
+ IPF_Utils::prettySize($data->getSize()),
IPF_Utils::prettySize($this->max_size)));
}
- $name = IPF_Utils::cleanFileName($data['name'], $this->getAbsolutePath(''));
+ $name = IPF_Utils::cleanFileName($data->getClientFilename(), $this->getAbsolutePath(''));
$dest = $this->getAbsolutePath($name);
- if (!move_uploaded_file($data['tmp_name'], $dest))
- throw new IPF_Exception_Form(__('An error occured when upload the file. Please try to send the file again.'));
+ $data->moveTo($dest);
@chmod($dest, $this->file_permission);
return $this->getRelativePath($name);
}
<?php
-use \PFF\HtmlBuilder\Tag as Tag;
+use PFF\HtmlBuilder\Tag as Tag;
class IPF_Form_Widget_FileInput extends IPF_Form_Widget_Input
{
$value = $data[$name];
- if (isset($value['file']) && isset($value['file']['error']) && $value['file']['error'] === UPLOAD_ERR_NO_FILE)
+ if (isset($value['file']) && $value['file']->getError() === UPLOAD_ERR_NO_FILE)
unset($value['file']);
if (!isset($value['file']) && !isset($value['name']))
+++ /dev/null
-<?php
-
-class IPF_HTTP_Request
-{
- public $POST = array();
- public $GET = array();
- public $REQUEST = array();
- public $COOKIE = array();
- public $FILES = array();
- public $query = '';
- public $method = '';
- public $uri = '';
- public $view = '';
- public $remote_addr = '';
- public $http_host = '';
- public $SERVER = array();
- public $is_secure = false;
- public $path_info;
-
- public function __construct()
- {
- $this->POST = $_POST;
- $this->GET = $_GET;
- $this->REQUEST = $_REQUEST;
- $this->COOKIE = $_COOKIE;
- $this->FILES = self::saneFiles($_FILES);
- $this->method = $_SERVER['REQUEST_METHOD'];
- $this->uri = $_SERVER['REQUEST_URI'];
- $this->remote_addr = $_SERVER['REMOTE_ADDR'];
- $this->http_host = $_SERVER['HTTP_HOST'];
-
- if (isset($_SERVER['REQUEST_URI'])) {
- $uri = $_SERVER['REQUEST_URI'];
- $pq = strpos($uri,'?');
- if ($pq !== false)
- $uri = substr($uri, 0, $pq);
- $this->query = preg_replace('#^(//+)#', '/', '/'.$uri);
- } else {
- $this->query = '/';
- }
-
- if (isset($_SERVER['PATH_INFO']))
- $this->path_info = $_SERVER['PATH_INFO'];
- else
- $this->path_info = '/';
-
- $this->SERVER = $_SERVER;
- $this->is_secure = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
- }
-
- public function absoluteUrl()
- {
- return ($this->is_secure ? 'https://' : 'http://') . $this->http_host . $this->query;
- }
-
- public function getHeaders()
- {
- if (function_exists('getallheaders'))
- return getallheaders();
- else
- return false;
- }
-
- public function getBody()
- {
- return file_get_contents('php://input');
- }
-
- public function getFormData()
- {
- return array_merge_recursive($this->POST, $this->FILES);
- }
-
- public static function saneFiles($files)
- {
- $result = array();
- foreach ($files as $prefix => $v) {
- foreach ($v as $key => $array) {
- array_walk_recursive($array, function(&$v, $i) use($key) {
- $v = array($key => $v);
- });
- $result = self::deepMerge($result, array($prefix => $array));
- }
- }
- return $result;
- }
-
- private static function deepMerge($into, $arr)
- {
- foreach ($arr as $key => $value) {
- if (array_key_exists($key, $into) && is_array($into[$key]) && is_array($value)) {
- $into[$key] = self::deepMerge($into[$key], $value);
- } else {
- $into[$key] = $value;
- }
- }
- return $into;
- }
-}
-
<?php
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Stream;
+use Pimple\Container;
+use Psr\Http\Message\ServerRequestInterface;
+
class IPF_HTTP_Response
{
- public $short_session = false;
- public $content = '';
- public $headers = array();
- public $status_code = 200;
- public $cookies = array();
- public $status_code_list = array(
- '100' => 'CONTINUE',
- '101' => 'SWITCHING PROTOCOLS',
- '200' => 'OK',
- '201' => 'CREATED',
- '202' => 'ACCEPTED',
- '203' => 'NON-AUTHORITATIVE INFORMATION',
- '204' => 'NO CONTENT',
- '205' => 'RESET CONTENT',
- '206' => 'PARTIAL CONTENT',
- '300' => 'MULTIPLE CHOICES',
- '301' => 'MOVED PERMANENTLY',
- '302' => 'FOUND',
- '303' => 'SEE OTHER',
- '304' => 'NOT MODIFIED',
- '305' => 'USE PROXY',
- '306' => 'RESERVED',
- '307' => 'TEMPORARY REDIRECT',
- '400' => 'BAD REQUEST',
- '401' => 'UNAUTHORIZED',
- '402' => 'PAYMENT REQUIRED',
- '403' => 'FORBIDDEN',
- '404' => 'NOT FOUND',
- '405' => 'METHOD NOT ALLOWED',
- '406' => 'NOT ACCEPTABLE',
- '407' => 'PROXY AUTHENTICATION REQUIRED',
- '408' => 'REQUEST TIMEOUT',
- '409' => 'CONFLICT',
- '410' => 'GONE',
- '411' => 'LENGTH REQUIRED',
- '412' => 'PRECONDITION FAILED',
- '413' => 'REQUEST ENTITY TOO LARGE',
- '414' => 'REQUEST-URI TOO LONG',
- '415' => 'UNSUPPORTED MEDIA TYPE',
- '416' => 'REQUESTED RANGE NOT SATISFIABLE',
- '417' => 'EXPECTATION FAILED',
- '500' => 'INTERNAL SERVER ERROR',
- '501' => 'NOT IMPLEMENTED',
- '502' => 'BAD GATEWAY',
- '503' => 'SERVICE UNAVAILABLE',
- '504' => 'GATEWAY TIMEOUT',
- '505' => 'HTTP VERSION NOT SUPPORTED',
- );
+ public static function ok($content, $contentType = 'text/html; charset=utf-8')
+ {
+ return new Response(200, ['Content-Type' => $contentType], $content);
+ }
- function __construct($content='', $mimetype='text/html; charset=utf-8')
+ public static function notFound(Container $container, ServerRequestInterface $request)
{
- $this->content = $content;
- $this->headers['Content-Type'] = $mimetype;
- $this->status_code = 200;
- $this->cookies = array();
+ $render404 = $container['render404'];
+ $content = call_user_func($render404, $request);
+ return new Response(404, [], $content);
}
- function render($output_body=true)
+ public static function redirect($url)
{
- if ($this->status_code >= 200
- && $this->status_code != 204
- && $this->status_code != 304
- && !\PFF\Arr::get($this->headers, 'Content-Length')) {
+ return new Response(
+ 302,
+ ['Location' => $url],
+ sprintf('<a href="%s">%s</a>', $url, __('Please, click here to be redirected.'))
+ );
+ }
- $this->headers['Content-Length'] = strlen($this->content);
- }
+ public static function json($data)
+ {
+ return new Response(200, ['Content-Type' => 'application/json'], json_encode($data));
+ }
- $this->outputHeaders();
- if ($output_body)
- $this->outputBody();
+ public static function noContent()
+ {
+ return new Response(204);
}
- function outputHeaders()
+ public static function file($filename, $mimetype = 'application/octet-stream')
{
- header('HTTP/1.1 '.$this->status_code.' '
- .$this->status_code_list[$this->status_code],
- true, $this->status_code);
- foreach ($this->headers as $header => $ch) {
- header($header.': '.$ch);
- }
- foreach ($this->cookies as $cookie => $data) {
- setcookie($cookie, $data, time() + 31536000, '/', null, false, true);
- }
+ return (new Response())
+ ->withHeader('Content-Type', $mimetype)
+ ->withHeader('Content-Transfer-Encoding', 'binary')
+ ->withHeader('Content-Length', filesize($filename))
+ ->withBody(new Stream($filename));
}
- function outputBody()
+ public static function download($filename, $downloadName, $mimetype = 'application/octet-stream')
{
- echo $this->content;
+ return self::file($filename, $mimetype)
+ ->withHeader('Content-Description', 'File Transfer')
+ ->withHeader('Content-Disposition', 'attachment; filename=' . basename($downloadName));
}
}
+++ /dev/null
-<?php
-
-class IPF_HTTP_Response_File extends IPF_HTTP_Response
-{
- private $filename;
-
- function __construct($filename, $downloadName=null, $mimetype='application/octet-stream')
- {
- parent::__construct('', $mimetype);
- $this->filename = $filename;
- if ($downloadName) {
- $this->headers['Content-Description'] = 'File Transfer';
- $this->headers['Content-Disposition'] = 'attachment; filename='.basename($downloadName);
- }
- $this->headers['Content-Transfer-Encoding'] = 'binary';
- $this->headers['Content-Length'] = filesize($filename);
- }
-
- function outputBody()
- {
- if (ob_get_level())
- ob_end_clean();
- readfile($this->filename);
- }
-}
-
+++ /dev/null
-<?php
-
-class IPF_HTTP_Response_Json extends IPF_HTTP_Response
-{
- function __construct($content)
- {
- parent::__construct(json_encode($content),'application/json');
- }
-}
+++ /dev/null
-<?php
-
-use Pimple\Container;
-
-class IPF_HTTP_Response_NotFound extends IPF_HTTP_Response
-{
- function __construct(Container $container, IPF_HTTP_Request $request)
- {
- $render404 = $container['render404'];
- $content = call_user_func($render404, $request);
-
- parent::__construct($content);
- $this->status_code = 404;
- }
-}
+++ /dev/null
-<?php
-
-class IPF_HTTP_Response_Redirect extends IPF_HTTP_Response
-{
- function __construct($url)
- {
- $content = sprintf('<a href="%s">%s</a>', $url, __('Please, click here to be redirected.'));
- parent::__construct($content);
- $this->headers['Location'] = $url;
- $this->status_code = 302;
- }
-}
<?php
use Pimple\Container;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
-class IPF_Middleware
+abstract class IPF_Middleware
{
- /** @var IPF_Middleware */
+ /** @var IPF_Middleware|null */
protected $next;
/** @var Container */
$this->container = $container;
}
- function processRequest($request)
- {
- return false;
- }
-
- function processResponse($request, $response)
- {
- return $response;
- }
-
- function call($request)
- {
- $response = $this->processRequest($request);
- if ($response !== false) {
- return $response;
- }
-
- if ($this->next) {
- $response = $this->next->call($request);
- }
-
- return $this->processResponse($request, $response);
- }
+ /**
+ * @param ServerRequestInterface $request
+ * @return ResponseInterface
+ */
+ public abstract function call(ServerRequestInterface $request);
}
<?php
+use Psr\Http\Message\ServerRequestInterface;
+
class IPF_Middleware_Common extends IPF_Middleware
{
- function processRequest($request)
+ function call(ServerRequestInterface $request)
{
if ($this->container['settings']->get('append_slash', true)) {
- $url = $request->absoluteUrl();
- if (substr($url, -1) !== '/') {
- return new IPF_HTTP_Response_Redirect($url.'/');
+ $uri = $request->getUri();
+ $path = $uri->getPath();
+ $query = $uri->getQuery();
+ if (substr($path, -1) !== '/') {
+ if ($path == '') {
+ $target = '/';
+ } else {
+ $target = $path . '/';
+ }
+ if ($query != '') {
+ $target .= '?' . $query;
+ }
+ return IPF_HTTP_Response::redirect($target);
}
}
- return false;
+
+ return $this->next->call($request);
}
}
<?php
+use Psr\Http\Message\ServerRequestInterface;
+
class IPF_Dispatch_Middleware extends IPF_Middleware
{
- function processRequest($request)
+ function call(ServerRequestInterface $request)
{
$m = $this->getRouter()->match($request);
if (!$m) {
- return new IPF_HTTP_Response_NotFound($this->container, $request);
+ return IPF_HTTP_Response::notFound($this->container, $request);
}
list($route, $match) = $m;
- $request->params = $match;
+ $request = $request->withAttribute('params', $match);
try {
$controllerClass = $route->controller();
<?php
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
class IPF_Error_Middleware extends IPF_Middleware
{
private $previous_error_handler;
- function call($request)
+ function call(ServerRequestInterface $request)
{
$this->previous_error_handler = set_error_handler(array($this, 'error_handler'));
register_shutdown_function(array($this, 'shutdown_handler'), $request);
$response = $this->next->call($request);
- if (!($response instanceof IPF_HTTP_Response))
- throw new \Exception('Response is not a IPF_HTTP_Response');
+ if (!($response instanceof ResponseInterface))
+ throw new \Exception('Response is not a ResponseInterface');
} catch (\Exception $exception) {
error_log($exception);
$response = $this->getServerErrorResponse($request, $exception);
error_log($exception);
if (!headers_sent()) {
$response = $this->getServerErrorResponse($request, $exception);
- $response->render();
+ \Http\Response\send($response);
}
}
}
/**
- * @param IPF_HTTP_Request $request
+ * @param ServerRequestInterface $request
* @param Exception $exception
- * @return IPF_HTTP_Response
+ * @return ResponseInterface
*/
- private function getServerErrorResponse(IPF_HTTP_Request $request, Exception $exception)
+ private function getServerErrorResponse(ServerRequestInterface $request, Exception $exception)
{
$render500 = $this->container['render500'];
$content = call_user_func($render500, $request, $exception);
-
- $response = new IPF_HTTP_Response($content, null);
- $response->status_code = 500;
- return $response;
+ return new Response(500, [], $content);
}
}
<?php
+use Psr\Http\Message\ServerRequestInterface;
+
class IPF_Serve_Static_Middleware extends IPF_Middleware
{
- function processRequest($request)
+ function call(ServerRequestInterface $request)
{
$staticUrl = $this->getStaticUrl();
- if (!preg_match('#^'.preg_quote($staticUrl).'(.*)$#', $request->query, $matches))
- return false;
-
- $query = $matches[1];
+ if (preg_match('#^' . preg_quote($staticUrl) . '(.*)$#', $request->getRequestTarget(), $matches)) {
+ $query = $matches[1];
- foreach ($this->getApps() as $app) {
- $static = $app->getPath() . $staticUrl . $query;
- if (is_file($static))
- return new IPF_HTTP_Response_File($static, null, $this->mimetype($query));
+ foreach ($this->getApps() as $app) {
+ $static = $app->getPath() . $staticUrl . $query;
+ if (is_file($static))
+ return IPF_HTTP_Response::file($static, $this->mimetype($query));
+ }
}
- return false;
+ return $this->next->call($request);
}
private function mimetype($filename)
<?php
use IPF\Router\Expression;
+use Psr\Http\Message\ServerRequestInterface;
class IPF_Router
{
}
}
- public function match($req)
+ public function match(ServerRequestInterface $req)
{
foreach ($this->routes as $route) {
$match = array();
- if (!$route->matcher()->match($req->query, $match))
+ if (!$route->matcher()->match($req->getUri()->getPath(), $match))
continue;
$methods = $route->methods();
- if ($methods && !in_array($req->method, $methods)) {
+ if ($methods && !in_array($req->getMethod(), $methods)) {
continue;
}
{
public function response($container, $request)
{
- return new IPF_HTTP_Response_NotFound($container, $request);
+ return IPF_HTTP_Response::notFound($container, $request);
}
}
<?php
+use Dflydev\FigCookies\SetCookie;
+use Dflydev\FigCookies\SetCookies;
+use Psr\Http\Message\ServerRequestInterface;
+
class IPF_Session_Middleware extends IPF_Middleware
{
- function processRequest($request)
+ function call(ServerRequestInterface $request)
{
- $session_cookie = \PFF\Arr::get($request->COOKIE, $this->getSessionCookieName());
- $request->session = $this->getSessionApp()->getSession($session_cookie);
- return false;
- }
+ $session_cookie = \PFF\Arr::get($request->getCookieParams(), $this->getSessionCookieName());
+ $session = $this->getSessionApp()->getSession($session_cookie);
- function processResponse($request, $response)
- {
- $session_cookie = $request->session->cookie();
- $response->cookies[$this->getSessionCookieName()] = $session_cookie;
- return $response;
+ $response = $this->next->call(
+ $request->withAttribute('session', $session)
+ );
+
+ $setCookie = SetCookie::create($this->getSessionCookieName(), $session->cookie())
+ ->withPath('/')
+ ->withHttpOnly(true)
+ ->withExpires(time() + 31536000);
+
+ return SetCookies::fromResponse($response)
+ ->with($setCookie)
+ ->renderIntoSetCookieHeader($response);
}
/**
use IPF_Settings;
use Pimple\Container;
use Pimple\ServiceProviderInterface;
+use Psr\Http\Message\ServerRequestInterface;
use Twig\Environment;
use Twig\Loader\FilesystemLoader;
use Twig\Loader\LoaderInterface;
$twig->addGlobal('UPLOAD_URL', $this->settings->get('upload_url'));
}
- private function addRequestGlobals(Environment $twig, $request)
+ private function addRequestGlobals(Environment $twig, ServerRequestInterface $request)
{
if (!$request)
return;
$twig->addGlobal('request', $request);
- $twig->addGlobal('user', $request->user);
- $twig->addGlobal('CURRENT_URL', $request->query);
+ $twig->addGlobal('user', $request->getAttribute('user'));
+ $twig->addGlobal('CURRENT_URL', $request->getUri()->getPath());
foreach ($this->processors as $proc) {
$context = call_user_func_array($proc, array($request));
projects / ipf.git / commitdiff