Fabien Potencier 13 rokov pred
rodič
commit
51ecb3c07b

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -555,7 +555,7 @@ class FrameworkExtension extends Extension
     private function getValidatorXmlMappingFiles(ContainerBuilder $container)
     {
         $reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
-        $files = array(dirname($reflClass->getFileName()) . '/Resources/config/validation.xml');
+        $files = array(dirname($reflClass->getFileName()).'/Resources/config/validation.xml');
         $container->addResource(new FileResource($files[0]));
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {

+ 1 - 3
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/datetime_widget.html.php

@@ -2,8 +2,6 @@
     <?php echo $view['form']->renderBlock('field_widget'); ?>
 <?php else: ?>
     <div <?php echo $view['form']->renderBlock('container_attributes') ?>>
-        <?php echo $view['form']->widget($form['date'])
-            . ' '
-            . $view['form']->widget($form['time']) ?>
+        <?php echo $view['form']->widget($form['date']).' '.$view['form']->widget($form['time']) ?>
     </div>
 <?php endif ?>

+ 0 - 2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

@@ -11,10 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\DependencyInjection\ContainerAware;
 
 class SessionController extends ContainerAware

+ 1 - 1
src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php

@@ -163,7 +163,7 @@ class ExceptionListener
         if ($authException instanceof AccountStatusException && ($token = $this->context->getToken()) instanceof UsernamePasswordToken) {
             // remove the security token to prevent infinite redirect loops
             $this->context->setToken(null);
-            $request->getSession()->remove('_security_' . $token->getProviderKey());
+            $request->getSession()->remove('_security_'.$token->getProviderKey());
         }
 
         return $this->authenticationEntryPoint->start($request, $authException);

+ 2 - 2
src/Symfony/Component/Templating/PhpEngine.php

@@ -150,11 +150,11 @@ class PhpEngine implements EngineInterface, \ArrayAccess
     protected function evaluate(Storage $template, array $parameters = array())
     {
         $__template__ = $template;
-        
+
         if (isset($parameters['__template__'])) {
             throw new \InvalidArgumentException('Invalid parameter (__template__)');
         }
-        
+
         if ($__template__ instanceof FileStorage) {
             extract($parameters, EXTR_SKIP);
             $view = $this;

+ 0 - 1
tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php

@@ -14,7 +14,6 @@ namespace Symfony\Tests\Component\Validator\Constraints;
 use Symfony\Component\Validator\ExecutionContext;
 use Symfony\Component\Validator\Constraints\Min;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\CollectionValidator;