Mercurial > hg > isophonics-drupal-site
comparison core/lib/Drupal/Core/DrupalKernel.php @ 12:7a779792577d
Update Drupal core to v8.4.5 (via Composer)
author | Chris Cannam |
---|---|
date | Fri, 23 Feb 2018 15:52:07 +0000 |
parents | 4c8ae668cc8c |
children | 5fb285c0d0e3 |
comparison
equal
deleted
inserted
replaced
11:bfffd8d7479a | 12:7a779792577d |
---|---|
674 /** | 674 /** |
675 * Converts an exception into a response. | 675 * Converts an exception into a response. |
676 * | 676 * |
677 * @param \Exception $e | 677 * @param \Exception $e |
678 * An exception | 678 * An exception |
679 * @param Request $request | 679 * @param \Symfony\Component\HttpFoundation\Request $request |
680 * A Request instance | 680 * A Request instance |
681 * @param int $type | 681 * @param int $type |
682 * The type of the request (one of HttpKernelInterface::MASTER_REQUEST or | 682 * The type of the request (one of HttpKernelInterface::MASTER_REQUEST or |
683 * HttpKernelInterface::SUB_REQUEST) | 683 * HttpKernelInterface::SUB_REQUEST) |
684 * | 684 * |
685 * @return Response | 685 * @return \Symfony\Component\HttpFoundation\Response |
686 * A Response instance | 686 * A Response instance |
687 * | 687 * |
688 * @throws \Exception | 688 * @throws \Exception |
689 * If the passed in exception cannot be turned into a response. | 689 * If the passed in exception cannot be turned into a response. |
690 */ | 690 */ |
1185 } | 1185 } |
1186 | 1186 |
1187 /** | 1187 /** |
1188 * Attach synthetic values on to kernel. | 1188 * Attach synthetic values on to kernel. |
1189 * | 1189 * |
1190 * @param ContainerInterface $container | 1190 * @param \Symfony\Component\DependencyInjection\ContainerInterface $container |
1191 * Container object | 1191 * Container object |
1192 * | 1192 * |
1193 * @return ContainerInterface | 1193 * @return \Symfony\Component\DependencyInjection\ContainerInterface |
1194 */ | 1194 */ |
1195 protected function attachSynthetic(ContainerInterface $container) { | 1195 protected function attachSynthetic(ContainerInterface $container) { |
1196 $persist = []; | 1196 $persist = []; |
1197 if (isset($this->container)) { | 1197 if (isset($this->container)) { |
1198 $persist = $this->getServicesToPersist($this->container); | 1198 $persist = $this->getServicesToPersist($this->container); |
1211 } | 1211 } |
1212 | 1212 |
1213 /** | 1213 /** |
1214 * Compiles a new service container. | 1214 * Compiles a new service container. |
1215 * | 1215 * |
1216 * @return ContainerBuilder The compiled service container | 1216 * @return \Drupal\Core\DependencyInjection\ContainerBuilder The compiled service container |
1217 */ | 1217 */ |
1218 protected function compileContainer() { | 1218 protected function compileContainer() { |
1219 // We are forcing a container build so it is reasonable to assume that the | 1219 // We are forcing a container build so it is reasonable to assume that the |
1220 // calling method knows something about the system has changed requiring the | 1220 // calling method knows something about the system has changed requiring the |
1221 // container to be dumped to the filesystem. | 1221 // container to be dumped to the filesystem. |
1332 } | 1332 } |
1333 | 1333 |
1334 /** | 1334 /** |
1335 * Gets a new ContainerBuilder instance used to build the service container. | 1335 * Gets a new ContainerBuilder instance used to build the service container. |
1336 * | 1336 * |
1337 * @return ContainerBuilder | 1337 * @return \Drupal\Core\DependencyInjection\ContainerBuilder |
1338 */ | 1338 */ |
1339 protected function getContainerBuilder() { | 1339 protected function getContainerBuilder() { |
1340 return new ContainerBuilder(new ParameterBag($this->getKernelParameters())); | 1340 return new ContainerBuilder(new ParameterBag($this->getKernelParameters())); |
1341 } | 1341 } |
1342 | 1342 |