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

Merge branch '2.4'

Browse Source 
* 2.4:
  fixed CS
  fixed CS
This commit is contained in:
Fabien Potencier 2013-12-12 17:10:54 +01:00
commit 6764f91ce9
7 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/TwigBundle/TwigEngine.php
View File

@ -57,7 +57,7 @@ class TwigEngine extends BaseEngine implements EngineInterface
if ('js' === $format) { if ('js' === $format) {
return 'js'; return 'js';
} }
if ('txt' === $format) { if ('txt' === $format) {
return false; return false;
} }

7
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
View File

@ -31,13 +31,15 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
*/ */
protected $displayErrors; protected $displayErrors;
public function setUp() { public function setUp()
{
$this->errorReporting = error_reporting(E_ALL | E_STRICT); $this->errorReporting = error_reporting(E_ALL | E_STRICT);
$this->displayErrors = ini_get('display_errors'); $this->displayErrors = ini_get('display_errors');
ini_set('display_errors', '1'); ini_set('display_errors', '1');
} }
public function tearDown() { public function tearDown()
{
ini_set('display_errors', $this->displayErrors); ini_set('display_errors', $this->displayErrors);
error_reporting($this->errorReporting); error_reporting($this->errorReporting);
} }
@ -287,7 +289,6 @@ PHP
} }
} }
function test_namespaced_function_again() function test_namespaced_function_again()
{ {
} }

1
src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Form\Extension\Validator\Constraints; namespace Symfony\Component\Form\Extension\Validator\Constraints;
use Symfony\Component\Form\ClickableInterface;
use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Extension\Validator\Util\ServerParams; use Symfony\Component\Form\Extension\Validator\Util\ServerParams;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;

1
src/Symfony/Component/Form/Tests/CompoundFormTest.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Tests;
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler; use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormError;
use Symfony\Component\Form\Forms; use Symfony\Component\Form\Forms;
use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormView;

8
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View File

@ -778,14 +778,14 @@ class DateTypeTest extends TypeTestCase
$this->assertSame(array(), $form['day']->getErrors()); $this->assertSame(array(), $form['day']->getErrors());
$this->assertSame(array($error), $form->getErrors()); $this->assertSame(array($error), $form->getErrors());
} }
public function testYearsFor32BitsMachines() public function testYearsFor32BitsMachines()
{ {
if (4 !== PHP_INT_SIZE) { if (4 !== PHP_INT_SIZE) {
$this->markTestSkipped( $this->markTestSkipped(
'PHP must be compiled in 32 bit mode to run this test'); 'PHP must be compiled in 32 bit mode to run this test');
} }
$form = $this->factory->create('date', null, array( $form = $this->factory->create('date', null, array(
'years' => range(1900, 2040), 'years' => range(1900, 2040),
)); ));
@ -793,10 +793,10 @@ class DateTypeTest extends TypeTestCase
$view = $form->createView(); $view = $form->createView();
$listChoices = array(); $listChoices = array();
foreach(range(1902, 2037) as $y) { foreach (range(1902, 2037) as $y) {
$listChoices[] = new ChoiceView($y, $y, $y); $listChoices[] = new ChoiceView($y, $y, $y);
} }
$this->assertEquals($listChoices, $view['year']->vars['choices']); $this->assertEquals($listChoices, $view['year']->vars['choices']);
} }
} }

2
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
View File

@ -24,7 +24,7 @@ abstract class AbstractIntlDateFormatterTest extends \PHPUnit_Framework_TestCase
{ {
protected function setUp() protected function setUp()
{ {
\Locale::setDefault('en'); \Locale::setDefault('en');
} }

158
src/Symfony/Component/Security/Core/Tests/Authorization/ExpressionLanguageTest.php
View File

@ -1,79 +1,79 @@
<?php <?php
/* /*
* This file is part of the Symfony package. * This file is part of the Symfony package.
* *
* (c) Fabien Potencier <fabien@symfony.com> * (c) Fabien Potencier <fabien@symfony.com>
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Symfony\Component\Security\Core\Tests\Authorization; namespace Symfony\Component\Security\Core\Tests\Authorization;
use Symfony\Component\Security\Core\Authorization\ExpressionLanguage; use Symfony\Component\Security\Core\Authorization\ExpressionLanguage;
use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver; use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\User\User; use Symfony\Component\Security\Core\User\User;
class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @dataProvider provider * @dataProvider provider
*/ */
public function testIsAuthenticated($token, $expression, $result, array $roles = array()) public function testIsAuthenticated($token, $expression, $result, array $roles = array())
{ {
$anonymousTokenClass = 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken'; $anonymousTokenClass = 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken';
$rememberMeTokenClass = 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken'; $rememberMeTokenClass = 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken';
$expressionLanguage = new ExpressionLanguage(); $expressionLanguage = new ExpressionLanguage();
$trustResolver = new AuthenticationTrustResolver($anonymousTokenClass, $rememberMeTokenClass); $trustResolver = new AuthenticationTrustResolver($anonymousTokenClass, $rememberMeTokenClass);
$context = array(); $context = array();
$context['trust_resolver'] = $trustResolver; $context['trust_resolver'] = $trustResolver;
$context['token'] = $token; $context['token'] = $token;
$context['roles'] = $roles; $context['roles'] = $roles;
$this->assertEquals($result, $expressionLanguage->evaluate($expression, $context)); $this->assertEquals($result, $expressionLanguage->evaluate($expression, $context));
} }
public function provider() public function provider()
{ {
$roles = array('ROLE_USER', 'ROLE_ADMIN'); $roles = array('ROLE_USER', 'ROLE_ADMIN');
$user = new User('username', 'password', $roles); $user = new User('username', 'password', $roles);
$noToken = null; $noToken = null;
$anonymousToken = new AnonymousToken('firewall', 'anon.'); $anonymousToken = new AnonymousToken('firewall', 'anon.');
$rememberMeToken = new RememberMeToken($user, 'providerkey', 'firewall'); $rememberMeToken = new RememberMeToken($user, 'providerkey', 'firewall');
$usernamePasswordToken = new UsernamePasswordToken('username', 'password', 'providerkey', $roles); $usernamePasswordToken = new UsernamePasswordToken('username', 'password', 'providerkey', $roles);
return array( return array(
array($noToken, 'is_anonymous()', false), array($noToken, 'is_anonymous()', false),
array($noToken, 'is_authenticated()', false), array($noToken, 'is_authenticated()', false),
array($noToken, 'is_fully_authenticated()', false), array($noToken, 'is_fully_authenticated()', false),
array($noToken, 'is_remember_me()', false), array($noToken, 'is_remember_me()', false),
array($noToken, "has_role('ROLE_USER')", false), array($noToken, "has_role('ROLE_USER')", false),
array($anonymousToken, 'is_anonymous()', true), array($anonymousToken, 'is_anonymous()', true),
array($anonymousToken, 'is_authenticated()', false), array($anonymousToken, 'is_authenticated()', false),
array($anonymousToken, 'is_fully_authenticated()', false), array($anonymousToken, 'is_fully_authenticated()', false),
array($anonymousToken, 'is_remember_me()', false), array($anonymousToken, 'is_remember_me()', false),
array($anonymousToken, "has_role('ROLE_USER')", false), array($anonymousToken, "has_role('ROLE_USER')", false),
array($rememberMeToken, 'is_anonymous()', false), array($rememberMeToken, 'is_anonymous()', false),
array($rememberMeToken, 'is_authenticated()', true), array($rememberMeToken, 'is_authenticated()', true),
array($rememberMeToken, 'is_fully_authenticated()', false), array($rememberMeToken, 'is_fully_authenticated()', false),
array($rememberMeToken, 'is_remember_me()', true), array($rememberMeToken, 'is_remember_me()', true),
array($rememberMeToken, "has_role('ROLE_FOO')", false, $roles), array($rememberMeToken, "has_role('ROLE_FOO')", false, $roles),
array($rememberMeToken, "has_role('ROLE_USER')", true, $roles), array($rememberMeToken, "has_role('ROLE_USER')", true, $roles),
array($usernamePasswordToken, 'is_anonymous()', false), array($usernamePasswordToken, 'is_anonymous()', false),
array($usernamePasswordToken, 'is_authenticated()', true), array($usernamePasswordToken, 'is_authenticated()', true),
array($usernamePasswordToken, 'is_fully_authenticated()', true), array($usernamePasswordToken, 'is_fully_authenticated()', true),
array($usernamePasswordToken, 'is_remember_me()', false), array($usernamePasswordToken, 'is_remember_me()', false),
array($usernamePasswordToken, "has_role('ROLE_FOO')", false, $roles), array($usernamePasswordToken, "has_role('ROLE_FOO')", false, $roles),
array($usernamePasswordToken, "has_role('ROLE_USER')", true, $roles), array($usernamePasswordToken, "has_role('ROLE_USER')", true, $roles),
); );
} }
} }