diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged 2.0

Browse Source
This commit is contained in:
Fabien Potencier 2012-05-21 16:05:28 +02:00
commit aa3e1a3b8c
10 changed files with 91 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeIdentEntity.php
View File

@ -28,7 +28,8 @@ class CompositeIdentEntity implements UserInterface
/** @Column(type="string") */
public $name;
public function __construct($id1, $id2, $name) {
public function __construct($id1, $id2, $name)
{
$this->id1 = $id1;
$this->id2 = $id2;
$this->name = $name;

3
src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeStringIdentEntity.php
View File

@ -27,7 +27,8 @@ class CompositeStringIdentEntity
/** @Column(type="string") */
public $name;
public function __construct($id1, $id2, $name) {
public function __construct($id1, $id2, $name)
{
$this->id1 = $id1;
$this->id2 = $id2;
$this->name = $name;

3
src/Symfony/Bridge/Doctrine/Tests/Fixtures/NoToStringSingleIdentEntity.php
View File

@ -24,7 +24,8 @@ class NoToStringSingleIdentEntity
/** @Column(type="string", nullable=true) */
public $name;
public function __construct($id, $name) {
public function __construct($id, $name)
{
$this->id = $id;
$this->name = $name;
}

3
src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleStringIdentEntity.php
View File

@ -24,7 +24,8 @@ class SingleStringIdentEntity
/** @Column(type="string") */
public $name;
public function __construct($id, $name) {
public function __construct($id, $name)
{
$this->id = $id;
$this->name = $name;
}

3
src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php
View File

@ -13,7 +13,8 @@ namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;
// Preventing autoloader throwing E_FATAL when Twig is now available
if (!class_exists('Twig_Environment')) {
class StubFilesystemLoader {
class StubFilesystemLoader
{
}
} else {
class StubFilesystemLoader extends \Twig_Loader_Filesystem

3
src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
View File

@ -34,7 +34,8 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
$this->removeDirectory($this->directory);
}
protected function removeDirectory($directory) {
protected function removeDirectory($directory)
{
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
foreach ($iterator as $path) {
if (preg_match('#/\.\.?$#', $path->__toString())) {

38
src/Symfony/Component/HttpFoundation/ServerBag.php
View File

@ -16,6 +16,7 @@ namespace Symfony\Component\HttpFoundation;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Bulat Shakirzyanov <mallluhuct@gmail.com>
* @author Robert Kiss <kepten@gmail.com>
*/
class ServerBag extends ParameterBag
{
@ -37,10 +38,41 @@ class ServerBag extends ParameterBag
}
}
// PHP_AUTH_USER/PHP_AUTH_PW
if (isset($this->parameters['PHP_AUTH_USER'])) {
$pass = isset($this->parameters['PHP_AUTH_PW']) ? $this->parameters['PHP_AUTH_PW'] : '';
$headers['AUTHORIZATION'] = 'Basic '.base64_encode($this->parameters['PHP_AUTH_USER'].':'.$pass);
$headers['PHP_AUTH_USER'] = $this->parameters['PHP_AUTH_USER'];
$headers['PHP_AUTH_PW'] = isset($this->parameters['PHP_AUTH_PW']) ? $this->parameters['PHP_AUTH_PW'] : '';
} else {
/*
* php-cgi under Apache does not pass HTTP Basic user/pass to PHP by default
* For this workaround to work, add this line to your .htaccess file:
* RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
*
* A sample .htaccess file:
* RewriteEngine On
* RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
* RewriteCond %{REQUEST_FILENAME} !-f
* RewriteRule ^(.*)$ app.php [QSA,L]
*/
$authorizationHeader = null;
if (isset($this->parameters['HTTP_AUTHORIZATION'])) {
$authorizationHeader = $this->parameters['HTTP_AUTHORIZATION'];
} elseif (isset($this->parameters['REDIRECT_HTTP_AUTHORIZATION'])) {
$authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION'];
}
// Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW
if (null !== $authorizationHeader) {
$exploded = explode(':', base64_decode(substr($authorizationHeader, 6)));
if (count($exploded) == 2) {
list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;
}
}
}
// PHP_AUTH_USER/PHP_AUTH_PW
if (isset($headers['PHP_AUTH_USER'])) {
$headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']);
}
return $headers;

41
src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php
View File

@ -40,6 +40,8 @@ class ServerBagTest extends \PHPUnit_Framework_TestCase
'CONTENT_LENGTH' => '0',
'ETAG' => 'asdf',
'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
'PHP_AUTH_USER' => 'foo',
'PHP_AUTH_PW' => 'bar',
), $bag->getHeaders());
}
@ -47,6 +49,43 @@ class ServerBagTest extends \PHPUnit_Framework_TestCase
{
$bag = new ServerBag(array('PHP_AUTH_USER' => 'foo'));
$this->assertEquals(array('AUTHORIZATION' => 'Basic '.base64_encode('foo:')), $bag->getHeaders());
$this->assertEquals(array(
'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
'PHP_AUTH_USER' => 'foo',
'PHP_AUTH_PW' => ''
), $bag->getHeaders());
}
public function testHttpBasicAuthWithPhpCgi()
{
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')));
$this->assertEquals(array(
'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
'PHP_AUTH_USER' => 'foo',
'PHP_AUTH_PW' => 'bar'
), $bag->getHeaders());
}
public function testHttpBasicAuthWithPhpCgiRedirect()
{
$bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')));
$this->assertEquals(array(
'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
'PHP_AUTH_USER' => 'foo',
'PHP_AUTH_PW' => 'bar'
), $bag->getHeaders());
}
public function testHttpBasicAuthWithPhpCgiEmptyPassword()
{
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:')));
$this->assertEquals(array(
'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
'PHP_AUTH_USER' => 'foo',
'PHP_AUTH_PW' => ''
), $bag->getHeaders());
}
}

3
src/Symfony/Component/Locale/Resources/data/update-data.php
View File

@ -125,7 +125,8 @@ function get_data($index, $dataDir, $locale = 'en', $constraint = null)
return $data;
}
function create_stub_datafile($locale, $target, $data) {
function create_stub_datafile($locale, $target, $data)
{
$template = <<<TEMPLATE
<?php

4
src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
View File

@ -56,7 +56,7 @@ class BasicAuthenticationListener implements ListenerInterface
{
$request = $event->getRequest();
if (false === $username = $request->server->get('PHP_AUTH_USER', false)) {
if (false === $username = $request->headers->get('PHP_AUTH_USER', false)) {
return;
}
@ -71,7 +71,7 @@ class BasicAuthenticationListener implements ListenerInterface
}
try {
$token = $this->authenticationManager->authenticate(new UsernamePasswordToken($username, $request->server->get('PHP_AUTH_PW'), $this->providerKey));
$token = $this->authenticationManager->authenticate(new UsernamePasswordToken($username, $request->headers->get('PHP_AUTH_PW'), $this->providerKey));
$this->securityContext->setToken($token);
} catch (AuthenticationException $failed) {
$this->securityContext->setToken(null);