Skip to content

Commit 64a1e7a

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: Remove aligned '=>' and '=' Break infinite loop while resolving aliases [Security][listener] change priority of switchuser Improved the phpdoc for security token classes bumped Symfony version to 2.3.22 updated VERSION for 2.3.21 update CONTRIBUTORS for 2.3.21 updated CHANGELOG for 2.3.21 Conflicts: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php src/Symfony/Bridge/Propel1/Form/Type/ModelType.php src/Symfony/Bridge/Propel1/Logger/PropelLogger.php src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php src/Symfony/Component/Console/Descriptor/JsonDescriptor.php src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/Finder/Shell/Command.php src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php src/Symfony/Component/Form/Extension/Core/Type/FormType.php src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php src/Symfony/Component/Form/Extension/Core/Type/NumberType.php src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php src/Symfony/Component/HttpFoundation/File/UploadedFile.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Validator/Constraints/ImageValidator.php src/Symfony/Component/Validator/Constraints/TypeValidator.php
2 parents 6c7cbd0 + f30eadf commit 64a1e7a

16 files changed

+133
-133
lines changed

‎DataCollector/ConfigDataCollector.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ public function setKernel(KernelInterface $kernel = null)
5555
public function collect(Request $request, Response $response, \Exception $exception = null)
5656
{
5757
$this->data = array(
58-
'app_name' => $this->name,
59-
'app_version' => $this->version,
60-
'token' => $response->headers->get('X-Debug-Token'),
61-
'symfony_version' => Kernel::VERSION,
62-
'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
63-
'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
64-
'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
65-
'php_version' => PHP_VERSION,
66-
'xdebug_enabled' => extension_loaded('xdebug'),
67-
'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
68-
'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
69-
'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
70-
'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
58+
'app_name' => $this->name,
59+
'app_version' => $this->version,
60+
'token' => $response->headers->get('X-Debug-Token'),
61+
'symfony_version' => Kernel::VERSION,
62+
'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
63+
'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
64+
'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
65+
'php_version' => PHP_VERSION,
66+
'xdebug_enabled' => extension_loaded('xdebug'),
67+
'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
68+
'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
69+
'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
70+
'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
7171
'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
72-
'bundles' => array(),
73-
'sapi_name' => php_sapi_name(),
72+
'bundles' => array(),
73+
'sapi_name' => php_sapi_name(),
7474
);
7575

7676
if (isset($this->kernel)) {

‎DataCollector/EventDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null)
3636
public function collect(Request $request, Response $response, \Exception $exception = null)
3737
{
3838
$this->data = array(
39-
'called_listeners' => array(),
39+
'called_listeners' => array(),
4040
'not_called_listeners' => array(),
4141
);
4242
}

‎DataCollector/MemoryDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
2424
public function __construct()
2525
{
2626
$this->data = array(
27-
'memory' => 0,
27+
'memory' => 0,
2828
'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
2929
);
3030
}

‎DataCollector/RequestDataCollector.php

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,24 @@ public function collect(Request $request, Response $response, \Exception $except
8989
$statusCode = $response->getStatusCode();
9090

9191
$this->data = array(
92-
'format' => $request->getRequestFormat(),
93-
'content' => $content,
94-
'content_type' => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
95-
'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
96-
'status_code' => $statusCode,
97-
'request_query' => $request->query->all(),
98-
'request_request' => $request->request->all(),
99-
'request_headers' => $request->headers->all(),
100-
'request_server' => $request->server->all(),
101-
'request_cookies' => $request->cookies->all(),
92+
'format' => $request->getRequestFormat(),
93+
'content' => $content,
94+
'content_type' => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
95+
'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
96+
'status_code' => $statusCode,
97+
'request_query' => $request->query->all(),
98+
'request_request' => $request->request->all(),
99+
'request_headers' => $request->headers->all(),
100+
'request_server' => $request->server->all(),
101+
'request_cookies' => $request->cookies->all(),
102102
'request_attributes' => $attributes,
103-
'response_headers' => $responseHeaders,
104-
'session_metadata' => $sessionMetadata,
103+
'response_headers' => $responseHeaders,
104+
'session_metadata' => $sessionMetadata,
105105
'session_attributes' => $sessionAttributes,
106-
'flashes' => $flashes,
107-
'path_info' => $request->getPathInfo(),
108-
'controller' => 'n/a',
109-
'locale' => $request->getLocale(),
106+
'flashes' => $flashes,
107+
'path_info' => $request->getPathInfo(),
108+
'controller' => 'n/a',
109+
'locale' => $request->getLocale(),
110110
);
111111

112112
if (isset($this->data['request_headers']['php-auth-pw'])) {
@@ -123,29 +123,29 @@ public function collect(Request $request, Response $response, \Exception $except
123123
try {
124124
$r = new \ReflectionMethod($controller[0], $controller[1]);
125125
$this->data['controller'] = array(
126-
'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
126+
'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
127127
'method' => $controller[1],
128-
'file' => $r->getFilename(),
129-
'line' => $r->getStartLine(),
128+
'file' => $r->getFilename(),
129+
'line' => $r->getStartLine(),
130130
);
131131
} catch (\ReflectionException $re) {
132132
if (is_callable($controller)) {
133133
// using __call or __callStatic
134134
$this->data['controller'] = array(
135-
'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
135+
'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
136136
'method' => $controller[1],
137-
'file' => 'n/a',
138-
'line' => 'n/a',
137+
'file' => 'n/a',
138+
'line' => 'n/a',
139139
);
140140
}
141141
}
142142
} elseif ($controller instanceof \Closure) {
143143
$r = new \ReflectionFunction($controller);
144144
$this->data['controller'] = array(
145-
'class' => $r->getName(),
145+
'class' => $r->getName(),
146146
'method' => null,
147-
'file' => $r->getFilename(),
148-
'line' => $r->getStartLine(),
147+
'file' => $r->getFilename(),
148+
'line' => $r->getStartLine(),
149149
);
150150
} else {
151151
$this->data['controller'] = (string) $controller ?: 'n/a';

‎DataCollector/RouterDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public function __construct()
3131

3232
$this->data = array(
3333
'redirect' => false,
34-
'url' => null,
35-
'route' => null,
34+
'url' => null,
35+
'route' => null,
3636
);
3737
}
3838

‎DataCollector/TimeDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function collect(Request $request, Response $response, \Exception $except
4545
$this->data = array(
4646
'token' => $response->headers->get('X-Debug-Token'),
4747
'start_time' => $startTime * 1000,
48-
'events' => array(),
48+
'events' => array(),
4949
);
5050
}
5151

‎HttpCache/HttpCache.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ public function __construct(HttpKernelInterface $kernel, StoreInterface $store,
8787
register_shutdown_function(array($this->store, 'cleanup'));
8888

8989
$this->options = array_merge(array(
90-
'debug' => false,
91-
'default_ttl' => 0,
92-
'private_headers' => array('Authorization', 'Cookie'),
93-
'allow_reload' => false,
94-
'allow_revalidate' => false,
90+
'debug' => false,
91+
'default_ttl' => 0,
92+
'private_headers' => array('Authorization', 'Cookie'),
93+
'allow_reload' => false,
94+
'allow_revalidate' => false,
9595
'stale_while_revalidate' => 2,
96-
'stale_if_error' => 60,
96+
'stale_if_error' => 60,
9797
), $options);
9898
}
9999

‎Kernel.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
5959
protected $startTime;
6060
protected $loadClassCache;
6161

62-
const VERSION = '2.5.7-DEV';
63-
const VERSION_ID = '20507';
64-
const MAJOR_VERSION = '2';
65-
const MINOR_VERSION = '5';
62+
const VERSION = '2.5.7-DEV';
63+
const VERSION_ID = '20507';
64+
const MAJOR_VERSION = '2';
65+
const MINOR_VERSION = '5';
6666
const RELEASE_VERSION = '7';
67-
const EXTRA_VERSION = 'DEV';
67+
const EXTRA_VERSION = 'DEV';
6868

6969
/**
7070
* Constructor.
@@ -584,14 +584,14 @@ protected function getKernelParameters()
584584

585585
return array_merge(
586586
array(
587-
'kernel.root_dir' => $this->rootDir,
588-
'kernel.environment' => $this->environment,
589-
'kernel.debug' => $this->debug,
590-
'kernel.name' => $this->name,
591-
'kernel.cache_dir' => $this->getCacheDir(),
592-
'kernel.logs_dir' => $this->getLogDir(),
593-
'kernel.bundles' => $bundles,
594-
'kernel.charset' => $this->getCharset(),
587+
'kernel.root_dir' => $this->rootDir,
588+
'kernel.environment' => $this->environment,
589+
'kernel.debug' => $this->debug,
590+
'kernel.name' => $this->name,
591+
'kernel.cache_dir' => $this->getCacheDir(),
592+
'kernel.logs_dir' => $this->getLogDir(),
593+
'kernel.bundles' => $bundles,
594+
'kernel.charset' => $this->getCharset(),
595595
'kernel.container_class' => $this->getContainerClass(),
596596
),
597597
$this->getEnvParameters()

‎Profiler/BaseMemcacheProfilerStorage.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
7777
continue;
7878
}
7979

80-
$result[$itemToken] = array(
81-
'token' => $itemToken,
82-
'ip' => $itemIp,
80+
$result[$itemToken] = array(
81+
'token' => $itemToken,
82+
'ip' => $itemIp,
8383
'method' => $itemMethod,
84-
'url' => $itemUrl,
85-
'time' => $itemTime,
84+
'url' => $itemUrl,
85+
'time' => $itemTime,
8686
'parent' => $itemParent,
8787
);
8888
--$limit;
@@ -152,14 +152,14 @@ public function read($token)
152152
public function write(Profile $profile)
153153
{
154154
$data = array(
155-
'token' => $profile->getToken(),
156-
'parent' => $profile->getParentToken(),
155+
'token' => $profile->getToken(),
156+
'parent' => $profile->getParentToken(),
157157
'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
158-
'data' => $profile->getCollectors(),
159-
'ip' => $profile->getIp(),
160-
'method' => $profile->getMethod(),
161-
'url' => $profile->getUrl(),
162-
'time' => $profile->getTime(),
158+
'data' => $profile->getCollectors(),
159+
'ip' => $profile->getIp(),
160+
'method' => $profile->getMethod(),
161+
'url' => $profile->getUrl(),
162+
'time' => $profile->getTime(),
163163
);
164164

165165
$profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));

‎Profiler/FileProfilerStorage.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
7878
}
7979

8080
$result[$csvToken] = array(
81-
'token' => $csvToken,
82-
'ip' => $csvIp,
81+
'token' => $csvToken,
82+
'ip' => $csvIp,
8383
'method' => $csvMethod,
84-
'url' => $csvUrl,
85-
'time' => $csvTime,
84+
'url' => $csvUrl,
85+
'time' => $csvTime,
8686
'parent' => $csvParent,
8787
);
8888
}
@@ -140,14 +140,14 @@ public function write(Profile $profile)
140140

141141
// Store profile
142142
$data = array(
143-
'token' => $profile->getToken(),
144-
'parent' => $profile->getParentToken(),
143+
'token' => $profile->getToken(),
144+
'parent' => $profile->getParentToken(),
145145
'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
146-
'data' => $profile->getCollectors(),
147-
'ip' => $profile->getIp(),
148-
'method' => $profile->getMethod(),
149-
'url' => $profile->getUrl(),
150-
'time' => $profile->getTime(),
146+
'data' => $profile->getCollectors(),
147+
'ip' => $profile->getIp(),
148+
'method' => $profile->getMethod(),
149+
'url' => $profile->getUrl(),
150+
'time' => $profile->getTime(),
151151
);
152152

153153
if (false === file_put_contents($file, serialize($data))) {

0 commit comments

Comments
 (0)