Skip to content

Commit

Permalink
Merge branch '2.3' into 2.6
Browse files Browse the repository at this point in the history
* 2.3:
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [Validator] Added missing galician (gl) translations
  [travis] Tests Security sub-components
  [travis] Tests Security sub-components
  CS fixes
  [travis] test with php nightly

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
  • Loading branch information
fabpot committed Mar 7, 2015
2 parents b6b9664 + bc6a96c commit 23d712e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Inline.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ private static function parseSequence($sequence, &$i = 0, $references = array())
{
$output = array();
$len = strlen($sequence);
$i += 1;
++$i;

// [foo, bar, ...]
while ($i < $len) {
Expand Down Expand Up @@ -344,7 +344,7 @@ private static function parseMapping($mapping, &$i = 0, $references = array())
{
$output = array();
$len = strlen($mapping);
$i += 1;
++$i;

// {foo: bar, bar:foo, ...}
while ($i < $len) {
Expand Down

0 comments on commit 23d712e

Please sign in to comment.