fixed CS
This commit is contained in:
parent
706020b38a
commit
51ecb3c07b
@ -555,7 +555,7 @@ class FrameworkExtension extends Extension
|
|||||||
private function getValidatorXmlMappingFiles(ContainerBuilder $container)
|
private function getValidatorXmlMappingFiles(ContainerBuilder $container)
|
||||||
{
|
{
|
||||||
$reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
|
$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]));
|
$container->addResource(new FileResource($files[0]));
|
||||||
|
|
||||||
foreach ($container->getParameter('kernel.bundles') as $bundle) {
|
foreach ($container->getParameter('kernel.bundles') as $bundle) {
|
||||||
|
@ -2,8 +2,6 @@
|
|||||||
<?php echo $view['form']->renderBlock('field_widget'); ?>
|
<?php echo $view['form']->renderBlock('field_widget'); ?>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<div <?php echo $view['form']->renderBlock('container_attributes') ?>>
|
<div <?php echo $view['form']->renderBlock('container_attributes') ?>>
|
||||||
<?php echo $view['form']->widget($form['date'])
|
<?php echo $view['form']->widget($form['date']).' '.$view['form']->widget($form['time']) ?>
|
||||||
. ' '
|
|
||||||
. $view['form']->widget($form['time']) ?>
|
|
||||||
</div>
|
</div>
|
||||||
<?php endif ?>
|
<?php endif ?>
|
||||||
|
@ -11,10 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
|
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\Response;
|
||||||
use Symfony\Component\HttpFoundation\RedirectResponse;
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
use Symfony\Component\Security\Core\SecurityContext;
|
|
||||||
use Symfony\Component\DependencyInjection\ContainerAware;
|
use Symfony\Component\DependencyInjection\ContainerAware;
|
||||||
|
|
||||||
class SessionController extends ContainerAware
|
class SessionController extends ContainerAware
|
||||||
|
@ -163,7 +163,7 @@ class ExceptionListener
|
|||||||
if ($authException instanceof AccountStatusException && ($token = $this->context->getToken()) instanceof UsernamePasswordToken) {
|
if ($authException instanceof AccountStatusException && ($token = $this->context->getToken()) instanceof UsernamePasswordToken) {
|
||||||
// remove the security token to prevent infinite redirect loops
|
// remove the security token to prevent infinite redirect loops
|
||||||
$this->context->setToken(null);
|
$this->context->setToken(null);
|
||||||
$request->getSession()->remove('_security_' . $token->getProviderKey());
|
$request->getSession()->remove('_security_'.$token->getProviderKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->authenticationEntryPoint->start($request, $authException);
|
return $this->authenticationEntryPoint->start($request, $authException);
|
||||||
|
@ -150,11 +150,11 @@ class PhpEngine implements EngineInterface, \ArrayAccess
|
|||||||
protected function evaluate(Storage $template, array $parameters = array())
|
protected function evaluate(Storage $template, array $parameters = array())
|
||||||
{
|
{
|
||||||
$__template__ = $template;
|
$__template__ = $template;
|
||||||
|
|
||||||
if (isset($parameters['__template__'])) {
|
if (isset($parameters['__template__'])) {
|
||||||
throw new \InvalidArgumentException('Invalid parameter (__template__)');
|
throw new \InvalidArgumentException('Invalid parameter (__template__)');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($__template__ instanceof FileStorage) {
|
if ($__template__ instanceof FileStorage) {
|
||||||
extract($parameters, EXTR_SKIP);
|
extract($parameters, EXTR_SKIP);
|
||||||
$view = $this;
|
$view = $this;
|
||||||
|
@ -14,7 +14,6 @@ namespace Symfony\Tests\Component\Validator\Constraints;
|
|||||||
use Symfony\Component\Validator\ExecutionContext;
|
use Symfony\Component\Validator\ExecutionContext;
|
||||||
use Symfony\Component\Validator\Constraints\Min;
|
use Symfony\Component\Validator\Constraints\Min;
|
||||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||||
use Symfony\Component\Validator\Constraints\NotNull;
|
|
||||||
use Symfony\Component\Validator\Constraints\Collection;
|
use Symfony\Component\Validator\Constraints\Collection;
|
||||||
use Symfony\Component\Validator\Constraints\CollectionValidator;
|
use Symfony\Component\Validator\Constraints\CollectionValidator;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user