This commit is contained in:
Fabien Potencier 2012-12-11 11:27:06 +01:00
parent 5c15496b5c
commit a7cd5f54ef
11 changed files with 2 additions and 14 deletions

View File

@ -212,7 +212,6 @@ class FormExtension extends \Twig_Extension
{ {
$mainTemplate = in_array($section, array('widget', 'row')); $mainTemplate = in_array($section, array('widget', 'row'));
if ($mainTemplate && $view->isRendered()) { if ($mainTemplate && $view->isRendered()) {
return ''; return '';
} }

View File

@ -5,4 +5,3 @@ name="<?php echo $view->escape($full_name) ?>"
<?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>" <?php endif ?> <?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>" <?php endif ?>
<?php if ($pattern): ?>pattern="<?php echo $view->escape($pattern) ?>" <?php endif ?> <?php if ($pattern): ?>pattern="<?php echo $view->escape($pattern) ?>" <?php endif ?>
<?php foreach ($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?> <?php foreach ($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>

View File

@ -2,4 +2,3 @@
<?php echo $view['form']->renderBlock('field_rows') ?> <?php echo $view['form']->renderBlock('field_rows') ?>
<?php echo $view['form']->rest($form) ?> <?php echo $view['form']->rest($form) ?>
</div> </div>

View File

@ -193,7 +193,6 @@ class FormHelper extends Helper
{ {
$mainTemplate = in_array($section, array('row', 'widget')); $mainTemplate = in_array($section, array('row', 'widget'));
if ($mainTemplate && $view->isRendered()) { if ($mainTemplate && $view->isRendered()) {
return ''; return '';
} }

View File

@ -209,7 +209,6 @@ class FunctionNode implements NodeInterface
$xpath->addCondition(sprintf('contains(string(.), %s)', XPathExpr::xpathLiteral($expr))); $xpath->addCondition(sprintf('contains(string(.), %s)', XPathExpr::xpathLiteral($expr)));
// FIXME: Currently case insensitive matching doesn't seem to be happening // FIXME: Currently case insensitive matching doesn't seem to be happening
return $xpath; return $xpath;
} }
@ -264,7 +263,6 @@ class FunctionNode implements NodeInterface
if (false === strpos($s, 'n')) { if (false === strpos($s, 'n')) {
// Just a b // Just a b
return array(0, intval((string) $s)); return array(0, intval((string) $s));
} }

View File

@ -266,7 +266,6 @@ class Form implements \IteratorAggregate, FormInterface
public function isRequired() public function isRequired()
{ {
if (null === $this->parent || $this->parent->isRequired()) { if (null === $this->parent || $this->parent->isRequired()) {
return $this->required; return $this->required;
} }
@ -287,7 +286,6 @@ class Form implements \IteratorAggregate, FormInterface
public function isReadOnly() public function isReadOnly()
{ {
if (null === $this->parent || !$this->parent->isReadOnly()) { if (null === $this->parent || !$this->parent->isReadOnly()) {
return $this->readOnly; return $this->readOnly;
} }
@ -661,7 +659,6 @@ class Form implements \IteratorAggregate, FormInterface
{ {
foreach ($this->children as $child) { foreach ($this->children as $child) {
if (!$child->isEmpty()) { if (!$child->isEmpty()) {
return false; return false;
} }
} }
@ -687,7 +684,6 @@ class Form implements \IteratorAggregate, FormInterface
if (!$this->readOnly) { if (!$this->readOnly) {
foreach ($this->children as $child) { foreach ($this->children as $child) {
if (!$child->isValid()) { if (!$child->isValid()) {
return false; return false;
} }
} }
@ -822,7 +818,6 @@ class Form implements \IteratorAggregate, FormInterface
public function get($name) public function get($name)
{ {
if (isset($this->children[$name])) { if (isset($this->children[$name])) {
return $this->children[$name]; return $this->children[$name];
} }

View File

@ -237,4 +237,3 @@ class RequestMatcher implements RequestMatcherInterface
return true; return true;
} }
} }

View File

@ -182,6 +182,7 @@ class PdoSessionStorage extends NativeSessionStorage
if (count($sessionRows) == 1) { if (count($sessionRows) == 1) {
$session = is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0]; $session = is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
return base64_decode($session); return base64_decode($session);
} }

View File

@ -66,6 +66,7 @@ class ContextListener implements ListenerInterface
if (null === $session || null === $token = $session->get('_security_'.$this->contextKey)) { if (null === $session || null === $token = $session->get('_security_'.$this->contextKey)) {
$this->context->setToken(null); $this->context->setToken(null);
return; return;
} }

View File

@ -11,7 +11,6 @@
namespace Symfony\Tests\Bridge\Doctrine\Logger; namespace Symfony\Tests\Bridge\Doctrine\Logger;
class DbalLoggerTest extends \PHPUnit_Framework_TestCase class DbalLoggerTest extends \PHPUnit_Framework_TestCase
{ {
public function testLogNonUtf8() public function testLogNonUtf8()

View File

@ -199,4 +199,3 @@ class RequestMatcherTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($matcher->matches($request)); $this->assertFalse($matcher->matches($request));
} }
} }