diff options
| -rw-r--r-- | core/includes/bootstrap.inc | 14 | ||||
| -rw-r--r-- | core/includes/install.core.inc | 8 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/ContentNegotiation.php | 15 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/Database/Connection.php | 7 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/DrupalKernel.php | 20 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php | 7 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php | 2 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php | 12 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php | 1 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php | 31 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php | 22 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/RouterListener.php | 5 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php | 25 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/ExceptionController.php | 57 | ||||
| -rw-r--r-- | core/lib/Drupal/Core/UrlMatcher.php | 21 | ||||
| -rw-r--r-- | index.php | 8 |
16 files changed, 117 insertions, 138 deletions
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 519ccad0475..f4ef7db5b8f 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -1537,15 +1537,17 @@ function request_uri($omit_query_string = FALSE) { } /** - * Returns the current global reuqest object. + * Returns the current global request object. * * @todo Replace this function with a proper dependency injection container. * - * @staticvar Request $request - * @param Request $new_request - * The new request object to store. If you are not index.php, you probably - * should not be using this parameter. - * @return Request + * @staticvar Symfony\Component\HttpFoundation\Request $request + * + * @param Symfony\Component\HttpFoundation\Request $new_request + * Optional. The new request object to store. This parameter should only be + * used by index.php. + * + * @return Symfony\Component\HttpFoundation\Request * The current request object. */ function request(Request $new_request = NULL) { diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index bce52fdfeb8..dea784bcef1 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -480,10 +480,10 @@ function install_run_task($task, &$install_state) { include_once DRUPAL_ROOT . '/core/includes/batch.inc'; $output = _batch_page(); // Because Batch API now returns a JSON response for intermediary steps, - // but the installer doesn't handle Response objects yet, we will just - // send the output here and emulate the old model. - // @todo: Replace this when we refactor the installer to use a - // Request/Response workflow. + // but the installer doesn't handle Response objects yet, just send the + // output here and emulate the old model. + // @todo Replace this when we refactor the installer to use a request- + // response workflow. if ($output instanceof Response) { $output->send(); $output = NULL; diff --git a/core/lib/Drupal/Core/ContentNegotiation.php b/core/lib/Drupal/Core/ContentNegotiation.php index b87b33c56d7..6302db86826 100644 --- a/core/lib/Drupal/Core/ContentNegotiation.php +++ b/core/lib/Drupal/Core/ContentNegotiation.php @@ -13,21 +13,24 @@ use Symfony\Component\HttpFoundation\Request; * This class is a central library for content type negotiation. * * @todo Replace this class with a real content negotiation library based on - * mod_negotiation. Development of that is a work in progress. + * mod_negotiation. Development of that is a work in progress. */ class ContentNegotiation { /** - * Returns the normalized type of a given request. + * Gets the normalized type of a request. * * The normalized type is a short, lowercase version of the format, such as - * "html" or "json" or "atom". + * 'html', 'json' or 'atom'. * - * @param Request $request + * @param Symfony\Component\HttpFoundation\Request $request * The request object from which to extract the content type. + * + * @return + * The normalized type of a given request. */ public function getContentType(Request $request) { - // AJAX iframe uploads need special handling, because they contain a json + // AJAX iframe uploads need special handling, because they contain a JSON // response wrapped in <textarea>. if ($request->get('ajax_iframe_upload', FALSE)) { return 'iframeupload'; @@ -48,6 +51,4 @@ class ContentNegotiation { // Do HTML last so that it always wins. return 'html'; } - } - diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php index 2c215e7b35b..dbf7c368fc2 100644 --- a/core/lib/Drupal/Core/Database/Connection.php +++ b/core/lib/Drupal/Core/Database/Connection.php @@ -524,10 +524,9 @@ abstract class Connection extends PDO { } catch (PDOException $e) { if ($options['throw_exception']) { - // Wrap the exception in another exception. Its message is the extra - // database debug information. We have to do it this way because PHP - // does not allow us to override Exception::getMessage(). - + // Wrap the exception in another exception, because PHP does not allow + // overriding Exception::getMessage(). Its message is the extra database + // debug information. $query_string = ($query instanceof DatabaseStatementInterface) ? $stmt->getQueryString() : $query; $message = $e->getMessage() . ": " . $query_string . "; " . print_r($args, TRUE); $exception = new DatabaseExceptionWrapper($message, 0, $e); diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 79448e33ee5..dc6762b5252 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -2,7 +2,6 @@ /** * @file - * * Definition of Drupal\Core\DrupalKernel. */ @@ -17,7 +16,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; -//use Symfony\Component\HttpKernel\EventListener\RouterListener; use Symfony\Component\HttpKernel\EventListener\ExceptionListener; use Drupal\Core\EventSubscriber\ViewSubscriber; use Drupal\Core\EventSubscriber\AccessSubscriber; @@ -39,25 +37,25 @@ class DrupalKernel extends HttpKernel { /** * The event dispatcher used by this kernel. * - * @var EventDispatcherInterface + * @var Symfony\Component\EventDispatcher\EventDispatcherInterface */ protected $dispatcher; /** * The controller resolver that will extract the controller from a Request. * - * @var ControllerResolverInterface + * @var Symfony\Component\HttpKernel\Controller\ControllerResolverInterface */ protected $resolver; /** - * Constructor + * Constructor. * - * @param EventDispatcherInterface $dispatcher - * An EventDispatcherInterface instance - * @param ControllerResolverInterface $resolver - * A ControllerResolverInterface instance + * @param Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher + * An EventDispatcherInterface instance. + * @param Symfony\Component\HttpKernel\Controller\ControllerResolverInterface $resolver + * A ControllerResolverInterface instance. */ public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver) { parent::__construct($dispatcher, $resolver); @@ -71,7 +69,7 @@ class DrupalKernel extends HttpKernel { // @todo Make this extensible rather than just hard coding some. // @todo Add a subscriber to handle other things, too, like our Ajax - // replacement system. + // replacement system. $this->dispatcher->addSubscriber(new ViewSubscriber($negotiation)); $this->dispatcher->addSubscriber(new AccessSubscriber()); $this->dispatcher->addSubscriber(new MaintenanceModeSubscriber()); @@ -82,7 +80,7 @@ class DrupalKernel extends HttpKernel { $this->dispatcher->addSubscriber(new RequestCloseSubscriber()); // Some other form of error occured that wasn't handled by another kernel - // listener. That could mean that it's a method/mime-type/error + // listener. That could mean that it's a method/mime-type/error // combination that is not accounted for, or some other type of error. // Either way, treat it as a server-level error and return an HTTP 500. // By default, this will be an HTML-type response because that's a decent diff --git a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php index 04eac0ab8b3..683f1fb829a 100644 --- a/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/AccessSubscriber.php @@ -13,8 +13,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * @file - * - * Definition of Drupal\Core\EventSubscriber\AccessSubscriber + * Definition of Drupal\Core\EventSubscriber\AccessSubscriber. */ /** @@ -26,9 +25,9 @@ class AccessSubscriber implements EventSubscriberInterface { * Verifies that the current user can access the requested path. * * @todo This is a total hack to keep our current access system working. It - * should be replaced with something robust and injected at some point. + * should be replaced with something robust and injected at some point. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestAccessCheck(GetResponseEvent $event) { diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php index 35da47cb9b2..0061fa61493 100644 --- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php @@ -19,7 +19,7 @@ class FinishResponseSubscriber implements EventSubscriberInterface { /** * Sets extra headers on successful responses. * - * @param FilterResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\FilterResponseEvent $event * The event to process. */ public function onRespond(FilterResponseEvent $event) { diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php index 2befe920620..daed1c90b5b 100644 --- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php @@ -1,5 +1,10 @@ <?php +/** + * @file + * Definition of Drupal\Core\EventSubscriber\MaintenanceModeSubscriber. + */ + namespace Drupal\Core\EventSubscriber; use Symfony\Component\HttpFoundation\Response; @@ -8,11 +13,6 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** - * @file - * Definition of Drupal\Core\EventSubscriber\MaintenanceModeSubscriber. - */ - -/** * Maintenance mode subscriber for controller requests. */ class MaintenanceModeSubscriber implements EventSubscriberInterface { @@ -20,7 +20,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface { /** * Response with the maintenance page when the site is offline. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestMaintenanceModeCheck(GetResponseEvent $event) { diff --git a/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php b/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php index 83ed9cbf40b..8f29b4dd591 100644 --- a/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php +++ b/core/lib/Drupal/Core/EventSubscriber/PathListenerBase.php @@ -27,5 +27,4 @@ abstract class PathListenerBase { // object directly. _current_path($path); } - } diff --git a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php index 1192c4a676f..1e2a95a34bc 100644 --- a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php @@ -2,8 +2,7 @@ /** * @file - * - * Definition of Drupal\Core\EventSubscriber\PathSubscriber + * Definition of Drupal\Core\EventSubscriber\PathSubscriber. */ namespace Drupal\Core\EventSubscriber; @@ -21,14 +20,13 @@ class PathSubscriber extends PathListenerBase implements EventSubscriberInterfac /** * Resolve the system path. * - * @todo The path system should be objectified to remove the function calls - * in this method. + * @todo The path system should be objectified to remove the function calls in + * this method. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestPathResolve(GetResponseEvent $event) { - $request = $event->getRequest(); $path = $this->extractPath($request); @@ -41,10 +39,10 @@ class PathSubscriber extends PathListenerBase implements EventSubscriberInterfac /** * Resolve the front-page default path. * - * @todo The path system should be objectified to remove the function calls - * in this method. + * @todo The path system should be objectified to remove the function calls in + * this method. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestFrontPageResolve(GetResponseEvent $event) { @@ -63,10 +61,9 @@ class PathSubscriber extends PathListenerBase implements EventSubscriberInterfac * Decode language information embedded in the request path. * * @todo Refactor this entire method to inline the relevant portions of - * drupal_language_initialize(). See the inline comment for more - * details. + * drupal_language_initialize(). See the inline comment for more details. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestLanguageResolve(GetResponseEvent $event) { @@ -93,15 +90,15 @@ class PathSubscriber extends PathListenerBase implements EventSubscriberInterfac * * Parameters in the URL sometimes represent code-meaningful strings. It is * therefore useful to always urldecode() those values so that individual - * controllers need not concern themselves with it. This is Drupal-specific - * logic, and may not be familiar for developers used to other Symfony-family + * controllers need not concern themselves with it. This is Drupal-specific + * logic and may not be familiar for developers used to other Symfony-family * projects. * * @todo Revisit whether or not this logic is appropriate for here or if - * controllers should be required to implement this logic themselves. If - * we decide to keep this code, remove this TODO. + * controllers should be required to implement this logic themselves. If we + * decide to keep this code, remove this TODO. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onKernelRequestDecodePath(GetResponseEvent $event) { diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php index a6f9ad8a97e..8b156d4f704 100644 --- a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php @@ -1,18 +1,16 @@ <?php +/** + * @file + * Definition of Drupal\Core\EventSubscriber\RequestCloseSubscriber. + */ + namespace Drupal\Core\EventSubscriber; use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Event\PostResponseEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -/** - * @file - * - * Definition of Drupal\Core\EventSubscriber\RequestCloseSubscriber; - */ - /** * Subscriber for all responses. */ @@ -22,16 +20,16 @@ class RequestCloseSubscriber implements EventSubscriberInterface { * Performs end of request tasks. * * @todo The body of this function has just been copied almost verbatim from - * drupal_page_footer(), with the exception of now passing the response - * content to drupal_page_set_cache(). There's probably a lot in here that - * needs to get removed/changed. + * drupal_page_footer(), with the exception of now passing the response + * content to drupal_page_set_cache(). There's probably a lot in here that + * needs to get removed/changed. * - * @param PostResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\PostResponseEvent $event * The Event to process. */ public function onTerminate(PostResponseEvent $event) { - global $user; + module_invoke_all('exit'); // Commit the user session, if needed. diff --git a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php index 519708469ed..f1a96f74fd6 100644 --- a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php +++ b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php @@ -2,7 +2,6 @@ /** * @file - * * Definition of Drupal\Core\EventSubscriber\RouterListener; */ @@ -17,7 +16,6 @@ use Symfony\Component\Routing\Matcher\UrlMatcherInterface; use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\MethodNotFoundException; - /** * Drupal-specific Router listener. * @@ -40,7 +38,7 @@ class RouterListener extends SymfonyRouterListener { * This method is nearly identical to the parent, except it passes the * $request->attributes->get('system_path') variable to the matcher. * That is where Drupal stores its processed, de-aliased, and sanitized - * internal path. We also pass the full request object to the URL Matcher, + * internal path. We also pass the full request object to the URL Matcher, * since we want attributes to be available to the matcher and to controllers. */ public function onKernelRequest(GetResponseEvent $event) { @@ -80,5 +78,4 @@ class RouterListener extends SymfonyRouterListener { throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e); } } - } diff --git a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php index 647b641829a..4761d47f763 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php @@ -1,5 +1,10 @@ <?php +/** + * @file + * Definition of Drupal\Core\EventSubscriber\ViewSubscriber. + */ + namespace Drupal\Core\EventSubscriber; use Symfony\Component\HttpFoundation\Response; @@ -15,12 +20,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Drupal\Core\ContentNegotiation; /** - * @file - * - * Definition of Drupal\Core\EventSubscriber\ViewSubscriber; - */ - -/** * Main subscriber for VIEW HTTP responses. */ class ViewSubscriber implements EventSubscriberInterface { @@ -40,7 +39,7 @@ class ViewSubscriber implements EventSubscriberInterface { * from an JSON-type response is a JSON string, so just wrap it into a * Response object. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onView(GetResponseEvent $event) { @@ -60,8 +59,6 @@ class ViewSubscriber implements EventSubscriberInterface { public function onJson(GetResponseEvent $event) { $page_callback_result = $event->getControllerResult(); - //print_r($page_callback_result); - $response = new JsonResponse(); $response->setContent($page_callback_result); @@ -104,12 +101,12 @@ class ViewSubscriber implements EventSubscriberInterface { * Processes a successful controller into an HTTP 200 response. * * Some controllers may not return a response object but simply the body of - * one. The VIEW event is called in that case, to allow us to mutate that - * body into a Response object. In particular we assume that the return - * from an HTML-type response is a render array from a legacy page callback - * and render it. + * one. The VIEW event is called in that case, to allow us to mutate that + * body into a Response object. In particular we assume that the return from + * an HTML-type response is a render array from a legacy page callback and + * render it. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function onHtml(GetResponseEvent $event) { diff --git a/core/lib/Drupal/Core/ExceptionController.php b/core/lib/Drupal/Core/ExceptionController.php index 829413b76ee..d5a97abf3a6 100644 --- a/core/lib/Drupal/Core/ExceptionController.php +++ b/core/lib/Drupal/Core/ExceptionController.php @@ -2,7 +2,6 @@ /** * @file - * * Definition of Drupal\Core\ExceptionController. */ @@ -29,24 +28,24 @@ class ExceptionController { * * We will use this to fire subrequests as needed. * - * @var HttpKernelInterface + * @var Symfony\Component\HttpKernel\HttpKernelInterface */ protected $kernel; /** - * The + * The content negotiation library. * - * @var ContentNegotiation + * @var Drupal\Core\ContentNegotiation */ protected $negotiation; /** - * Constructor + * Constructor. * - * @param HttpKernelInterface $kernel + * @param Symfony\Component\HttpKernel\HttpKernelInterface $kernel * The kernel that spawned this controller, so that it can be reused * for subrequests. - * @param ContentNegotiation $negotiation + * @param Drupal\Core\ContentNegotiation $negotiation * The content negotiation library to use to determine the correct response * format. */ @@ -58,15 +57,15 @@ class ExceptionController { /** * Handles an exception on a request. * - * @param FlattenException $exception + * @param Symfony\Component\HttpKernel\Exception\FlattenException $exception * The flattened exception. - * @param Request $request + * @param Symfony\Component\HttpFoundation\Request $request * The request that generated the exception. - * @return \Symfony\Component\HttpFoundation\Response + * + * @return Symfony\Component\HttpFoundation\Response * A response object to be sent to the server. */ public function execute(FlattenException $exception, Request $request) { - $method = 'on' . $exception->getStatusCode() . $this->negotiation->getContentType($request); if (method_exists($this, $method)) { @@ -74,13 +73,12 @@ class ExceptionController { } return new Response('A fatal error occurred: ' . $exception->getMessage(), $exception->getStatusCode()); - } /** * Processes a MethodNotAllowed exception into an HTTP 405 response. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function on405Html(FlattenException $exception, Request $request) { @@ -90,7 +88,7 @@ class ExceptionController { /** * Processes an AccessDenied exception into an HTTP 403 response. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function on403Html(FlattenException $exception, Request $request) { @@ -130,7 +128,7 @@ class ExceptionController { * * @param FlattenException $exception * Metadata about the exception that was thrown. - * @param Request $request + * @param Symfony\Component\HttpFoundation\Request $request * The request object that triggered this exception. */ public function on500Html(FlattenException $exception, Request $request) { @@ -179,24 +177,21 @@ class ExceptionController { } drupal_set_title(t('Error')); - // We fallback to a maintenance page at this point, because the page generation - // itself can generate errors. + // We fallback to a maintenance page at this point, because the page + // generation itself can generate errors. $output = theme('maintenance_page', array('content' => t('The website encountered an unexpected error. Please try again later.'))); $response = new Response($output, 500); $response->setStatusCode(500, '500 Service unavailable (with message)'); return $response; - - - //return _drupal_log_error(_drupal_decode_exception($exception), TRUE); } /** * This method is a temporary port of _drupal_decode_exception(). * - * @todo This should get refactored. Flatten Exception could use some - * improvement as well. + * @todo This should get refactored. FlattenException could use some + * improvement as well. * * @return array */ @@ -257,7 +252,6 @@ class ExceptionController { * An associative array with keys 'file', 'line' and 'function'. */ protected function getLastCaller($backtrace) { - // Ignore black listed error handling functions. $blacklist = array('debug', '_drupal_error_handler', '_drupal_exception_handler'); @@ -290,7 +284,7 @@ class ExceptionController { /** * Processes a NotFound exception into an HTTP 403 response. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function on404Html(FlattenException $exception, Request $request) { @@ -309,10 +303,10 @@ class ExceptionController { $path = drupal_get_normal_path(variable_get('site_404', '')); if ($path && $path != $system_path) { - // @todo: Um, how do I specify an override URL again? Totally not clear. - // Do that and sub-call the kernel rather than using meah(). - // @todo: The create() method expects a slash-prefixed path, but we - // store a normal system path in the site_404 variable. + // @todo Um, how do I specify an override URL again? Totally not clear. Do + // that and sub-call the kernel rather than using meah(). + // @todo The create() method expects a slash-prefixed path, but we store a + // normal system path in the site_404 variable. $subrequest = Request::create('/' . $path, 'get', array(), $request->cookies->all(), array(), $request->server->all()); $response = $this->kernel->handle($subrequest, HttpKernelInterface::SUB_REQUEST); @@ -337,7 +331,7 @@ class ExceptionController { /** * Processes an AccessDenied exception into an HTTP 403 response. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function on403Json(FlattenException $exception, Request $request) { @@ -349,7 +343,7 @@ class ExceptionController { /** * Processes a NotFound exception into an HTTP 404 response. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function on404Json(FlattenException $exception, Request $request) { @@ -361,7 +355,7 @@ class ExceptionController { /** * Processes a MethodNotAllowed exception into an HTTP 405 response. * - * @param GetResponseEvent $event + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The Event to process. */ public function on405Json(FlattenException $exception, Request $request) { @@ -369,5 +363,4 @@ class ExceptionController { $response->setStatusCode(405, 'Method Not Allowed'); return $response; } - } diff --git a/core/lib/Drupal/Core/UrlMatcher.php b/core/lib/Drupal/Core/UrlMatcher.php index ca25b7d5eff..7d6e24cfc67 100644 --- a/core/lib/Drupal/Core/UrlMatcher.php +++ b/core/lib/Drupal/Core/UrlMatcher.php @@ -2,7 +2,6 @@ /** * @file - * * Definition of Drupal\Core\UrlMatcher. */ @@ -25,7 +24,7 @@ class UrlMatcher implements UrlMatcherInterface { /** * The request context for this matcher. * - * @var RequestContext + * @var Symfony\Component\Routing\RequestContext */ protected $context; @@ -49,8 +48,8 @@ class UrlMatcher implements UrlMatcherInterface { * The request context object does not contain the information we need, so * we will use the original request object. * - * @param RequestContext $context - * The context + * @param Symfony\Component\Routing\RequestContext $context + * The context. * * @api */ @@ -65,8 +64,8 @@ class UrlMatcher implements UrlMatcherInterface { * The request context object does not contain the information we need, so * we will use the original request object. * - * @return RequestContext - * The context + * @return Symfony\Component\Routing\RequestContext + * The context. */ public function getContext() { return $this->context; @@ -109,7 +108,7 @@ class UrlMatcher implements UrlMatcherInterface { * Get a drupal menu item. * * @todo Make this return multiple possible candidates for the resolver to - * consider. + * consider. * * @param string $path * The path being looked up by @@ -128,10 +127,10 @@ class UrlMatcher implements UrlMatcherInterface { ); // Place argument defaults on the route. - // @todo: For some reason drush test runs have a serialized page_arguments - // but HTTP requests are unserialized. Hack to get around this for now. - // This might be because page arguments aren't unserialized in - // menu_get_item() when the access is denied. + // @todo For some reason drush test runs have a serialized page_arguments + // but HTTP requests are unserialized. Hack to get around this for now. + // This might be because page arguments aren't unserialized in + // menu_get_item() when the access is denied. !is_array($router_item['page_arguments']) ? $page_arguments = unserialize($router_item['page_arguments']) : $page_arguments = $router_item['page_arguments']; foreach ($page_arguments as $k => $v) { $route[$k] = $v; diff --git a/index.php b/index.php index 244d4ae5ab4..8e2c882d791 100644 --- a/index.php +++ b/index.php @@ -24,12 +24,12 @@ define('DRUPAL_ROOT', getcwd()); require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); -// A request object from the HTTPFoundation to tell us about the request. +// Create a request object from the HTTPFoundation. $request = Request::createFromGlobals(); -// Set the global $request object. This is a temporary measure to -// keep legacy utility functions working. It should be moved to a dependency -// injection container at some point. +// Set the global $request object. This is a temporary measure to keep legacy +// utility functions working. It should be moved to a dependency injection +// container at some point. request($request); drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE); |