Merge branch '2.3' into 2.6
* 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
This commit is contained in:
Fabien Potencier
commit
6cd873447d
21
.travis.yml
21
.travis.yml
|
|
@ -11,8 +11,10 @@ matrix:
|
|||
env: deps=low
|
||||
- php: 5.6
|
||||
env: deps=high
|
||||
- php: nightly
|
||||
- php: hhvm-nightly
|
||||
allow_failures:
|
||||
- php: nightly
|
||||
- php: hhvm-nightly
|
||||
fast_finish: true
|
||||
|
||||
|
|
@ -26,12 +28,12 @@ env:
|
|||
before_install:
|
||||
- travis_retry sudo apt-get install parallel
|
||||
- composer self-update
|
||||
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then phpenv config-rm xdebug.ini; fi;
|
||||
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
|
||||
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
|
||||
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then pecl install -f memcached-2.1.0; fi;
|
||||
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
|
||||
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then php -i; fi;
|
||||
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then phpenv config-rm xdebug.ini; fi;
|
||||
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
|
||||
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
|
||||
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then pecl install -f memcached-2.1.0; fi;
|
||||
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
|
||||
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then php -i; fi;
|
||||
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
|
||||
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
|
||||
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
|
||||
|
|
@ -40,7 +42,8 @@ install:
|
|||
- if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
|
||||
|
||||
script:
|
||||
- if [ "$deps" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
|
||||
- components=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n')
|
||||
- if [ "$deps" = "no" ]; then echo "$components" | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
|
||||
- if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
|
||||
- if [ "$deps" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
|
||||
- if [ "$deps" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
|
||||
- if [ "$deps" = "high" ]; then echo "$components" | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
|
||||
- if [ "$deps" = "low" ]; then echo "$components" | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ class Configuration implements ConfigurationInterface
|
|||
);
|
||||
|
||||
foreach ($urls as $i => $url) {
|
||||
if (is_integer($i)) {
|
||||
if (is_int($i)) {
|
||||
if (0 === strpos($url, 'https://') || 0 === strpos($url, '//')) {
|
||||
$urls['http'][] = $urls['ssl'][] = $url;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ class FrameworkExtension extends Extension
|
|||
'memcached' => 'Symfony\Component\HttpKernel\Profiler\MemcachedProfilerStorage',
|
||||
'redis' => 'Symfony\Component\HttpKernel\Profiler\RedisProfilerStorage',
|
||||
);
|
||||
list($class, ) = explode(':', $config['dsn'], 2);
|
||||
list($class) = explode(':', $config['dsn'], 2);
|
||||
if (!isset($supported[$class])) {
|
||||
throw new \LogicException(sprintf('Driver "%s" is not supported for the profiler.', $class));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -472,7 +472,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
|
|||
);
|
||||
}
|
||||
|
||||
if (null !== $this->key && (null === $this->addDefaultChildren || is_integer($this->addDefaultChildren) && $this->addDefaultChildren > 0)) {
|
||||
if (null !== $this->key && (null === $this->addDefaultChildren || is_int($this->addDefaultChildren) && $this->addDefaultChildren > 0)) {
|
||||
throw new InvalidDefinitionException(
|
||||
sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s"', $path)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ class PrototypedArrayNode extends ArrayNode
|
|||
if (null === $children) {
|
||||
$this->defaultChildren = array('defaults');
|
||||
} else {
|
||||
$this->defaultChildren = is_integer($children) && $children > 0 ? range(1, $children) : (array) $children;
|
||||
$this->defaultChildren = is_int($children) && $children > 0 ? range(1, $children) : (array) $children;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ class XmlUtils
|
|||
LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
|
||||
$error->code,
|
||||
trim($error->message),
|
||||
$error->file ? $error->file : 'n/a',
|
||||
$error->file ?: 'n/a',
|
||||
$error->line,
|
||||
$error->column
|
||||
);
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
|
|||
));
|
||||
}
|
||||
|
||||
if (false === array_search(static::$availableOptions[$option], $this->options)) {
|
||||
if (!in_array(static::$availableOptions[$option], $this->options)) {
|
||||
$this->options[] = static::$availableOptions[$option];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ class LegacyDialogHelperTest extends \PHPUnit_Framework_TestCase
|
|||
protected function getInputStream($input)
|
||||
{
|
||||
$stream = fopen('php://memory', 'r+', false);
|
||||
fputs($stream, $input);
|
||||
fwrite($stream, $input);
|
||||
rewind($stream);
|
||||
|
||||
return $stream;
|
||||
|
|
|
|||
|
|
@ -1169,7 +1169,7 @@ EOF;
|
|||
$behavior[$id] = $argument->getInvalidBehavior();
|
||||
}
|
||||
|
||||
$calls[$id] += 1;
|
||||
++$calls[$id];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1478,12 +1478,12 @@ EOF;
|
|||
}
|
||||
|
||||
while ($i > 0) {
|
||||
$i -= 1;
|
||||
--$i;
|
||||
$name .= $nonFirstChars[$i%$nonFirstCharsLength];
|
||||
$i = intval($i/$nonFirstCharsLength);
|
||||
}
|
||||
|
||||
$this->variableCount += 1;
|
||||
++$this->variableCount;
|
||||
|
||||
// check that the name is not reserved
|
||||
if (in_array($name, $this->reservedVariables, true)) {
|
||||
|
|
|
|||
|
|
@ -260,7 +260,8 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
|
|||
$builder->setResourceTracking(false);
|
||||
$builderCompilerPasses = $builder->getCompiler()->getPassConfig()->getPasses();
|
||||
$builder->addCompilerPass($this->getMock('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface'));
|
||||
$this->assertEquals(sizeof($builderCompilerPasses) + 1, sizeof($builder->getCompiler()->getPassConfig()->getPasses()));
|
||||
|
||||
$this->assertCount(count($builder->getCompiler()->getPassConfig()->getPasses()) - 1, $builderCompilerPasses);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$container = new ContainerBuilder();
|
||||
$container->setDefinition('test', $definition);
|
||||
$container->setParameter('foo', 'wiz'.dirname(dirname(__FILE__)));
|
||||
$container->setParameter('bar', dirname(__FILE__));
|
||||
$container->setParameter('foo', 'wiz'.dirname(__DIR__));
|
||||
$container->setParameter('bar', __DIR__);
|
||||
$container->setParameter('baz', '%bar%/PhpDumperTest.php');
|
||||
$container->setParameter('buz', dirname(dirname(__DIR__)));
|
||||
$container->compile();
|
||||
|
|
|
|||
|
|
@ -45,9 +45,10 @@ class Crawler extends \SplObjectStorage
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param mixed $node A Node to use as the base for the crawling
|
||||
* @param mixed $node A Node to use as the base for the crawling
|
||||
* @param string $currentUri The current URI
|
||||
* @param string $baseHref The base href value
|
||||
* @param string $baseHref The base href value
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function __construct($node = null, $currentUri = null, $baseHref = null)
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ EOF
|
|||
{
|
||||
$crawler = $this->createTestCrawler()->filterXPath('//ul[1]/li');
|
||||
$nodes = $crawler->reduce(function ($node, $i) {
|
||||
return $i == 1 ? false : true;
|
||||
return $i !== 1;
|
||||
});
|
||||
$this->assertNotSame($nodes, $crawler, '->reduce() returns a new instance of a crawler');
|
||||
$this->assertInstanceOf('Symfony\\Component\\DomCrawler\\Crawler', $nodes, '->reduce() returns a new instance of a crawler');
|
||||
|
|
|
|||
|
|
@ -67,8 +67,7 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
|
|||
// Unset instead of resetting to an empty array, in order to allow
|
||||
// implementations (like TwigRendererEngine) to check whether $cacheKey
|
||||
// is set at all.
|
||||
unset($this->resources[$cacheKey]);
|
||||
unset($this->resourceHierarchyLevels[$cacheKey]);
|
||||
unset($this->resources[$cacheKey], $this->resourceHierarchyLevels[$cacheKey]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -138,8 +138,7 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
|
|||
throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
|
||||
}
|
||||
|
||||
unset($this->unresolvedChildren[$name]);
|
||||
unset($this->children[$name]);
|
||||
unset($this->unresolvedChildren[$name], $this->children[$name]);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ namespace Symfony\Component\Form;
|
|||
|
||||
/**
|
||||
* To learn more about how form events work check the documentation
|
||||
* entry at {@link http://symfony.com/doc/any/components/form/form_events.html}
|
||||
* entry at {@link http://symfony.com/doc/any/components/form/form_events.html}.
|
||||
*
|
||||
* To learn how to dynamically modify forms using events check the cookbook
|
||||
* entry at {@link http://symfony.com/doc/any/cookbook/form/dynamic_form_modification.html}
|
||||
* entry at {@link http://symfony.com/doc/any/cookbook/form/dynamic_form_modification.html}.
|
||||
*
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -296,8 +296,7 @@ class FormRenderer implements FormRendererInterface
|
|||
// Clear the caches if they were filled for the first time within
|
||||
// this function call
|
||||
if ($hierarchyInit) {
|
||||
unset($this->blockNameHierarchyMap[$viewAndSuffixCacheKey]);
|
||||
unset($this->hierarchyLevelMap[$viewAndSuffixCacheKey]);
|
||||
unset($this->blockNameHierarchyMap[$viewAndSuffixCacheKey], $this->hierarchyLevelMap[$viewAndSuffixCacheKey]);
|
||||
}
|
||||
|
||||
if ($varInit) {
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ abstract class FormPerformanceTestCase extends FormIntegrationTestCase
|
|||
*/
|
||||
public function setMaxRunningTime($maxRunningTime)
|
||||
{
|
||||
if (is_integer($maxRunningTime) && $maxRunningTime >= 0) {
|
||||
if (is_int($maxRunningTime) && $maxRunningTime >= 0) {
|
||||
$this->maxRunningTime = $maxRunningTime;
|
||||
} else {
|
||||
throw new \InvalidArgumentException();
|
||||
|
|
|
|||
|
|
@ -132,8 +132,7 @@ class RouterListener implements EventSubscriberInterface
|
|||
}
|
||||
|
||||
$request->attributes->add($parameters);
|
||||
unset($parameters['_route']);
|
||||
unset($parameters['_controller']);
|
||||
unset($parameters['_route'], $parameters['_controller']);
|
||||
$request->attributes->set('_route_params', $parameters);
|
||||
} catch (ResourceNotFoundException $e) {
|
||||
$message = sprintf('No route found for "%s %s"', $request->getMethod(), $request->getPathInfo());
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$this->assertSame('logger', $c->getName());
|
||||
$this->assertSame($nb, $c->countErrors());
|
||||
$this->assertSame($expectedLogs ? $expectedLogs : $logs, $c->getLogs());
|
||||
$this->assertSame($expectedLogs ?: $logs, $c->getLogs());
|
||||
$this->assertSame($expectedDeprecationCount, $c->countDeprecations());
|
||||
$this->assertSame($expectedScreamCount, $c->countScreams());
|
||||
|
||||
|
|
|
|||
|
|
@ -264,8 +264,7 @@ class PropertyPathBuilder
|
|||
|
||||
// All remaining elements should be removed
|
||||
for (; $i < $length; ++$i) {
|
||||
unset($this->elements[$i]);
|
||||
unset($this->isIndex[$i]);
|
||||
unset($this->elements[$i], $this->isIndex[$i]);
|
||||
}
|
||||
} else {
|
||||
$diff = $insertionLength - $cutLength;
|
||||
|
|
|
|||
|
|
@ -173,7 +173,8 @@ class AclProvider implements AclProviderInterface
|
|||
}
|
||||
|
||||
// Is it time to load the current batch?
|
||||
if ((self::MAX_BATCH_SIZE === count($currentBatch) || ($i + 1) === $c) && count($currentBatch) > 0) {
|
||||
$currentBatchesCount = count($currentBatch);
|
||||
if ($currentBatchesCount > 0 && (self::MAX_BATCH_SIZE === $currentBatchesCount || ($i + 1) === $c)) {
|
||||
try {
|
||||
$loadedBatch = $this->lookupObjectIdentities($currentBatch, $sids, $oidLookup);
|
||||
} catch (AclNotFoundException $aclNotFoundException) {
|
||||
|
|
@ -559,10 +560,11 @@ QUERY;
|
|||
// attach ACL to the result set; even though we do not enforce that every
|
||||
// object identity has only one instance, we must make sure to maintain
|
||||
// referential equality with the oids passed to findAcls()
|
||||
if (!isset($oidCache[$objectIdentifier.$classType])) {
|
||||
$oidCache[$objectIdentifier.$classType] = $acl->getObjectIdentity();
|
||||
$oidCacheKey = $objectIdentifier.$classType;
|
||||
if (!isset($oidCache[$oidCacheKey])) {
|
||||
$oidCache[$oidCacheKey] = $acl->getObjectIdentity();
|
||||
}
|
||||
$result->attach($oidCache[$objectIdentifier.$classType], $acl);
|
||||
$result->attach($oidCache[$oidCacheKey], $acl);
|
||||
// so, this hasn't been hydrated yet
|
||||
} else {
|
||||
// create object identity if we haven't done so yet
|
||||
|
|
@ -670,7 +672,7 @@ QUERY;
|
|||
// let's see if we have already hydrated this
|
||||
if (isset($acls[$parentId])) {
|
||||
$aclParentAclProperty->setValue($acl, $acls[$parentId]);
|
||||
$processed += 1;
|
||||
++$processed;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
if ($id === 1000 || ($id < 1500 && rand(0, 1))) {
|
||||
$this->insertClassStmt->execute(array($id, $this->getRandomString(rand(20, 100), 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\_')));
|
||||
$id += 1;
|
||||
++$id;
|
||||
|
||||
return $id-1;
|
||||
} else {
|
||||
|
|
@ -148,7 +148,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase
|
|||
}
|
||||
|
||||
$this->generateAces($classId, $id);
|
||||
$id += 1;
|
||||
++$id;
|
||||
|
||||
return $id-1;
|
||||
}
|
||||
|
|
@ -163,7 +163,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase
|
|||
$this->getRandomString(rand(5, 30)),
|
||||
rand(0, 1),
|
||||
));
|
||||
$id += 1;
|
||||
++$id;
|
||||
|
||||
return $id-1;
|
||||
} else {
|
||||
|
|
@ -215,7 +215,7 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase
|
|||
rand(0, 1),
|
||||
));
|
||||
|
||||
$id += 1;
|
||||
++$id;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
|
|||
*/
|
||||
public function testSupportsAttribute($attribute, $supported)
|
||||
{
|
||||
list($voter, , $permissionMap, ,) = $this->getVoter(true, false);
|
||||
list($voter, , $permissionMap) = $this->getVoter(true, false);
|
||||
|
||||
$permissionMap
|
||||
->expects($this->once())
|
||||
|
|
@ -44,7 +44,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
|
|||
*/
|
||||
public function testSupportsAttributeNonString($attribute)
|
||||
{
|
||||
list($voter, , , , ,) = $this->getVoter(true, false);
|
||||
list($voter) = $this->getVoter(true, false);
|
||||
|
||||
$this->assertFalse($voter->supportsAttribute($attribute));
|
||||
}
|
||||
|
|
@ -72,7 +72,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
|
|||
*/
|
||||
public function testSupportsClass($class)
|
||||
{
|
||||
list($voter, , , ,) = $this->getVoter();
|
||||
list($voter) = $this->getVoter();
|
||||
|
||||
$this->assertTrue($voter->supportsClass($class));
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
public function testVote()
|
||||
{
|
||||
list($voter, , $permissionMap, ,) = $this->getVoter();
|
||||
list($voter, , $permissionMap) = $this->getVoter();
|
||||
$permissionMap
|
||||
->expects($this->atLeastOnce())
|
||||
->method('getMasks')
|
||||
|
|
@ -103,7 +103,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
|
|||
*/
|
||||
public function testVoteWhenNoObjectIsPassed($allowIfObjectIdentityUnavailable)
|
||||
{
|
||||
list($voter, , $permissionMap, ,) = $this->getVoter($allowIfObjectIdentityUnavailable);
|
||||
list($voter, , $permissionMap) = $this->getVoter($allowIfObjectIdentityUnavailable);
|
||||
$permissionMap
|
||||
->expects($this->once())
|
||||
->method('getMasks')
|
||||
|
|
@ -124,7 +124,7 @@ class AclVoterTest extends \PHPUnit_Framework_TestCase
|
|||
*/
|
||||
public function testVoteWhenOidStrategyReturnsNull($allowIfUnavailable)
|
||||
{
|
||||
list($voter, , $permissionMap, $oidStrategy,) = $this->getVoter($allowIfUnavailable);
|
||||
list($voter, , $permissionMap, $oidStrategy) = $this->getVoter($allowIfUnavailable);
|
||||
$permissionMap
|
||||
->expects($this->once())
|
||||
->method('getMasks')
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
|
|||
throw new BadCredentialsException('No pre-authenticated principal found in request.');
|
||||
}
|
||||
|
||||
$user = $this->userProvider->loadUserByUsername($user);
|
||||
$user = $this->userProvider->loadUserByUsername($user);
|
||||
|
||||
$this->userChecker->checkPostAuth($user);
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
for ($j = 1; $j <= 5000; $j++) {
|
||||
$k = 4 * $j - 1;
|
||||
$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]] += 1;
|
||||
++$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]];
|
||||
}
|
||||
|
||||
$f = 0;
|
||||
|
|
@ -73,14 +73,14 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
|
|||
$run = 6;
|
||||
}
|
||||
|
||||
$runs[$run] += 1;
|
||||
++$runs[$run];
|
||||
};
|
||||
|
||||
$currentRun = 0;
|
||||
$lastBit = null;
|
||||
for ($i = 0; $i < 20000; $i++) {
|
||||
if ($lastBit === $b[$i]) {
|
||||
$currentRun += 1;
|
||||
++$currentRun;
|
||||
} else {
|
||||
if ($currentRun > 0) {
|
||||
$addRun($currentRun);
|
||||
|
|
@ -115,7 +115,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
|
|||
$lastBit = null;
|
||||
for ($i = 0; $i < 20000; $i++) {
|
||||
if ($lastBit === $b[$i]) {
|
||||
$currentRun += 1;
|
||||
++$currentRun;
|
||||
} else {
|
||||
if ($currentRun > $longestRun) {
|
||||
$longestRun = $currentRun;
|
||||
|
|
|
|||
|
|
@ -172,9 +172,9 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
|
|||
private function createExceptionListener(SecurityContextInterface $context = null, AuthenticationTrustResolverInterface $trustResolver = null, HttpUtils $httpUtils = null, AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null)
|
||||
{
|
||||
return new ExceptionListener(
|
||||
$context ? $context : $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'),
|
||||
$trustResolver ? $trustResolver : $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'),
|
||||
$httpUtils ? $httpUtils : $this->getMock('Symfony\Component\Security\Http\HttpUtils'),
|
||||
$context ?: $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'),
|
||||
$trustResolver ?: $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'),
|
||||
$httpUtils ?: $this->getMock('Symfony\Component\Security\Http\HttpUtils'),
|
||||
'key',
|
||||
$authenticationEntryPoint,
|
||||
$errorPage,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
|
|||
{
|
||||
public function testOnCoreSecurityDoesNotTryToPopulateNonEmptySecurityContext()
|
||||
{
|
||||
list($listener, $context, , , ,) = $this->getListener();
|
||||
list($listener, $context) = $this->getListener();
|
||||
|
||||
$context
|
||||
->expects($this->once())
|
||||
|
|
@ -38,7 +38,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
|
||||
{
|
||||
list($listener, $context, $service, ,) = $this->getListener();
|
||||
list($listener, $context, $service) = $this->getListener();
|
||||
|
||||
$context
|
||||
->expects($this->once())
|
||||
|
|
@ -64,7 +64,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenticationManagerImplementation()
|
||||
{
|
||||
list($listener, $context, $service, $manager,) = $this->getListener();
|
||||
list($listener, $context, $service, $manager) = $this->getListener();
|
||||
|
||||
$context
|
||||
->expects($this->once())
|
||||
|
|
@ -144,7 +144,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
public function testOnCoreSecurity()
|
||||
{
|
||||
list($listener, $context, $service, $manager,) = $this->getListener();
|
||||
list($listener, $context, $service, $manager) = $this->getListener();
|
||||
|
||||
$context
|
||||
->expects($this->once())
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ class XliffFileLoader implements LoaderInterface
|
|||
LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
|
||||
$error->code,
|
||||
trim($error->message),
|
||||
$error->file ? $error->file : 'n/a',
|
||||
$error->file ?: 'n/a',
|
||||
$error->line,
|
||||
$error->column
|
||||
);
|
||||
|
|
|
|||
|
|
@ -58,13 +58,13 @@ abstract class AbstractLoader implements LoaderInterface
|
|||
/**
|
||||
* Creates a new constraint instance for the given constraint name.
|
||||
*
|
||||
* @param string $name The constraint name. Either a constraint relative
|
||||
* to the default constraint namespace, or a fully
|
||||
* qualified class name. Alternatively, the constraint
|
||||
* may be preceded by a namespace alias and a colon.
|
||||
* The namespace alias must have been defined using
|
||||
* {@link addNamespaceAlias()}.
|
||||
* @param mixed $options The constraint options
|
||||
* @param string $name The constraint name. Either a constraint relative
|
||||
* to the default constraint namespace, or a fully
|
||||
* qualified class name. Alternatively, the constraint
|
||||
* may be preceded by a namespace alias and a colon.
|
||||
* The namespace alias must have been defined using
|
||||
* {@link addNamespaceAlias()}.
|
||||
* @param mixed $options The constraint options
|
||||
*
|
||||
* @return Constraint
|
||||
*
|
||||
|
|
|
|||
|
|
@ -278,6 +278,38 @@
|
|||
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
|
||||
<target>Este valor non debería ser identico a {{ compared_value_type }} {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="73">
|
||||
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
|
||||
<target>A proporción da imaxe é demasiado grande ({{ ratio }}). A proporción máxima permitida é {{ max_ratio }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="74">
|
||||
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
|
||||
<target>A proporción da é demasiado pequena ({{ ratio }}). A proporción mínima permitida é {{ min_ratio }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="75">
|
||||
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
|
||||
<target>A imaxe é cadrada ({{ width }}x{{ height }}px). As imáxenes cadradas non están permitidas.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="76">
|
||||
<source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
|
||||
<target>A imaxe está orientada horizontalmente ({{ width }}x{{ height }}px). As imáxenes orientadas horizontalmente non están permitidas.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="77">
|
||||
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
|
||||
<target>A imaxe está orientada verticalmente ({{ width }}x{{ height }}px). As imáxenes orientadas verticalmente non están permitidas.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="78">
|
||||
<source>An empty file is not allowed.</source>
|
||||
<target>Non está permitido un arquivo baleiro.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="79">
|
||||
<source>The host could not be resolved.</source>
|
||||
<target>Non se puido resolver o host.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="80">
|
||||
<source>This value does not match the expected {{ charset }} charset.</source>
|
||||
<target>A codificación de caracteres para este valor debería ser {{ charset }}.</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ class Inline
|
|||
{
|
||||
$output = array();
|
||||
$len = strlen($sequence);
|
||||
$i += 1;
|
||||
++$i;
|
||||
|
||||
// [foo, bar, ...]
|
||||
while ($i < $len) {
|
||||
|
|
@ -344,7 +344,7 @@ class Inline
|
|||
{
|
||||
$output = array();
|
||||
$len = strlen($mapping);
|
||||
$i += 1;
|
||||
++$i;
|
||||
|
||||
// {foo: bar, bar:foo, ...}
|
||||
while ($i < $len) {
|
||||
|
|
|
|||
Reference in New Issue