diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php index 84de1291e1..652198d488 100644 --- a/src/Symfony/Component/HttpKernel/Config/FileLocator.php +++ b/src/Symfony/Component/HttpKernel/Config/FileLocator.php @@ -21,7 +21,7 @@ use Symfony\Component\HttpKernel\KernelInterface; */ class FileLocator extends BaseFileLocator { - protected $kernel; + private $kernel; /** * Constructor. diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index 9f3137a08a..c4ddddbdcf 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\Request; */ class ControllerResolver implements ControllerResolverInterface { - protected $logger; + private $logger; /** * Constructor. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index 2eff83f6f5..37e93b0528 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -24,7 +24,7 @@ use Symfony\Component\HttpFoundation\Response; */ class ConfigDataCollector extends DataCollector { - protected $kernel; + private $kernel; /** * Constructor. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php index 5b5d762213..66f7bf8358 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php @@ -23,7 +23,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; */ class EventDataCollector extends DataCollector { - protected $dispatcher; + private $dispatcher; public function setEventDispatcher(EventDispatcherInterface $dispatcher) { diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php index df6c234697..0f3924bcb0 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php @@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Response; */ class LoggerDataCollector extends DataCollector { - protected $logger; + private $logger; public function __construct($logger = null) { diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index 6dbdaacefe..c3f1703432 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -122,7 +122,7 @@ class RequestDataCollector extends DataCollector return 'request'; } - protected function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly) + private function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly) { $cookie = sprintf('%s=%s', $name, urlencode($value)); diff --git a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php index f71723a2a8..a4d56914ad 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php @@ -18,7 +18,7 @@ namespace Symfony\Component\HttpKernel\Debug; */ class ErrorHandler { - protected $levels = array( + private $levels = array( E_WARNING => 'Warning', E_NOTICE => 'Notice', E_USER_ERROR => 'User Error', @@ -28,7 +28,7 @@ class ErrorHandler E_RECOVERABLE_ERROR => 'Catchable Fatal Error', ); - protected $level; + private $level; /** * Constructor. diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionListener.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionListener.php index f4f967e995..ecf4231392 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/Debug/ExceptionListener.php @@ -26,8 +26,8 @@ use Symfony\Component\HttpFoundation\Request; */ class ExceptionListener { - protected $controller; - protected $logger; + private $controller; + private $logger; public function __construct($controller, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php index 409bfe7614..a2a31375aa 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php @@ -22,8 +22,8 @@ use Symfony\Component\DependencyInjection\Container; */ abstract class Extension implements ExtensionInterface { - protected $classes = array(); - protected $classMap = array(); + private $classes = array(); + private $classMap = array(); /** * Gets the classes to cache. @@ -40,7 +40,7 @@ abstract class Extension implements ExtensionInterface * * @param array $classes An array of classes */ - protected function addClassesToCompile(array $classes) + public function addClassesToCompile(array $classes) { $this->classes = array_merge($this->classes, $classes); } diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php index 93380e8dff..c178eb1f6c 100644 --- a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php +++ b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php @@ -169,7 +169,7 @@ class FlattenException } } - protected function flattenArgs($args) + private function flattenArgs($args) { $result = array(); foreach ($args as $key => $value) { diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpException.php b/src/Symfony/Component/HttpKernel/Exception/HttpException.php index 518a9b02af..c487f7a057 100644 --- a/src/Symfony/Component/HttpKernel/Exception/HttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/HttpException.php @@ -18,8 +18,8 @@ namespace Symfony\Component\HttpKernel\Exception; */ class HttpException extends \RuntimeException implements HttpExceptionInterface { - protected $statusCode; - protected $headers; + private $statusCode; + private $headers; public function __construct($statusCode, $message = null, \Exception $previous = null, array $headers = array(), $code = 0) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php index 4ee28f55b2..3ac0e49587 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php @@ -28,7 +28,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface; */ class Esi { - protected $contentTypes; + private $contentTypes; /** * Constructor. @@ -212,7 +212,7 @@ class Esi * * @return string The response content for the include. */ - protected function handleEsiIncludeTag($attributes) + private function handleEsiIncludeTag($attributes) { $options = array(); preg_match_all('/(src|onerror|alt)="([^"]*?)"/', $attributes[1], $matches, PREG_SET_ORDER); diff --git a/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php b/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php index 0f02a711fa..95dea40830 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php @@ -22,8 +22,8 @@ use Symfony\Component\HttpKernel\Event\FilterResponseEvent; */ class EsiListener { - protected $i; - protected $esi; + private $i; + private $esi; /** * Constructor. diff --git a/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php index 2a36effc80..9e683f1fcd 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php @@ -28,9 +28,9 @@ use Symfony\Component\HttpFoundation\Response; */ class EsiResponseCacheStrategy implements EsiResponseCacheStrategyInterface { - protected $cacheable = true; - protected $ttls = array(); - protected $maxAges = array(); + private $cacheable = true; + private $ttls = array(); + private $maxAges = array(); /** * Adds a Response. diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 6e2a89ee91..e022f7f404 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -26,12 +26,12 @@ use Symfony\Component\HttpFoundation\Response; */ class HttpCache implements HttpKernelInterface { - protected $kernel; - protected $traces; - protected $store; - protected $request; - protected $esi; - protected $esiCacheStrategy; + private $kernel; + private $store; + private $request; + private $esi; + private $esiCacheStrategy; + private $traces; /** * Constructor. @@ -519,7 +519,7 @@ class HttpCache implements HttpKernelInterface * * @return Response A Response instance */ - protected function restoreResponseBody(Request $request, Response $response) + private function restoreResponseBody(Request $request, Response $response) { if ('head' === strtolower($request->getMethod())) { $response->setContent(''); @@ -568,7 +568,7 @@ class HttpCache implements HttpKernelInterface * * @return Boolean true if the Request is private, false otherwise */ - protected function isPrivateRequest(Request $request) + private function isPrivateRequest(Request $request) { foreach ($this->options['private_headers'] as $key) { $key = strtolower(str_replace('HTTP_', '', $key)); @@ -590,7 +590,7 @@ class HttpCache implements HttpKernelInterface * * @param string $event The event name */ - protected function record(Request $request, $event) + private function record(Request $request, $event) { $path = $request->getPathInfo(); if ($qs = $request->getQueryString()) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php index 11d41a6ddc..16c076b99d 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php @@ -25,9 +25,9 @@ use Symfony\Component\HttpFoundation\HeaderBag; */ class Store implements StoreInterface { - protected $root; - protected $keyCache; - protected $locks; + private $root; + private $keyCache; + private $locks; /** * Constructor. @@ -237,7 +237,7 @@ class Store implements StoreInterface * * @return Boolean true if the the two environments match, false otherwise */ - protected function requestsMatch($vary, $env1, $env2) + private function requestsMatch($vary, $env1, $env2) { if (empty($vary)) { return true; @@ -264,7 +264,7 @@ class Store implements StoreInterface * * @return array An array of data associated with the key */ - protected function getMetadata($key) + private function getMetadata($key) { if (false === $entries = $this->load($key)) { return array(); @@ -298,7 +298,7 @@ class Store implements StoreInterface * * @return string The data associated with the key */ - protected function load($key) + private function load($key) { $path = $this->getPath($key); @@ -311,7 +311,7 @@ class Store implements StoreInterface * @param string $key The store key * @param string $data The data to store */ - protected function save($key, $data) + private function save($key, $data) { $path = $this->getPath($key); if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true)) { @@ -348,7 +348,7 @@ class Store implements StoreInterface * * @return string A key for the given Request */ - protected function getCacheKey(Request $request) + private function getCacheKey(Request $request) { if (isset($this->keyCache[$request])) { return $this->keyCache[$request]; @@ -364,7 +364,7 @@ class Store implements StoreInterface * * @return array An array of HTTP headers */ - protected function persistRequest(Request $request) + private function persistRequest(Request $request) { return $request->headers->all(); } @@ -376,7 +376,7 @@ class Store implements StoreInterface * * @return array An array of HTTP headers */ - protected function persistResponse(Response $response) + private function persistResponse(Response $response) { $headers = $response->headers->all(); $headers['X-Status'] = array($response->getStatusCode()); @@ -390,7 +390,7 @@ class Store implements StoreInterface * @param array $headers An array of HTTP headers for the Response * @param string $body The Response body */ - protected function restoreResponse($headers, $body = null) + private function restoreResponse($headers, $body = null) { $status = $headers['X-Status'][0]; unset($headers['X-Status']); diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index c6f6d714f5..49dbd9aad3 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -85,7 +85,7 @@ class HttpKernel implements HttpKernelInterface * @throws \LogicException If one of the listener does not behave as expected * @throws NotFoundHttpException When controller cannot be found */ - protected function handleRaw(Request $request, $type = self::MASTER_REQUEST) + private function handleRaw(Request $request, $type = self::MASTER_REQUEST) { // request $event = new GetResponseEvent($this, $request, $type); @@ -138,7 +138,7 @@ class HttpKernel implements HttpKernelInterface * * @throws \RuntimeException if the passed object is not a Response instance */ - protected function filterResponse(Response $response, Request $request, $type) + private function filterResponse(Response $response, Request $request, $type) { $event = new FilterResponseEvent($this, $request, $type, $response); @@ -156,7 +156,7 @@ class HttpKernel implements HttpKernelInterface * * @return Response A Response instance */ - protected function handleException(\Exception $e, $request, $type) + private function handleException(\Exception $e, $request, $type) { $event = new GetResponseForExceptionEvent($this, $request, $type, $e); $this->dispatcher->dispatch(Events::onCoreException, $event); @@ -168,7 +168,7 @@ class HttpKernel implements HttpKernelInterface return $this->filterResponse($event->getResponse(), $request, $type); } - protected function varToString($var) + private function varToString($var) { if (is_object($var)) { return sprintf('[object](%s)', get_class($var)); diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index 5a5e936c59..8bd93cac42 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -24,18 +24,18 @@ use Symfony\Component\HttpKernel\Log\LoggerInterface; */ class Profiler { - protected $storage; - protected $collectors; - protected $logger; - protected $enabled; - protected $token; - protected $parent; - protected $data; - protected $ip; - protected $url; - protected $time; - protected $empty; - protected $children; + private $storage; + private $collectors; + private $logger; + private $enabled; + private $token; + private $parent; + private $data; + private $ip; + private $url; + private $time; + private $empty; + private $children; /** * Constructor. diff --git a/src/Symfony/Component/HttpKernel/ResponseListener.php b/src/Symfony/Component/HttpKernel/ResponseListener.php index 4b72643757..46eaaac67f 100644 --- a/src/Symfony/Component/HttpKernel/ResponseListener.php +++ b/src/Symfony/Component/HttpKernel/ResponseListener.php @@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Response; */ class ResponseListener { - protected $charset; + private $charset; public function __construct($charset) {