From 67f65c9fe4de272a59a64f35a618684b5c030252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFck=20Piera?= Date: Fri, 27 Mar 2015 16:14:25 +0100 Subject: [PATCH 01/10] Update phpdoc of ProcessBuilder#setPrefix() --- src/Symfony/Component/Process/ProcessBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php index 402e17eb83..868d284338 100644 --- a/src/Symfony/Component/Process/ProcessBuilder.php +++ b/src/Symfony/Component/Process/ProcessBuilder.php @@ -67,7 +67,7 @@ class ProcessBuilder } /** - * Adds an unescaped prefix to the command string. + * Adds a prefix to the command string. * * The prefix is preserved when resetting arguments. * From 02b829f973d4c177755960475efcd60854de26f2 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 27 Mar 2015 19:29:16 +0100 Subject: [PATCH 02/10] [Translator] fix test for php 7 compatibility --- src/Symfony/Component/Translation/Tests/TranslatorTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php index e1f54979bc..0952a4514f 100644 --- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php +++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php @@ -346,7 +346,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase return array( array('Symfony est super !', 'Symfony is great!', 'Symfony est super !', array(), 'fr', ''), array('Symfony est awesome !', 'Symfony is %what%!', 'Symfony est %what% !', array('%what%' => 'awesome'), 'fr', ''), - array('Symfony est super !', new String('Symfony is great!'), 'Symfony est super !', array(), 'fr', ''), + array('Symfony est super !', new StringClass('Symfony is great!'), 'Symfony est super !', array(), 'fr', ''), ); } @@ -392,7 +392,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase array('Il y a 1 pomme', '{0} There are no apples|one: There is one apple|more: There is %count% apples', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 1, array('%count%' => 1), 'fr', ''), array('Il y a 10 pommes', '{0} There are no apples|one: There is one apple|more: There is %count% apples', '{0} Il n\'y a aucune pomme|one: Il y a %count% pomme|more: Il y a %count% pommes', 10, array('%count%' => 10), 'fr', ''), - array('Il y a 0 pomme', new String('{0} There are no appless|{1} There is one apple|]1,Inf] There is %count% apples'), '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, array('%count%' => 0), 'fr', ''), + array('Il y a 0 pomme', new StringClass('{0} There are no appless|{1} There is one apple|]1,Inf] There is %count% apples'), '[0,1] Il y a %count% pomme|]1,Inf] Il y a %count% pommes', 0, array('%count%' => 0), 'fr', ''), ); } @@ -462,7 +462,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase } } -class String +class StringClass { protected $str; From 59cab272e1e6a037b0669c1c1afef951b9d84856 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 27 Mar 2015 22:21:56 +0100 Subject: [PATCH 03/10] remove useless tests that fail in php 7 --- .../Extension/Core/Type/ChoiceTypeTest.php | 10 ---------- .../Token/RememberMeTokenTest.php | 17 ----------------- 2 files changed, 27 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php index 895661ee4f..9e4ecd4552 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php @@ -66,16 +66,6 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase $this->objectChoices = null; } - /** - * @expectedException \PHPUnit_Framework_Error - */ - public function testChoicesOptionExpectsArray() - { - $this->factory->create('choice', null, array( - 'choices' => new \ArrayObject(), - )); - } - /** * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException */ diff --git a/src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php b/src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php index cef3d285c1..438c1d95d5 100644 --- a/src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php +++ b/src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php @@ -52,23 +52,6 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase ); } - /** - * @expectedException \PHPUnit_Framework_Error - * @dataProvider getUserArguments - */ - public function testConstructorUserCannotBeNull($user) - { - new RememberMeToken($user, 'foo', 'foo'); - } - - public function getUserArguments() - { - return array( - array(null), - array('foo'), - ); - } - protected function getUser($roles = array('ROLE_FOO')) { $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface'); From ec2cec6fd8801df746d79abbd067659d74a4eb09 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Fri, 27 Mar 2015 23:05:05 +0100 Subject: [PATCH 04/10] CS: Binary operators should be arounded by at least one space --- .../Doctrine/Tests/Logger/DbalLoggerTest.php | 2 +- .../Bridge/Propel1/Logger/PropelLogger.php | 2 +- src/Symfony/Component/BrowserKit/Cookie.php | 2 +- .../Config/Definition/PrototypedArrayNode.php | 2 +- .../Component/Config/Loader/FileLoader.php | 2 +- .../Formatter/OutputFormatterStyleStack.php | 2 +- .../DependencyInjection/Dumper/PhpDumper.php | 8 ++++---- .../Finder/Adapter/AbstractFindAdapter.php | 2 +- .../Finder/Comparator/NumberComparator.php | 4 ++-- src/Symfony/Component/Finder/Shell/Command.php | 2 +- .../Tests/Comparator/NumberComparatorTest.php | 4 ++-- .../Component/HttpFoundation/IpUtils.php | 2 +- .../Attribute/NamespacedAttributeBag.php | 4 ++-- .../HttpFoundation/Tests/CookieTest.php | 6 +++--- .../Component/Intl/Resources/bin/common.php | 2 +- .../Routing/Matcher/ApacheUrlMatcher.php | 4 ++-- .../Matcher/Dumper/ApacheMatcherDumper.php | 2 +- .../Matcher/Dumper/DumperPrefixCollection.php | 2 +- .../Security/Acl/Dbal/AclProvider.php | 4 ++-- .../Security/Acl/Dbal/MutableAclProvider.php | 6 +++--- .../Component/Security/Acl/Domain/Acl.php | 16 ++++++++-------- .../Security/Acl/Permission/MaskBuilder.php | 2 +- .../Authentication/Token/AbstractToken.php | 2 +- .../Acl/Dbal/AclProviderBenchmarkTest.php | 18 +++++++++--------- .../Tests/Core/Util/SecureRandomTest.php | 2 +- .../TokenBasedRememberMeServicesTest.php | 4 ++-- .../Translation/Loader/PoFileLoader.php | 2 +- .../Validator/Constraints/IssnValidator.php | 2 +- .../Tests/Constraints/FileValidatorTest.php | 4 ++-- 29 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php index 464201a8ad..269367872e 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php @@ -87,7 +87,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase $testString = 'abc'; $shortString = str_pad('', DbalLogger::MAX_STRING_LENGTH, $testString); - $longString = str_pad('', DbalLogger::MAX_STRING_LENGTH+1, $testString); + $longString = str_pad('', DbalLogger::MAX_STRING_LENGTH + 1, $testString); $dbalLogger ->expects($this->once()) diff --git a/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php b/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php index 6abe32c3ba..b651935afd 100644 --- a/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php +++ b/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php @@ -138,7 +138,7 @@ class PropelLogger $trace = debug_backtrace(); $method = $trace[2]['args'][2]; - $watch = 'Propel Query '.(count($this->queries)+1); + $watch = 'Propel Query '.(count($this->queries) + 1); if ('PropelPDO::prepare' === $method) { $this->isPrepared = true; $this->stopwatch->start($watch, 'propel'); diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php index e937a6267b..b8d9dffd91 100644 --- a/src/Symfony/Component/BrowserKit/Cookie.php +++ b/src/Symfony/Component/BrowserKit/Cookie.php @@ -204,7 +204,7 @@ class Cookie private static function parseDate($dateValue) { // trim single quotes around date if present - if (($length = strlen($dateValue)) > 1 && "'" === $dateValue[0] && "'" === $dateValue[$length-1]) { + if (($length = strlen($dateValue)) > 1 && "'" === $dateValue[0] && "'" === $dateValue[$length - 1]) { $dateValue = substr($dateValue, 1, -1); } diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index 2c7a7ab052..b1fbc36167 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -245,7 +245,7 @@ class PrototypedArrayNode extends ArrayNode $value = $this->remapXml($value); - $isAssoc = array_keys($value) !== range(0, count($value) -1); + $isAssoc = array_keys($value) !== range(0, count($value) - 1); $normalized = array(); foreach ($value as $k => $v) { if (null !== $this->keyAttribute && is_array($v)) { diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index 8e8cb0be6c..21e4c47331 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -93,7 +93,7 @@ abstract class FileLoader extends Loader $resources = is_array($resource) ? $resource : array($resource); for ($i = 0; $i < $resourcesCount = count($resources); $i++) { if (isset(self::$loading[$resources[$i]])) { - if ($i == $resourcesCount-1) { + if ($i == $resourcesCount - 1) { throw new FileLoaderImportCircularReferenceException(array_keys(self::$loading)); } } else { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php index c8de8032c5..b64c87fa59 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php @@ -96,7 +96,7 @@ class OutputFormatterStyleStack return $this->emptyStyle; } - return $this->styles[count($this->styles)-1]; + return $this->styles[count($this->styles) - 1]; } /** diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 51d4c29291..3b9039d29c 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -1342,14 +1342,14 @@ EOF; $i = $this->variableCount; if ('' === $name) { - $name .= $firstChars[$i%$firstCharsLength]; - $i = (int) ($i/$firstCharsLength); + $name .= $firstChars[$i % $firstCharsLength]; + $i = (int) ($i / $firstCharsLength); } while ($i > 0) { --$i; - $name .= $nonFirstChars[$i%$nonFirstCharsLength]; - $i = (int) ($i/$nonFirstCharsLength); + $name .= $nonFirstChars[$i % $nonFirstCharsLength]; + $i = (int) ($i / $nonFirstCharsLength); } ++$this->variableCount; diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php index 4d73b32c34..244301a739 100644 --- a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php +++ b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php @@ -272,7 +272,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter foreach ($dates as $i => $date) { $command->add($i > 0 ? '-and' : null); - $mins = (int) round((time()-$date->getTarget()) / 60); + $mins = (int) round((time() - $date->getTarget()) / 60); if (0 > $mins) { // mtime is in the future diff --git a/src/Symfony/Component/Finder/Comparator/NumberComparator.php b/src/Symfony/Component/Finder/Comparator/NumberComparator.php index c8587dc5ba..4b5b5ba838 100644 --- a/src/Symfony/Component/Finder/Comparator/NumberComparator.php +++ b/src/Symfony/Component/Finder/Comparator/NumberComparator.php @@ -64,13 +64,13 @@ class NumberComparator extends Comparator $target *= 1000000; break; case 'mi': - $target *= 1024*1024; + $target *= 1024 * 1024; break; case 'g': $target *= 1000000000; break; case 'gi': - $target *= 1024*1024*1024; + $target *= 1024 * 1024 * 1024; break; } } diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php index 7fcb303004..ab070346fc 100644 --- a/src/Symfony/Component/Finder/Shell/Command.php +++ b/src/Symfony/Component/Finder/Shell/Command.php @@ -170,7 +170,7 @@ class Command } $this->bits[] = self::create($this); - $this->labels[$label] = count($this->bits)-1; + $this->labels[$label] = count($this->bits) - 1; return $this->bits[$this->labels[$label]]; } diff --git a/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php b/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php index d8cef1b5b4..8284d078a8 100644 --- a/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php +++ b/src/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php @@ -71,10 +71,10 @@ class NumberComparatorTest extends \PHPUnit_Framework_TestCase array('==1KI', array('1024'), array('1023', '1025')), array('==1m', array('1000000'), array('999999', '1000001')), - array('==1mi', array(1024*1024), array(1024*1024-1, 1024*1024+1)), + array('==1mi', array(1024 * 1024), array(1024 * 1024 - 1, 1024 * 1024 + 1)), array('==1g', array('1000000000'), array('999999999', '1000000001')), - array('==1gi', array(1024*1024*1024), array(1024*1024*1024-1, 1024*1024*1024+1)), + array('==1gi', array(1024 * 1024 * 1024), array(1024 * 1024 * 1024 - 1, 1024 * 1024 * 1024 + 1)), array('!= 1000', array('500', '999'), array('1000')), ); diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php index 796136798d..ea68e2ea8b 100644 --- a/src/Symfony/Component/HttpFoundation/IpUtils.php +++ b/src/Symfony/Component/HttpFoundation/IpUtils.php @@ -111,7 +111,7 @@ class IpUtils $bytesTest = unpack('n*', inet_pton($requestIp)); for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; $i++) { - $left = $netmask - 16 * ($i-1); + $left = $netmask - 16 * ($i - 1); $left = ($left <= 16) ? $left : 16; $mask = ~(0xffff >> $left) & 0xffff; if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php index 132d28fbd5..e97a4dba26 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php @@ -125,7 +125,7 @@ class NamespacedAttributeBag extends AttributeBag return $array; } - unset($parts[count($parts)-1]); + unset($parts[count($parts) - 1]); foreach ($parts as $part) { if (null !== $array && !array_key_exists($part, $array)) { @@ -150,7 +150,7 @@ class NamespacedAttributeBag extends AttributeBag protected function resolveKey($name) { if (strpos($name, $this->namespaceCharacter) !== false) { - $name = substr($name, strrpos($name, $this->namespaceCharacter)+1, strlen($name)); + $name = substr($name, strrpos($name, $this->namespaceCharacter) + 1, strlen($name)); } return $name; diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php index 0ec8e7bc99..0aaeb6baa1 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php @@ -119,14 +119,14 @@ class CookieTest extends \PHPUnit_Framework_TestCase public function testCookieIsNotCleared() { - $cookie = new Cookie('foo', 'bar', time()+3600*24); + $cookie = new Cookie('foo', 'bar', time() + 3600 * 24); $this->assertFalse($cookie->isCleared(), '->isCleared() returns false if the cookie did not expire yet'); } public function testCookieIsCleared() { - $cookie = new Cookie('foo', 'bar', time()-20); + $cookie = new Cookie('foo', 'bar', time() - 20); $this->assertTrue($cookie->isCleared(), '->isCleared() returns true if the cookie has expired'); } @@ -137,7 +137,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie'); $cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com'); - $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time()-31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL'); + $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL'); $cookie = new Cookie('foo', 'bar', 0, '/', ''); $this->assertEquals('foo=bar; path=/; httponly', $cookie->__toString()); diff --git a/src/Symfony/Component/Intl/Resources/bin/common.php b/src/Symfony/Component/Intl/Resources/bin/common.php index 59b2f5eb30..2e3c026217 100644 --- a/src/Symfony/Component/Intl/Resources/bin/common.php +++ b/src/Symfony/Component/Intl/Resources/bin/common.php @@ -29,7 +29,7 @@ function strip_minor_versions($version) function centered($text) { - $padding = (int) ((LINE_WIDTH - strlen($text))/2); + $padding = (int) ((LINE_WIDTH - strlen($text)) / 2); return str_repeat(' ', $padding).$text; } diff --git a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php index 55aac6b707..d061317799 100644 --- a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php @@ -60,8 +60,8 @@ class ApacheUrlMatcher extends UrlMatcher continue; } if (false !== $pos = strpos($name, '_', 9)) { - $type = substr($name, 9, $pos-9); - $name = substr($name, $pos+1); + $type = substr($name, 9, $pos - 9); + $name = substr($name, $pos + 1); } else { $type = substr($name, 9); } diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index 79ec42e62f..219f2fc036 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -68,7 +68,7 @@ class ApacheMatcherDumper extends MatcherDumper $variables[] = sprintf('E=__ROUTING_host_%s:1', $hostRegexUnique); foreach ($compiledRoute->getHostVariables() as $i => $variable) { - $variables[] = sprintf('E=__ROUTING_host_%s_%s:%%%d', $hostRegexUnique, $variable, $i+1); + $variables[] = sprintf('E=__ROUTING_host_%s_%s:%%%d', $hostRegexUnique, $variable, $i + 1); } $variables = implode(',', $variables); diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php index 7db9eb24ee..c94377359f 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php @@ -67,7 +67,7 @@ class DumperPrefixCollection extends DumperCollection // Prefix starts with route's prefix if ('' === $collection->prefix || 0 === strpos($prefix, $collection->prefix)) { $child = new DumperPrefixCollection(); - $child->setPrefix(substr($prefix, 0, strlen($collection->prefix)+1)); + $child->setPrefix(substr($prefix, 0, strlen($collection->prefix) + 1)); $collection->add($child); return $child->addPrefixRoute($route); diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 5074614bd3..2cc2111695 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -104,7 +104,7 @@ class AclProvider implements AclProviderInterface $currentBatch = array(); $oidLookup = array(); - for ($i = 0, $c = count($oids); $i<$c; $i++) { + for ($i = 0, $c = count($oids); $i < $c; $i++) { $oid = $oids[$i]; $oidLookupKey = $oid->getIdentifier().$oid->getType(); $oidLookup[$oidLookupKey] = $oid; @@ -313,7 +313,7 @@ SELECTCLAUSE; $this->connection->quote($batch[$i]->getType()) ); - if ($i+1 < $count) { + if ($i + 1 < $count) { $sql .= ' OR '; } } diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php index c34d752942..74f52ce321 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php @@ -786,7 +786,7 @@ QUERY; $sids = new \SplObjectStorage(); $classIds = new \SplObjectStorage(); foreach ($changes[1] as $field => $new) { - for ($i = 0, $c = count($new); $i<$c; $i++) { + for ($i = 0, $c = count($new); $i < $c; $i++) { $ace = $new[$i]; if (null === $ace->getId()) { @@ -860,7 +860,7 @@ QUERY; $sids = new \SplObjectStorage(); $classIds = new \SplObjectStorage(); - for ($i = 0, $c = count($new); $i<$c; $i++) { + for ($i = 0, $c = count($new); $i < $c; $i++) { $ace = $new[$i]; if (null === $ace->getId()) { @@ -901,7 +901,7 @@ QUERY; list($old, $new) = $changes; $currentIds = array(); - for ($i = 0, $c = count($new); $i<$c; $i++) { + for ($i = 0, $c = count($new); $i < $c; $i++) { $ace = $new[$i]; if (null !== $ace->getId()) { diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index 43ce32a944..364f6b8c7f 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -415,8 +415,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged $this->$property = array_values($this->$property); $this->onPropertyChanged($property, $oldValue, $this->$property); - for ($i = $index, $c = count($this->$property); $i<$c; $i++) { - $this->onEntryPropertyChanged($aces[$i], 'aceOrder', $i+1, $i); + for ($i = $index, $c = count($this->$property); $i < $c; $i++) { + $this->onEntryPropertyChanged($aces[$i], 'aceOrder', $i + 1, $i); } } @@ -441,8 +441,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged $aces[$field] = array_values($aces[$field]); $this->onPropertyChanged($property, $oldValue, $this->$property); - for ($i = $index, $c = count($aces[$field]); $i<$c; $i++) { - $this->onEntryPropertyChanged($aces[$field][$i], 'aceOrder', $i+1, $i); + for ($i = $index, $c = count($aces[$field]); $i < $c; $i++) { + $this->onEntryPropertyChanged($aces[$field][$i], 'aceOrder', $i + 1, $i); } } @@ -486,8 +486,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged array_slice($this->$property, $index) ); - for ($i = $index, $c = count($this->$property)-1; $i<$c; $i++) { - $this->onEntryPropertyChanged($aces[$i+1], 'aceOrder', $i, $i+1); + for ($i = $index, $c = count($this->$property) - 1; $i < $c; $i++) { + $this->onEntryPropertyChanged($aces[$i + 1], 'aceOrder', $i, $i + 1); } } @@ -544,8 +544,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged array_slice($aces[$field], $index) ); - for ($i = $index, $c = count($aces[$field])-1; $i<$c; $i++) { - $this->onEntryPropertyChanged($aces[$field][$i+1], 'aceOrder', $i, $i+1); + for ($i = $index, $c = count($aces[$field]) - 1; $i < $c; $i++) { + $this->onEntryPropertyChanged($aces[$field][$i + 1], 'aceOrder', $i, $i + 1); } } diff --git a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php index 39fe4e7927..c45e2f9741 100644 --- a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php +++ b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php @@ -128,7 +128,7 @@ class MaskBuilder $length = strlen($pattern); $bitmask = str_pad(decbin($this->mask), $length, '0', STR_PAD_LEFT); - for ($i = $length-1; $i >= 0; $i--) { + for ($i = $length - 1; $i >= 0; $i--) { if ('1' === $bitmask[$i]) { try { $pattern[$i] = self::getCode(1 << ($length - $i - 1)); diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index c239f8c25f..d2dc6688e1 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -235,7 +235,7 @@ abstract class AbstractToken implements TokenInterface public function __toString() { $class = get_class($this); - $class = substr($class, strrpos($class, '\\')+1); + $class = substr($class, strrpos($class, '\\') + 1); $roles = array(); foreach ($this->roles as $role) { diff --git a/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderBenchmarkTest.php b/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderBenchmarkTest.php index f1c9554b08..265700167c 100644 --- a/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderBenchmarkTest.php +++ b/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderBenchmarkTest.php @@ -92,7 +92,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase $this->insertEntryStmt = $this->con->prepare('INSERT INTO acl_entries (id, class_id, object_identity_id, field_name, ace_order, security_identity_id, mask, granting, granting_strategy, audit_success, audit_failure) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'); $this->insertOidAncestorStmt = $this->con->prepare('INSERT INTO acl_object_identity_ancestors (object_identity_id, ancestor_id) VALUES (?, ?)'); - for ($i = 0; $i<40000; $i++) { + for ($i = 0; $i < 40000; $i++) { $this->generateAclHierarchy(); } } @@ -107,7 +107,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase protected function generateAclLevel($depth, $parentId, $ancestors) { $level = count($ancestors); - for ($i = 0, $t = rand(1, 10); $i<$t; $i++) { + for ($i = 0, $t = rand(1, 10); $i < $t; $i++) { $id = $this->generateAcl($this->chooseClassId(), $parentId, $ancestors); if ($level < $depth) { @@ -124,9 +124,9 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase $this->insertClassStmt->execute(array($id, $this->getRandomString(rand(20, 100), 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\_'))); ++$id; - return $id-1; + return $id - 1; } else { - return rand(1000, $id-1); + return rand(1000, $id - 1); } } @@ -150,7 +150,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase $this->generateAces($classId, $id); ++$id; - return $id-1; + return $id - 1; } protected function chooseSid() @@ -165,9 +165,9 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase )); ++$id; - return $id-1; + return $id - 1; } else { - return rand(1000, $id-1); + return rand(1000, $id - 1); } } @@ -185,7 +185,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase $sid = $this->chooseSid(); } while (array_key_exists($sid, $sids) && in_array($fieldName, $sids[$sid], true)); - $fieldOrder[$fieldName] = array_key_exists($fieldName, $fieldOrder) ? $fieldOrder[$fieldName]+1 : 0; + $fieldOrder[$fieldName] = array_key_exists($fieldName, $fieldOrder) ? $fieldOrder[$fieldName] + 1 : 0; if (!isset($sids[$sid])) { $sids[$sid] = array(); } @@ -238,7 +238,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase $cLength = strlen($chars); while (strlen($s) < $length) { - $s .= $chars[mt_rand(0, $cLength-1)]; + $s .= $chars[mt_rand(0, $cLength - 1)]; } return $s; diff --git a/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php b/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php index a8cc660614..316b049166 100644 --- a/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php +++ b/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php @@ -49,7 +49,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase $f += $c[$i] * $c[$i]; } - $Y = 16/5000 * $f - 5000; + $Y = 16 / 5000 * $f - 5000; $this->assertTrue($Y > 1.03 && $Y < 57.4, 'Poker test failed, Y = '.$Y); } diff --git a/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php index 7947753d98..4606003fa0 100644 --- a/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php +++ b/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php @@ -43,7 +43,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase $userProvider = $this->getProvider(); $service = $this->getService($userProvider, array('name' => 'foo', 'path' => null, 'domain' => null, 'always_remember_me' => true, 'lifetime' => 3600)); $request = new Request(); - $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time()+3600, 'foopass')); + $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() + 3600, 'foopass')); $userProvider ->expects($this->once()) @@ -129,7 +129,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase $service = $this->getService($userProvider, array('name' => 'foo', 'always_remember_me' => true, 'lifetime' => 3600)); $request = new Request(); - $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time()+3600, 'foopass')); + $request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() + 3600, 'foopass')); $returnedToken = $service->autoLogin($request); diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php index 9f51af3ba6..8c8f1a297a 100644 --- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php @@ -165,7 +165,7 @@ class PoFileLoader extends ArrayLoader end($plurals); $count = key($plurals); // Fill missing spots with '-'. - $empties = array_fill(0, $count+1, '-'); + $empties = array_fill(0, $count + 1, '-'); $plurals += $empties; ksort($plurals); $messages[stripcslashes($item['ids']['plural'])] = stripcslashes(implode('|', $plurals)); diff --git a/src/Symfony/Component/Validator/Constraints/IssnValidator.php b/src/Symfony/Component/Validator/Constraints/IssnValidator.php index 8d9609fa3f..ec75982277 100644 --- a/src/Symfony/Component/Validator/Constraints/IssnValidator.php +++ b/src/Symfony/Component/Validator/Constraints/IssnValidator.php @@ -60,7 +60,7 @@ class IssnValidator extends ConstraintValidator for ($i = 0; $i < 7; ++$i) { // Multiply the first digit by 8, the second by 7, etc. - $checkSum += (8-$i) * $canonical{$i}; + $checkSum += (8 - $i) * $canonical{$i}; } if (0 !== $checkSum % 11) { diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php index 4df3f7072d..2516b4bfc1 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php @@ -151,7 +151,7 @@ abstract class FileValidatorTest extends AbstractConstraintValidatorTest */ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limitAsString, $suffix) { - fseek($this->file, $bytesWritten-1, SEEK_SET); + fseek($this->file, $bytesWritten - 1, SEEK_SET); fwrite($this->file, '0'); fclose($this->file); @@ -200,7 +200,7 @@ abstract class FileValidatorTest extends AbstractConstraintValidatorTest */ public function testMaxSizeNotExceeded($bytesWritten, $limit) { - fseek($this->file, $bytesWritten-1, SEEK_SET); + fseek($this->file, $bytesWritten - 1, SEEK_SET); fwrite($this->file, '0'); fclose($this->file); From 2367f4a5a2db1a963bf1c89fa8870d87c27c1aaf Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Fri, 27 Mar 2015 23:06:33 +0100 Subject: [PATCH 05/10] CS: Unary operators should be placed adjacent to their operands --- .../Doctrine/Form/Type/DoctrineType.php | 2 +- .../LazyProxy/Fixtures/php/lazy_service.php | 2 +- .../DomCrawler/FormFieldRegistry.php | 16 +++++++------- .../Form/Extension/Core/Type/ChoiceType.php | 2 +- .../Attribute/NamespacedAttributeBag.php | 8 +++---- .../Profiler/AbstractProfilerStorageTest.php | 2 +- .../PropertyAccess/PropertyAccessor.php | 22 +++++++++---------- .../Security/Acl/Dbal/AclProvider.php | 4 ++-- .../Component/Security/Acl/Domain/Acl.php | 12 +++++----- .../Authentication/Token/AbstractToken.php | 2 +- .../Translation/Loader/ArrayLoader.php | 2 +- .../Component/Validator/Constraint.php | 2 +- src/Symfony/Component/Yaml/Parser.php | 8 +++---- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php index fe2d0cb44e..3b4abc2668 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php @@ -60,7 +60,7 @@ abstract class DoctrineType extends AbstractType public function setDefaultOptions(OptionsResolverInterface $resolver) { - $choiceListCache = & $this->choiceListCache; + $choiceListCache = &$this->choiceListCache; $registry = $this->registry; $propertyAccessor = $this->propertyAccessor; $type = $this; diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php index 262252e1e8..457686c80d 100644 --- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php +++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php @@ -49,7 +49,7 @@ class LazyServiceProjectServiceContainer extends Container $container = $this; return $this->services['foo'] = new stdClass_c1d194250ee2e2b7d2eab8b8212368a8( - function (& $wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) { + function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) { $wrappedInstance = $container->getFooService(false); $proxy->setProxyInitializer(null); diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php index 27f93c94de..6a38e86691 100644 --- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php +++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php @@ -33,16 +33,16 @@ class FormFieldRegistry { $segments = $this->getSegments($field->getName()); - $target = & $this->fields; + $target = &$this->fields; while ($segments) { if (!is_array($target)) { $target = array(); } $path = array_shift($segments); if ('' === $path) { - $target = & $target[]; + $target = &$target[]; } else { - $target = & $target[$path]; + $target = &$target[$path]; } } $target = $field; @@ -58,13 +58,13 @@ class FormFieldRegistry public function remove($name) { $segments = $this->getSegments($name); - $target = & $this->fields; + $target = &$this->fields; while (count($segments) > 1) { $path = array_shift($segments); if (!array_key_exists($path, $target)) { return; } - $target = & $target[$path]; + $target = &$target[$path]; } unset($target[array_shift($segments)]); } @@ -82,13 +82,13 @@ class FormFieldRegistry public function &get($name) { $segments = $this->getSegments($name); - $target = & $this->fields; + $target = &$this->fields; while ($segments) { $path = array_shift($segments); if (!array_key_exists($path, $target)) { throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path)); } - $target = & $target[$path]; + $target = &$target[$path]; } return $target; @@ -123,7 +123,7 @@ class FormFieldRegistry */ public function set($name, $value) { - $target = & $this->get($name); + $target = &$this->get($name); if (!is_array($value) || $target instanceof Field\ChoiceFormField) { $target->setValue($value); } else { diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index 418661aebe..bde4ba723f 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -160,7 +160,7 @@ class ChoiceType extends AbstractType */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $choiceListCache = & $this->choiceListCache; + $choiceListCache = &$this->choiceListCache; $choiceList = function (Options $options) use (&$choiceListCache) { // Harden against NULL values (like in EntityType and ModelType) diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php index 132d28fbd5..193ec0c067 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php @@ -73,7 +73,7 @@ class NamespacedAttributeBag extends AttributeBag */ public function set($name, $value) { - $attributes = & $this->resolveAttributePath($name, true); + $attributes = &$this->resolveAttributePath($name, true); $name = $this->resolveKey($name); $attributes[$name] = $value; } @@ -84,7 +84,7 @@ class NamespacedAttributeBag extends AttributeBag public function remove($name) { $retval = null; - $attributes = & $this->resolveAttributePath($name); + $attributes = &$this->resolveAttributePath($name); $name = $this->resolveKey($name); if (null !== $attributes && array_key_exists($name, $attributes)) { $retval = $attributes[$name]; @@ -106,7 +106,7 @@ class NamespacedAttributeBag extends AttributeBag */ protected function &resolveAttributePath($name, $writeContext = false) { - $array = & $this->attributes; + $array = &$this->attributes; $name = (strpos($name, $this->namespaceCharacter) === 0) ? substr($name, 1) : $name; // Check if there is anything to do, else return @@ -132,7 +132,7 @@ class NamespacedAttributeBag extends AttributeBag $array[$part] = $writeContext ? array() : null; } - $array = & $array[$part]; + $array = &$array[$part]; } return $array; diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php index fdd7920aed..07dff696d6 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php @@ -17,7 +17,7 @@ abstract class AbstractProfilerStorageTest extends \PHPUnit_Framework_TestCase { public function testStore() { - for ($i = 0; $i < 10; $i ++) { + for ($i = 0; $i < 10; $i++) { $profile = new Profile('token_'.$i); $profile->setIp('127.0.0.1'); $profile->setUrl('http://foo.bar'); diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 2aeb1a8a6e..f516e123d8 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -44,7 +44,7 @@ class PropertyAccessor implements PropertyAccessorInterface $propertyPath = new PropertyPath($propertyPath); } - $propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength()); + $propertyValues = &$this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength()); return $propertyValues[count($propertyValues) - 1][self::VALUE]; } @@ -58,7 +58,7 @@ class PropertyAccessor implements PropertyAccessorInterface $propertyPath = new PropertyPath($propertyPath); } - $propertyValues = & $this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength() - 1); + $propertyValues = &$this->readPropertiesUntil($objectOrArray, $propertyPath, $propertyPath->getLength() - 1); $overwrite = true; // Add the root object to the list @@ -68,7 +68,7 @@ class PropertyAccessor implements PropertyAccessorInterface )); for ($i = count($propertyValues) - 1; $i >= 0; --$i) { - $objectOrArray = & $propertyValues[$i][self::VALUE]; + $objectOrArray = &$propertyValues[$i][self::VALUE]; if ($overwrite) { $property = $propertyPath->getElement($i); @@ -82,7 +82,7 @@ class PropertyAccessor implements PropertyAccessorInterface } } - $value = & $objectOrArray; + $value = &$objectOrArray; $overwrite = !$propertyValues[$i][self::IS_REF]; } } @@ -122,19 +122,19 @@ class PropertyAccessor implements PropertyAccessorInterface } if ($isIndex) { - $propertyValue = & $this->readIndex($objectOrArray, $property); + $propertyValue = &$this->readIndex($objectOrArray, $property); } else { - $propertyValue = & $this->readProperty($objectOrArray, $property); + $propertyValue = &$this->readProperty($objectOrArray, $property); } - $objectOrArray = & $propertyValue[self::VALUE]; + $objectOrArray = &$propertyValue[self::VALUE]; // the final value of the path must not be validated if ($i + 1 < $propertyPath->getLength() && !is_object($objectOrArray) && !is_array($objectOrArray)) { throw new UnexpectedTypeException($objectOrArray, 'object or array'); } - $propertyValues[] = & $propertyValue; + $propertyValues[] = &$propertyValue; } return $propertyValues; @@ -164,7 +164,7 @@ class PropertyAccessor implements PropertyAccessorInterface if (isset($array[$index])) { if (is_array($array)) { - $result[self::VALUE] = & $array[$index]; + $result[self::VALUE] = &$array[$index]; $result[self::IS_REF] = true; } else { $result[self::VALUE] = $array[$index]; @@ -216,7 +216,7 @@ class PropertyAccessor implements PropertyAccessorInterface } elseif ($reflClass->hasMethod('__get') && $reflClass->getMethod('__get')->isPublic()) { $result[self::VALUE] = $object->$property; } elseif ($classHasProperty && $reflClass->getProperty($property)->isPublic()) { - $result[self::VALUE] = & $object->$property; + $result[self::VALUE] = &$object->$property; $result[self::IS_REF] = true; } elseif (!$classHasProperty && property_exists($object, $property)) { // Needed to support \stdClass instances. We need to explicitly @@ -224,7 +224,7 @@ class PropertyAccessor implements PropertyAccessorInterface // a *protected* property was found on the class, property_exists() // returns true, consequently the following line will result in a // fatal error. - $result[self::VALUE] = & $object->$property; + $result[self::VALUE] = &$object->$property; $result[self::IS_REF] = true; } elseif ($this->magicCall && $reflClass->hasMethod('__call') && $reflClass->getMethod('__call')->isPublic()) { // we call the getter and hope the __call do the job diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 5074614bd3..66db70eb7f 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -507,8 +507,8 @@ QUERY; $acls = $aces = $emptyArray = array(); $oidCache = $oidLookup; $result = new \SplObjectStorage(); - $loadedAces = & $this->loadedAces; - $loadedAcls = & $this->loadedAcls; + $loadedAces = &$this->loadedAces; + $loadedAcls = &$this->loadedAcls; $permissionGrantingStrategy = $this->permissionGrantingStrategy; // we need these to set protected properties on hydrated objects diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index 43ce32a944..f8cb519c90 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -405,7 +405,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged */ private function deleteAce($property, $index) { - $aces = & $this->$property; + $aces = &$this->$property; if (!isset($aces[$index])) { throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index)); } @@ -431,7 +431,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged */ private function deleteFieldAce($property, $index, $field) { - $aces = & $this->$property; + $aces = &$this->$property; if (!isset($aces[$field][$index])) { throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index)); } @@ -477,7 +477,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged } } - $aces = & $this->$property; + $aces = &$this->$property; $oldValue = $this->$property; if (isset($aces[$index])) { $this->$property = array_merge( @@ -527,7 +527,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged } } - $aces = & $this->$property; + $aces = &$this->$property; if (!isset($aces[$field])) { $aces[$field] = array(); } @@ -565,7 +565,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged */ private function updateAce($property, $index, $mask, $strategy = null) { - $aces = & $this->$property; + $aces = &$this->$property; if (!isset($aces[$index])) { throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index)); } @@ -626,7 +626,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged throw new \InvalidArgumentException('$field cannot be empty.'); } - $aces = & $this->$property; + $aces = &$this->$property; if (!isset($aces[$field][$index])) { throw new \OutOfBoundsException(sprintf('The index "%d" does not exist.', $index)); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index c239f8c25f..a71bd06116 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -252,7 +252,7 @@ abstract class AbstractToken implements TokenInterface } if ($this->user instanceof EquatableInterface) { - return ! (bool) $this->user->isEqualTo($user); + return !(bool) $this->user->isEqualTo($user); } if ($this->user->getPassword() !== $user->getPassword()) { diff --git a/src/Symfony/Component/Translation/Loader/ArrayLoader.php b/src/Symfony/Component/Translation/Loader/ArrayLoader.php index ba4003bfc1..68ba81d465 100644 --- a/src/Symfony/Component/Translation/Loader/ArrayLoader.php +++ b/src/Symfony/Component/Translation/Loader/ArrayLoader.php @@ -53,7 +53,7 @@ class ArrayLoader implements LoaderInterface private function flatten(array &$messages, array $subnode = null, $path = null) { if (null === $subnode) { - $subnode = & $messages; + $subnode = &$messages; } foreach ($subnode as $key => $value) { if (is_array($value)) { diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php index 780d8705fc..0ac47fd0b5 100644 --- a/src/Symfony/Component/Validator/Constraint.php +++ b/src/Symfony/Component/Validator/Constraint.php @@ -103,7 +103,7 @@ abstract class Constraint $invalidOptions[] = $option; } } - } elseif (null !== $options && ! (is_array($options) && count($options) === 0)) { + } elseif (null !== $options && !(is_array($options) && count($options) === 0)) { $option = $this->getDefaultOption(); if (null === $option) { diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php index f815931507..9ecb206ce2 100644 --- a/src/Symfony/Component/Yaml/Parser.php +++ b/src/Symfony/Component/Yaml/Parser.php @@ -92,7 +92,7 @@ class Parser if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) { $c = $this->getRealCurrentLineNb() + 1; $parser = new Parser($c); - $parser->refs = & $this->refs; + $parser->refs = &$this->refs; $data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport); } else { if (isset($values['leadspaces']) @@ -101,7 +101,7 @@ class Parser // this is a compact notation element, add to next block and parse $c = $this->getRealCurrentLineNb(); $parser = new Parser($c); - $parser->refs = & $this->refs; + $parser->refs = &$this->refs; $block = $values['value']; if ($this->isNextLineIndented()) { @@ -144,7 +144,7 @@ class Parser } $c = $this->getRealCurrentLineNb() + 1; $parser = new Parser($c); - $parser->refs = & $this->refs; + $parser->refs = &$this->refs; $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport); $merged = array(); @@ -181,7 +181,7 @@ class Parser } else { $c = $this->getRealCurrentLineNb() + 1; $parser = new Parser($c); - $parser->refs = & $this->refs; + $parser->refs = &$this->refs; $data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport); } } else { From 5f133b3903518ef03e66b374958f0a3c6905cd73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Egyed?= <1ed@mailbox.hu> Date: Sat, 28 Mar 2015 18:46:14 +0100 Subject: [PATCH 06/10] [Validator] Fixed grammar in Hungarian translation --- .../Validator/Resources/translations/validators.hu.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf index 3f9bc42337..17126a481e 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf @@ -36,7 +36,7 @@ This field was not expected. - Ez a mező nem számítottak. + Nem várt mező. This field is missing. From 933a449be70bb2a61c4069a935f8bb46f4616b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Egyed?= <1ed@mailbox.hu> Date: Sat, 28 Mar 2015 19:25:46 +0100 Subject: [PATCH 07/10] [Validator] Added missing Hungarian translation --- .../Validator/Resources/translations/validators.hu.xlf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf index 3f9bc42337..f59e470bea 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf @@ -278,6 +278,10 @@ This value should not be identical to {{ compared_value_type }} {{ compared_value }}. Ez az érték ne legyen ugyanolyan mint {{ compared_value_type }} {{ compared_value }}. + + This value does not match the expected {{ charset }} charset. + Ez az érték nem az elvárt {{ charset }} karakterkódolást használja. + From b73502241a57a3f4e8dacf4821dcf6ead53f633b Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Sun, 29 Mar 2015 01:46:53 -0500 Subject: [PATCH 08/10] [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition --- .../Config/Definition/Builder/ArrayNodeDefinition.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index d2226f63f1..003f9ae1ca 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -287,9 +287,10 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition * Allows extra config keys to be specified under an array without * throwing an exception. * - * Those config values are simply ignored. This should be used only - * in special cases where you want to send an entire configuration - * array through a special tree that processes only part of the array. + * Those config values are simply ignored and removed from the + * resulting array. This should be used only in special cases where + * you want to send an entire configuration array through a special + * tree that processes only part of the array. * * @return ArrayNodeDefinition */ From e848040e9e9444e9864776ababb2a597aecb7d0d Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 30 Mar 2015 09:37:12 +0200 Subject: [PATCH 09/10] Add parsing of hexadecimal strings for PHP 7 PHP 7 does not handle the hexadecimal notation in is_numeric checks anymore, so the detection needs to be implemented explicitly. --- src/Symfony/Component/Config/Util/XmlUtils.php | 2 ++ src/Symfony/Component/Yaml/Inline.php | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php index 34ad20e459..56613bbb42 100644 --- a/src/Symfony/Component/Config/Util/XmlUtils.php +++ b/src/Symfony/Component/Config/Util/XmlUtils.php @@ -200,6 +200,8 @@ class XmlUtils return false; case is_numeric($value): return '0x' === $value[0].$value[1] ? hexdec($value) : (float) $value; + case preg_match('/^0x[0-9a-f]++$/i', $value): + return hexdec($value); case preg_match('/^(-|\+)?[0-9]+(\.[0-9]+)?$/', $value): return (float) $value; default: diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 6564ad4422..6d21a48f41 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -137,6 +137,7 @@ class Inline case Escaper::requiresDoubleQuoting($value): return Escaper::escapeWithDoubleQuotes($value); case Escaper::requiresSingleQuoting($value): + case preg_match(self::getHexRegex(), $value): case preg_match(self::getTimestampRegex(), $value): return Escaper::escapeWithSingleQuotes($value); default: @@ -454,6 +455,7 @@ class Inline return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw); case is_numeric($scalar): + case preg_match(self::getHexRegex(), $scalar): return '0x' === $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar; case '.inf' === $scalarLower: case '.nan' === $scalarLower: @@ -494,4 +496,14 @@ class Inline $~x EOF; } + + /** + * Gets a regex that matches a YAML number in hexadecimal notation. + * + * @return string + */ + private static function getHexRegex() + { + return '~^0x[0-9a-f]++$~i'; + } } From d748374c5cae276301d7efb214c06eb8cfe6724a Mon Sep 17 00:00:00 2001 From: Andreia Bohner Date: Fri, 27 Mar 2015 21:50:51 -0300 Subject: [PATCH 10/10] [Validator] Add missing pt_BR translations --- .../translations/validators.pt_BR.xlf | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf index 70f5ba47bb..12eb408e3b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf @@ -278,6 +278,38 @@ This value should not be identical to {{ compared_value_type }} {{ compared_value }}. Este valor não deve ser idêntico a {{ compared_value_type }} {{ compared_value }}. + + The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}. + A proporção da imagem é muito grande ({{ ratio }}). A proporção máxima permitida é {{ max_ratio }}. + + + The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}. + A proporção da imagem é muito pequena ({{ ratio }}). A proporção mínima esperada é {{ min_ratio }}. + + + The image is square ({{ width }}x{{ height }}px). Square images are not allowed. + A imagem está num formato quadrado ({{ width }}x{{ height }}px). Imagens com formato quadrado não são permitidas. + + + The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed. + A imagem está orientada à paisagem ({{ width }}x{{ height }}px). Imagens orientadas à paisagem não são permitidas. + + + The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed. + A imagem está orientada ao retrato ({{ width }}x{{ height }}px). Imagens orientadas ao retrato não são permitidas. + + + An empty file is not allowed. + Arquivo vazio não é permitido. + + + The host could not be resolved. + O host não pôde ser resolvido. + + + This value does not match the expected {{ charset }} charset. + Este valor não corresponde ao charset {{ charset }} esperado. +