diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable the fixer enforcing fully-qualified calls for compiler-optimized functions

This commit is contained in:
Christophe Coevoet 2018-07-05 13:24:53 +02:00
parent f00b3279ea
commit 04654cfeb3
719 changed files with 2258 additions and 2256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.php_cs.dist
View File

@ -17,6 +17,8 @@ return PhpCsFixer\Config::create()
'self_accessor' => false,
// TODO remove the disabling once https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3876 is merged and released
'native_constant_invocation' => false,
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
'native_function_invocation' => array('include' => array('@compiler_optimized'), 'scope' => 'namespaced'),
))
->setRiskyAllowed(true)
->setFinder(

6
src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
View File

@ -54,7 +54,7 @@ class ContainerAwareEventManager extends EventManager
$initialized = isset($this->initialized[$eventName]);
foreach ($this->listeners[$eventName] as $hash => $listener) {
if (!$initialized && is_string($listener)) {
if (!$initialized && \is_string($listener)) {
$this->listeners[$eventName][$hash] = $listener = $this->container->get($listener);
}
@ -98,7 +98,7 @@ class ContainerAwareEventManager extends EventManager
*/
public function addEventListener($events, $listener)
{
if (is_string($listener)) {
if (\is_string($listener)) {
if ($this->initialized) {
throw new \RuntimeException('Adding lazy-loading listeners after construction is not supported.');
}
@ -124,7 +124,7 @@ class ContainerAwareEventManager extends EventManager
*/
public function removeEventListener($events, $listener)
{
if (is_string($listener)) {
if (\is_string($listener)) {
$hash = '_service_'.$listener;
} else {
// Picks the hash code related to that listener

12
src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
View File

@ -120,14 +120,14 @@ class DoctrineDataCollector extends DataCollector
if (null === $query['params']) {
$query['params'] = array();
}
if (!is_array($query['params'])) {
if (!\is_array($query['params'])) {
$query['params'] = array($query['params']);
}
foreach ($query['params'] as $j => $param) {
if (isset($query['types'][$j])) {
// Transform the param according to the type
$type = $query['types'][$j];
if (is_string($type)) {
if (\is_string($type)) {
$type = Type::getType($type);
}
if ($type instanceof Type) {
@ -158,11 +158,11 @@ class DoctrineDataCollector extends DataCollector
*/
private function sanitizeParam($var)
{
if (is_object($var)) {
return array(sprintf('Object(%s)', get_class($var)), false);
if (\is_object($var)) {
return array(sprintf('Object(%s)', \get_class($var)), false);
}
if (is_array($var)) {
if (\is_array($var)) {
$a = array();
$original = true;
foreach ($var as $k => $v) {
@ -174,7 +174,7 @@ class DoctrineDataCollector extends DataCollector
return array($a, $original);
}
if (is_resource($var)) {
if (\is_resource($var)) {
return array(sprintf('Resource(%s)', get_resource_type($var)), false);
}

14
src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
View File

@ -142,7 +142,7 @@ abstract class AbstractDoctrineExtension extends Extension
*/
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
{
$bundleDir = dirname($bundle->getFileName());
$bundleDir = \dirname($bundle->getFileName());
if (!$bundleConfig['type']) {
$bundleConfig['type'] = $this->detectMetadataDriver($bundleDir, $container);
@ -154,7 +154,7 @@ abstract class AbstractDoctrineExtension extends Extension
}
if (!$bundleConfig['dir']) {
if (in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
if (\in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
} else {
$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
@ -241,7 +241,7 @@ abstract class AbstractDoctrineExtension extends Extension
throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
}
if (!in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
if (!\in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or '.
'"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. '.
'You can register them by adding a new driver to the '.
@ -264,17 +264,17 @@ abstract class AbstractDoctrineExtension extends Extension
$configPath = $this->getMappingResourceConfigDirectory();
$resource = $dir.'/'.$configPath;
while (!is_dir($resource)) {
$resource = dirname($resource);
$resource = \dirname($resource);
}
$container->addResource(new FileResource($resource));
$extension = $this->getMappingResourceExtension();
if (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) && count($files)) {
if (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) && \count($files)) {
return 'xml';
} elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.yml')) && count($files)) {
} elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.yml')) && \count($files)) {
return 'yml';
} elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.php')) && count($files)) {
} elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.php')) && \count($files)) {
return 'php';
}

2
src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
View File

@ -60,7 +60,7 @@ class DoctrineValidationPass implements CompilerPassInterface
foreach ($container->getParameter('kernel.bundles') as $bundle) {
$reflection = new \ReflectionClass($bundle);
if (is_file($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
if (is_file($file = \dirname($reflection->getFileName()).'/'.$validationPath)) {
$files[] = $file;
$container->addResource(new FileResource($file));
}

2
src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
View File

@ -153,7 +153,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
if ($sortedTags) {
krsort($sortedTags);
$sortedTags = call_user_func_array('array_merge', $sortedTags);
$sortedTags = \call_user_func_array('array_merge', $sortedTags);
}
return $sortedTags;

4
src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
View File

@ -124,7 +124,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
$this->managerParameters = $managerParameters;
$this->driverPattern = $driverPattern;
$this->enabledParameter = $enabledParameter;
if (count($aliasMap) && (!$configurationPattern || !$registerAliasMethodName)) {
if (\count($aliasMap) && (!$configurationPattern || !$registerAliasMethodName)) {
throw new \InvalidArgumentException('configurationPattern and registerAliasMethodName are required to register namespace alias');
}
$this->configurationPattern = $configurationPattern;
@ -149,7 +149,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
$chainDriverDef->addMethodCall('addDriver', array($mappingDriverDef, $namespace));
}
if (!count($this->aliasMap)) {
if (!\count($this->aliasMap)) {
return;
}

4
src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
View File

@ -88,7 +88,7 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
// Optimize performance for single-field identifiers. We already
// know that the IDs are used as values
$optimize = null === $value || is_array($value) && $value[0] === $this->idReader;
$optimize = null === $value || \is_array($value) && $value[0] === $this->idReader;
// Attention: This optimization does not check choices for existence
if ($optimize && !$this->choiceList && $this->idReader->isSingleId()) {
@ -125,7 +125,7 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
// Optimize performance in case we have an object loader and
// a single-field identifier
$optimize = null === $value || is_array($value) && $value[0] === $this->idReader;
$optimize = null === $value || \is_array($value) && $value[0] === $this->idReader;
if ($optimize && !$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
$unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);

6
src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
View File

@ -117,7 +117,7 @@ class EntityChoiceList extends ObjectChoiceList
$this->entityLoader = $entityLoader;
$this->classMetadata = $manager->getClassMetadata($class);
$this->class = $this->classMetadata->getName();
$this->loaded = is_array($entities) || $entities instanceof \Traversable;
$this->loaded = \is_array($entities) || $entities instanceof \Traversable;
$this->preferredEntities = $preferredEntities;
list(
$this->idAsIndex,
@ -449,13 +449,13 @@ class EntityChoiceList extends ObjectChoiceList
$identifiers = $classMetadata->getIdentifierFieldNames();
if (1 === count($identifiers)) {
if (1 === \count($identifiers)) {
$identifier = $identifiers[0];
if (!$classMetadata->hasAssociation($identifier)) {
$idAsValue = true;
if (in_array($classMetadata->getTypeOfField($identifier), array('integer', 'smallint', 'bigint'))) {
if (\in_array($classMetadata->getTypeOfField($identifier), array('integer', 'smallint', 'bigint'))) {
$idAsIndex = true;
}
}

6
src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
View File

@ -42,8 +42,8 @@ class IdReader
$this->om = $om;
$this->classMetadata = $classMetadata;
$this->singleId = 1 === count($ids);
$this->intId = $this->singleId && in_array($idType, array('integer', 'smallint', 'bigint'));
$this->singleId = 1 === \count($ids);
$this->intId = $this->singleId && \in_array($idType, array('integer', 'smallint', 'bigint'));
$this->idField = current($ids);
// single field association are resolved, since the schema column could be an int
@ -95,7 +95,7 @@ class IdReader
}
if (!$this->om->contains($object)) {
throw new RuntimeException(sprintf('Entity of type "%s" passed to the choice field must be managed. Maybe you forget to persist it in the entity manager?', get_class($object)));
throw new RuntimeException(sprintf('Entity of type "%s" passed to the choice field must be managed. Maybe you forget to persist it in the entity manager?', \get_class($object)));
}
$this->om->initializeObject($object);

4
src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
View File

@ -98,7 +98,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
// Guess type
$entity = current($qb->getRootEntities());
$metadata = $qb->getEntityManager()->getClassMetadata($entity);
if (in_array($metadata->getTypeOfField($identifier), array('integer', 'bigint', 'smallint'))) {
if (\in_array($metadata->getTypeOfField($identifier), array('integer', 'bigint', 'smallint'))) {
$parameterType = Connection::PARAM_INT_ARRAY;
// Filter out non-integer values (e.g. ""). If we don't, some
@ -106,7 +106,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
$values = array_values(array_filter($values, function ($v) {
return (string) $v === (string) (int) $v || ctype_digit($v);
}));
} elseif (in_array($metadata->getTypeOfField($identifier), array('uuid', 'guid'))) {
} elseif (\in_array($metadata->getTypeOfField($identifier), array('uuid', 'guid'))) {
$parameterType = Connection::PARAM_STR_ARRAY;
// Like above, but we just filter out empty strings.

2
src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
View File

@ -36,7 +36,7 @@ class CollectionToArrayTransformer implements DataTransformerInterface
// For cases when the collection getter returns $collection->toArray()
// in order to prevent modifications of the returned collection
if (is_array($collection)) {
if (\is_array($collection)) {
return $collection;
}

4
src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
View File

@ -131,7 +131,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
return new ValueGuess($mapping['length'], Guess::HIGH_CONFIDENCE);
}
if (in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
}
}
@ -144,7 +144,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
{
$ret = $this->getMetadata($class);
if ($ret && isset($ret[0]->fieldMappings[$property]) && !$ret[0]->hasAssociation($property)) {
if (in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
if (\in_array($ret[0]->getTypeOfField($property), array(Type::DECIMAL, Type::FLOAT))) {
return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
}
}

2
src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
View File

@ -41,7 +41,7 @@ class MergeDoctrineCollectionListener implements EventSubscriberInterface
// If all items were removed, call clear which has a higher
// performance on persistent collections
if ($collection instanceof Collection && 0 === count($data)) {
if ($collection instanceof Collection && 0 === \count($data)) {
$collection->clear();
}
}

4
src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
View File

@ -259,8 +259,8 @@ abstract class DoctrineType extends AbstractType
// Invoke the query builder closure so that we can cache choice lists
// for equal query builders
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
if (is_callable($queryBuilder)) {
$queryBuilder = call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
if (\is_callable($queryBuilder)) {
$queryBuilder = \call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
}
return $queryBuilder;

4
src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
View File

@ -28,8 +28,8 @@ class EntityType extends DoctrineType
// Invoke the query builder closure so that we can cache choice lists
// for equal query builders
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
if (is_callable($queryBuilder)) {
$queryBuilder = call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
if (\is_callable($queryBuilder)) {
$queryBuilder = \call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');

4
src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
View File

@ -71,12 +71,12 @@ class DbalLogger implements SQLLogger
{
foreach ($params as $index => $param) {
// normalize recursively
if (is_array($param)) {
if (\is_array($param)) {
$params[$index] = $this->normalizeParams($param);
continue;
}
if (!is_string($params[$index])) {
if (!\is_string($params[$index])) {
continue;
}

4
src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
View File

@ -52,7 +52,7 @@ class EntityUserProvider implements UserProviderInterface
} else {
if (!$repository instanceof UserLoaderInterface) {
if (!$repository instanceof UserProviderInterface) {
throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, get_class($repository)));
throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, \get_class($repository)));
}
@trigger_error('Implementing Symfony\Component\Security\Core\User\UserProviderInterface in a Doctrine repository when using the entity provider is deprecated since Symfony 2.8 and will not be supported in 3.0. Make the repository implement Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.', E_USER_DEPRECATED);
@ -75,7 +75,7 @@ class EntityUserProvider implements UserProviderInterface
{
$class = $this->getClass();
if (!$user instanceof $class) {
throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
}
$repository = $this->getRepository();

2
src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
View File

@ -30,7 +30,7 @@ class DoctrineTestHelper
*/
public static function createTestEntityManager()
{
if (!extension_loaded('pdo_sqlite')) {
if (!\extension_loaded('pdo_sqlite')) {
TestCase::markTestSkipped('Extension pdo_sqlite is required.');
}

4
src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
View File

@ -68,7 +68,7 @@ class DoctrineExtensionTest extends TestCase
'SecondBundle' => 'My\SecondBundle',
);
$reflection = new \ReflectionClass(get_class($this->extension));
$reflection = new \ReflectionClass(\get_class($this->extension));
$method = $reflection->getMethod('fixManagersAutoMappings');
$method->setAccessible(true);
@ -157,7 +157,7 @@ class DoctrineExtensionTest extends TestCase
'SecondBundle' => 'My\SecondBundle',
);
$reflection = new \ReflectionClass(get_class($this->extension));
$reflection = new \ReflectionClass(\get_class($this->extension));
$method = $reflection->getMethod('fixManagersAutoMappings');
$method->setAccessible(true);

2
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
View File

@ -72,7 +72,7 @@ class EntityTypePerformanceTest extends FormPerformanceTestCase
$ids = range(1, 300);
foreach ($ids as $id) {
$name = 65 + (int) chr($id % 57);
$name = 65 + (int) \chr($id % 57);
$this->em->persist(new SingleIntIdEntity($id, $name));
}

2
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
View File

@ -145,7 +145,7 @@ class DbalLoggerTest extends TestCase
;
$testStringArray = array('é', 'á', 'ű', 'ő', 'ú', 'ö', 'ü', 'ó', 'í');
$testStringCount = count($testStringArray);
$testStringCount = \count($testStringArray);
$shortString = '';
$longString = '';

4
src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
View File

@ -50,7 +50,7 @@ class DoctrineFooType extends Type
return;
}
if (!$value instanceof Foo) {
throw new ConversionException(sprintf('Expected %s, got %s', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', gettype($value)));
throw new ConversionException(sprintf('Expected %s, got %s', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', \gettype($value)));
}
return $foo->bar;
@ -64,7 +64,7 @@ class DoctrineFooType extends Type
if (null === $value) {
return;
}
if (!is_string($value)) {
if (!\is_string($value)) {
throw ConversionException::conversionFailed($value, self::NAME);
}

2
src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
View File

@ -176,7 +176,7 @@ class EntityUserProviderTest extends TestCase
$provider = new EntityUserProvider($this->getManager($em), 'Symfony\Bridge\Doctrine\Tests\Fixtures\User', 'name');
$user2 = $em->getReference('Symfony\Bridge\Doctrine\Tests\Fixtures\User', array('id1' => 1, 'id2' => 1));
$this->assertTrue($provider->supportsClass(get_class($user2)));
$this->assertTrue($provider->supportsClass(\get_class($user2)));
}
public function testLoadUserByUserNameShouldLoadUserWhenProperInterfaceProvided()

14
src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
View File

@ -45,17 +45,17 @@ class UniqueEntityValidator extends ConstraintValidator
throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UniqueEntity');
}
if (!is_array($constraint->fields) && !is_string($constraint->fields)) {
if (!\is_array($constraint->fields) && !\is_string($constraint->fields)) {
throw new UnexpectedTypeException($constraint->fields, 'array');
}
if (null !== $constraint->errorPath && !is_string($constraint->errorPath)) {
if (null !== $constraint->errorPath && !\is_string($constraint->errorPath)) {
throw new UnexpectedTypeException($constraint->errorPath, 'string or null');
}
$fields = (array) $constraint->fields;
if (0 === count($fields)) {
if (0 === \count($fields)) {
throw new ConstraintDefinitionException('At least one field has to be specified.');
}
@ -70,14 +70,14 @@ class UniqueEntityValidator extends ConstraintValidator
throw new ConstraintDefinitionException(sprintf('Object manager "%s" does not exist.', $constraint->em));
}
} else {
$em = $this->registry->getManagerForClass(get_class($entity));
$em = $this->registry->getManagerForClass(\get_class($entity));
if (!$em) {
throw new ConstraintDefinitionException(sprintf('Unable to find the object manager associated with an entity of class "%s".', get_class($entity)));
throw new ConstraintDefinitionException(sprintf('Unable to find the object manager associated with an entity of class "%s".', \get_class($entity)));
}
}
$class = $em->getClassMetadata(get_class($entity));
$class = $em->getClassMetadata(\get_class($entity));
/* @var $class \Doctrine\Common\Persistence\Mapping\ClassMetadata */
$criteria = array();
@ -120,7 +120,7 @@ class UniqueEntityValidator extends ConstraintValidator
return;
}
$repository = $em->getRepository(get_class($entity));
$repository = $em->getRepository(\get_class($entity));
$result = $repository->{$constraint->repositoryMethod}($criteria);
if ($result instanceof \IteratorAggregate) {

2
src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
View File

@ -30,7 +30,7 @@ class DoctrineInitializer implements ObjectInitializerInterface
public function initialize($object)
{
$manager = $this->registry->getManagerForClass(get_class($object));
$manager = $this->registry->getManagerForClass(\get_class($object));
if (null !== $manager) {
$manager->initializeObject($object);
}

2
src/Symfony/Bridge/Monolog/Handler/DebugHandler.php
View File

@ -51,7 +51,7 @@ class DebugHandler extends TestHandler implements DebugLoggerInterface
$levels = array(Logger::ERROR, Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY);
foreach ($levels as $level) {
if (isset($this->recordsByLevel[$level])) {
$cnt += count($this->recordsByLevel[$level]);
$cnt += \count($this->recordsByLevel[$level]);
}
}

4
src/Symfony/Bridge/PhpUnit/ClockMock.php
View File

@ -71,7 +71,7 @@ class ClockMock
public static function register($class)
{
$self = get_called_class();
$self = \get_called_class();
$mockedNs = array(substr($class, 0, strrpos($class, '\\')));
if (strpos($class, '\\Tests\\')) {
@ -79,7 +79,7 @@ class ClockMock
$mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
}
foreach ($mockedNs as $ns) {
if (function_exists($ns.'\time')) {
if (\function_exists($ns.'\time')) {
continue;
}
eval(<<<EOPHP

20
src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
View File

@ -75,13 +75,13 @@ class DeprecationErrorHandler
$trace = debug_backtrace(true);
$group = 'other';
$i = count($trace);
$i = \count($trace);
while (1 < $i && (!isset($trace[--$i]['class']) || ('ReflectionMethod' === $trace[$i]['class'] || 0 === strpos($trace[$i]['class'], 'PHPUnit_')))) {
// No-op
}
if (isset($trace[$i]['object']) || isset($trace[$i]['class'])) {
$class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
$class = isset($trace[$i]['object']) ? \get_class($trace[$i]['object']) : $trace[$i]['class'];
$method = $trace[$i]['function'];
if (0 !== error_reporting()) {
@ -90,7 +90,7 @@ class DeprecationErrorHandler
|| 0 === strpos($method, 'provideLegacy')
|| 0 === strpos($method, 'getLegacy')
|| strpos($class, '\Legacy')
|| in_array('legacy', \PHPUnit_Util_Test::getGroups($class, $method), true)
|| \in_array('legacy', \PHPUnit_Util_Test::getGroups($class, $method), true)
) {
$group = 'legacy';
} else {
@ -101,7 +101,7 @@ class DeprecationErrorHandler
$e = new \Exception($msg);
$r = new \ReflectionProperty($e, 'trace');
$r->setAccessible(true);
$r->setValue($e, array_slice($trace, 1, $i));
$r->setValue($e, \array_slice($trace, 1, $i));
echo "\n".ucfirst($group).' deprecation triggered by '.$class.'::'.$method.':';
echo "\n".$msg;
@ -193,12 +193,12 @@ class DeprecationErrorHandler
// reset deprecations array
foreach ($deprecations as $group => $arrayOrInt) {
$deprecations[$group] = is_int($arrayOrInt) ? 0 : array();
$deprecations[$group] = \is_int($arrayOrInt) ? 0 : array();
}
register_shutdown_function(function () use (&$deprecations, $isFailing, $displayDeprecations, $mode) {
foreach ($deprecations as $group => $arrayOrInt) {
if (0 < (is_int($arrayOrInt) ? $arrayOrInt : count($arrayOrInt))) {
if (0 < (\is_int($arrayOrInt) ? $arrayOrInt : \count($arrayOrInt))) {
echo "Shutdown-time deprecations:\n";
break;
}
@ -222,7 +222,7 @@ class DeprecationErrorHandler
*/
private static function hasColorSupport()
{
if (!defined('STDOUT')) {
if (!\defined('STDOUT')) {
return false;
}
@ -231,18 +231,18 @@ class DeprecationErrorHandler
}
if (DIRECTORY_SEPARATOR === '\\') {
return (function_exists('sapi_windows_vt100_support')
return (\function_exists('sapi_windows_vt100_support')
&& sapi_windows_vt100_support(STDOUT))
|| false !== getenv('ANSICON')
|| 'ON' === getenv('ConEmuANSI')
|| 'xterm' === getenv('TERM');
}
if (function_exists('stream_isatty')) {
if (\function_exists('stream_isatty')) {
return stream_isatty(STDOUT);
}
if (function_exists('posix_isatty')) {
if (\function_exists('posix_isatty')) {
return posix_isatty(STDOUT);
}

2
src/Symfony/Bridge/PhpUnit/TextUI/Command.php
View File

@ -38,7 +38,7 @@ class Command extends \PHPUnit_TextUI_Command
// By default, we want PHPUnit's autoloader before Symfony's one
if (!getenv('SYMFONY_PHPUNIT_OVERLOAD')) {
$filename = realpath(stream_resolve_include_path($filename));
$symfonyLoader = realpath(dirname(PHPUNIT_COMPOSER_INSTALL).'/../../../vendor/autoload.php');
$symfonyLoader = realpath(\dirname(PHPUNIT_COMPOSER_INSTALL).'/../../../vendor/autoload.php');
if ($filename === $symfonyLoader) {
$symfonyLoader = require $symfonyLoader;

2
src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
View File

@ -51,7 +51,7 @@ class RuntimeInstantiator implements InstantiatorInterface
return $this->factory->createProxy(
$definition->getClass(),
function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($realInstantiator) {
$wrappedInstance = call_user_func($realInstantiator);
$wrappedInstance = \call_user_func($realInstantiator);
$proxy->setProxyInitializer(null);

2
src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
View File

@ -57,7 +57,7 @@ class ProxyDumper implements DumperInterface
if ($definition->isShared()) {
$instantiation .= " \$this->services['$id'] =";
if (defined('Symfony\Component\DependencyInjection\ContainerInterface::SCOPE_CONTAINER') && ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope(false)) {
if (\defined('Symfony\Component\DependencyInjection\ContainerInterface::SCOPE_CONTAINER') && ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope(false)) {
$instantiation .= " \$this->scopedServices['$scope']['$id'] =";
}
}

2
src/Symfony/Bridge/Twig/AppVariable.php
View File

@ -103,7 +103,7 @@ class AppVariable
}
$user = $token->getUser();
if (is_object($user)) {
if (\is_object($user)) {
return $user;
}
}

12
src/Symfony/Bridge/Twig/Command/DebugCommand.php
View File

@ -139,16 +139,16 @@ EOF
if (null === $cb) {
return;
}
if (is_array($cb)) {
if (\is_array($cb)) {
if (!method_exists($cb[0], $cb[1])) {
return;
}
$refl = new \ReflectionMethod($cb[0], $cb[1]);
} elseif (is_object($cb) && method_exists($cb, '__invoke')) {
} elseif (\is_object($cb) && method_exists($cb, '__invoke')) {
$refl = new \ReflectionMethod($cb, '__invoke');
} elseif (function_exists($cb)) {
} elseif (\function_exists($cb)) {
$refl = new \ReflectionFunction($cb);
} elseif (is_string($cb) && preg_match('{^(.+)::(.+)$}', $cb, $m) && method_exists($m[1], $m[2])) {
} elseif (\is_string($cb) && preg_match('{^(.+)::(.+)$}', $cb, $m) && method_exists($m[1], $m[2])) {
$refl = new \ReflectionMethod($m[1], $m[2]);
} else {
throw new \UnexpectedValueException('Unsupported callback type');
@ -198,8 +198,8 @@ EOF
}
if ('globals' === $type) {
if (is_object($meta)) {
return ' = object('.get_class($meta).')';
if (\is_object($meta)) {
return ' = object('.\get_class($meta).')';
}
return ' = '.substr(@json_encode($meta), 0, 50);

10
src/Symfony/Bridge/Twig/Command/LintCommand.php
View File

@ -99,7 +99,7 @@ EOF
$filenames = $input->getArgument('filename');
if (0 === count($filenames)) {
if (0 === \count($filenames)) {
if (0 !== ftell(STDIN)) {
throw new \RuntimeException('Please provide a filename or pipe template content to STDIN.');
}
@ -184,9 +184,9 @@ EOF
}
if (0 === $errors) {
$io->success(sprintf('All %d Twig files contain valid syntax.', count($filesInfo)));
$io->success(sprintf('All %d Twig files contain valid syntax.', \count($filesInfo)));
} else {
$io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', count($filesInfo) - $errors, $errors));
$io->warning(sprintf('%d Twig files have valid syntax and %d contain errors.', \count($filesInfo) - $errors, $errors));
}
return min($errors, 1);
@ -206,7 +206,7 @@ EOF
}
});
$output->writeln(json_encode($filesInfo, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
$output->writeln(json_encode($filesInfo, \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
return min($errors, 1);
}
@ -239,7 +239,7 @@ EOF
$lines = explode("\n", $template);
$position = max(0, $line - $context);
$max = min(count($lines), $line - 1 + $context);
$max = min(\count($lines), $line - 1 + $context);
$result = array();
while ($position < $max) {

4
src/Symfony/Bridge/Twig/Extension/AssetExtension.php
View File

@ -62,13 +62,13 @@ class AssetExtension extends AbstractExtension
public function getAssetUrl($path, $packageName = null, $absolute = false, $version = null)
{
// BC layer to be removed in 3.0
if (2 < $count = func_num_args()) {
if (2 < $count = \func_num_args()) {
@trigger_error('Generating absolute URLs with the Twig asset() function was deprecated in 2.7 and will be removed in 3.0. Please use absolute_url() instead.', E_USER_DEPRECATED);
if (4 === $count) {
@trigger_error('Forcing a version with the Twig asset() function was deprecated in 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
}
$args = func_get_args();
$args = \func_get_args();
return $this->getLegacyAssetUrl($path, $packageName, $args[2], isset($args[3]) ? $args[3] : null);
}

10
src/Symfony/Bridge/Twig/Extension/CodeExtension.php
View File

@ -33,7 +33,7 @@ class CodeExtension extends AbstractExtension
public function __construct($fileLinkFormat, $rootDir, $charset)
{
$this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
$this->rootDir = str_replace('/', DIRECTORY_SEPARATOR, dirname($rootDir)).DIRECTORY_SEPARATOR;
$this->rootDir = str_replace('/', DIRECTORY_SEPARATOR, \dirname($rootDir)).DIRECTORY_SEPARATOR;
$this->charset = $charset;
}
@ -92,7 +92,7 @@ class CodeExtension extends AbstractExtension
$short = array_pop($parts);
$formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
} elseif ('array' === $item[0]) {
$formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
$formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
} elseif ('string' === $item[0]) {
$formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES, $this->charset));
} elseif ('null' === $item[0]) {
@ -105,7 +105,7 @@ class CodeExtension extends AbstractExtension
$formattedValue = str_replace("\n", '', var_export(htmlspecialchars((string) $item[1], ENT_QUOTES, $this->charset), true));
}
$result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
$result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
}
return implode(', ', $result);
@ -142,7 +142,7 @@ class CodeExtension extends AbstractExtension
$content = explode('<br />', $code);
$lines = array();
for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {
for ($i = max($line - 3, 1), $max = min($line + 3, \count($content)); $i <= $max; ++$i) {
$lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
}
@ -166,7 +166,7 @@ class CodeExtension extends AbstractExtension
if (null === $text) {
$text = str_replace('/', DIRECTORY_SEPARATOR, $file);
if (0 === strpos($text, $this->rootDir)) {
$text = substr($text, strlen($this->rootDir));
$text = substr($text, \strlen($this->rootDir));
$text = explode(DIRECTORY_SEPARATOR, $text, 2);
$text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->rootDir, $text[0], isset($text[1]) ? DIRECTORY_SEPARATOR.$text[1] : '');
}

4
src/Symfony/Bridge/Twig/Extension/DumpExtension.php
View File

@ -56,7 +56,7 @@ class DumpExtension extends AbstractExtension
return;
}
if (2 === func_num_args()) {
if (2 === \func_num_args()) {
$vars = array();
foreach ($context as $key => $value) {
if (!$value instanceof Template) {
@ -66,7 +66,7 @@ class DumpExtension extends AbstractExtension
$vars = array($vars);
} else {
$vars = func_get_args();
$vars = \func_get_args();
unset($vars[0], $vars[1]);
}

4
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -152,8 +152,8 @@ class FormExtension extends AbstractExtension implements InitRuntimeInterface
*/
public function isSelectedChoice(ChoiceView $choice, $selectedValue)
{
if (is_array($selectedValue)) {
return in_array($choice->value, $selectedValue, true);
if (\is_array($selectedValue)) {
return \in_array($choice->value, $selectedValue, true);
}
return $choice->value === $selectedValue;

2
src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
View File

@ -97,7 +97,7 @@ class HttpFoundationExtension extends AbstractExtension
if (!$path || '/' !== $path[0]) {
$prefix = $request->getPathInfo();
$last = strlen($prefix) - 1;
$last = \strlen($prefix) - 1;
if ($last !== $pos = strrpos($prefix, '/')) {
$prefix = substr($prefix, 0, $pos).'/';
}

2
src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
View File

@ -100,7 +100,7 @@ class RoutingExtension extends AbstractExtension
$argsNode->hasNode(1) ? $argsNode->getNode(1) : null
);
if (null === $paramsNode || $paramsNode instanceof ArrayExpression && count($paramsNode) <= 2 &&
if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 &&
(!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
) {
return array('html');

10
src/Symfony/Bridge/Twig/Extension/YamlExtension.php
View File

@ -42,8 +42,8 @@ class YamlExtension extends AbstractExtension
$dumper = new YamlDumper();
}
if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
return $dumper->dump($input, $inline, 0, is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);
if (\defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
return $dumper->dump($input, $inline, 0, \is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);
}
return $dumper->dump($input, $inline, 0, false, $dumpObjects);
@ -51,12 +51,12 @@ class YamlExtension extends AbstractExtension
public function dump($value, $inline = 0, $dumpObjects = false)
{
if (is_resource($value)) {
if (\is_resource($value)) {
return '%Resource%';
}
if (is_array($value) || is_object($value)) {
return '%'.gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);
if (\is_array($value) || \is_object($value)) {
return '%'.\gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);
}
return $this->encode($value, $inline, $dumpObjects);

4
src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
View File

@ -100,7 +100,7 @@ class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererE
// Check each theme whether it contains the searched block
if (isset($this->themes[$cacheKey])) {
for ($i = count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
for ($i = \count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
$this->loadResourcesFromTheme($cacheKey, $this->themes[$cacheKey][$i]);
// CONTINUE LOADING (see doc comment)
}
@ -108,7 +108,7 @@ class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererE
// Check the default themes once we reach the root view without success
if (!$view->parent) {
for ($i = count($this->defaultThemes) - 1; $i >= 0; --$i) {
for ($i = \count($this->defaultThemes) - 1; $i >= 0; --$i) {
$this->loadResourcesFromTheme($cacheKey, $this->defaultThemes[$i]);
// CONTINUE LOADING (see doc comment)
}

4
src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
View File

@ -64,7 +64,7 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
return $node;
}
if ($node instanceof FilterExpression && in_array($node->getNode('filter')->getAttribute('value'), array('trans', 'transchoice'))) {
if ($node instanceof FilterExpression && \in_array($node->getNode('filter')->getAttribute('value'), array('trans', 'transchoice'))) {
$arguments = $node->getNode('arguments');
$ind = 'trans' === $node->getNode('filter')->getAttribute('value') ? 1 : 2;
if ($this->isNamedArguments($arguments)) {
@ -119,7 +119,7 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
private function isNamedArguments($arguments)
{
foreach ($arguments as $name => $node) {
if (!is_int($name)) {
if (!\is_int($name)) {
return true;
}
}

2
src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
View File

@ -75,7 +75,7 @@ class DumpExtensionTest extends TestCase
array_unshift($args, $context);
array_unshift($args, $twig);
$dump = call_user_func_array(array($extension, 'dump'), $args);
$dump = \call_user_func_array(array($extension, 'dump'), $args);
if ($debug) {
$this->assertStringStartsWith('<script>', $dump);

2
src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
View File

@ -56,7 +56,7 @@ class StopwatchExtensionTest extends TestCase
protected function getStopwatch($events = array())
{
$events = is_array($events) ? $events : array($events);
$events = \is_array($events) ? $events : array($events);
$stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
$i = -1;

2
src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
View File

@ -207,7 +207,7 @@ class TranslationExtensionTest extends TestCase
$translator = new Translator('en', new MessageSelector());
}
if (is_array($template)) {
if (\is_array($template)) {
$loader = new TwigArrayLoader($template);
} else {
$loader = new TwigArrayLoader(array('index' => $template));

2
src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
View File

@ -90,7 +90,7 @@ class TwigExtractorTest extends TestCase
$extractor->extract($resources, new MessageCatalogue('en'));
} catch (Error $e) {
if (method_exists($e, 'getSourceContext')) {
$this->assertSame(dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', DIRECTORY_SEPARATOR), $e->getFile());
$this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', DIRECTORY_SEPARATOR), $e->getFile());
$this->assertSame(1, $e->getLine());
$this->assertSame('Unclosed "block".', $e->getMessage());
} else {

2
src/Symfony/Bundle/FrameworkBundle/Client.php
View File

@ -166,7 +166,7 @@ class Client extends BaseClient
$r = new \ReflectionObject($this->kernel);
$autoloader = dirname($r->getFileName()).'/autoload.php';
$autoloader = \dirname($r->getFileName()).'/autoload.php';
if (is_file($autoloader)) {
$autoloader = str_replace("'", "\\'", $autoloader);
} else {

2
src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
View File

@ -83,7 +83,7 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
}
if (!$configuration instanceof ConfigurationInterface) {
throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable', get_class($configuration)));
throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable', \get_class($configuration)));
}
}

2
src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
View File

@ -227,7 +227,7 @@ EOT
private function symlink($originDir, $targetDir, $relative = false)
{
if ($relative) {
$originDir = $this->filesystem->makePathRelative($originDir, realpath(dirname($targetDir)));
$originDir = $this->filesystem->makePathRelative($originDir, realpath(\dirname($targetDir)));
}
$this->filesystem->symlink($originDir, $targetDir);
if (!file_exists($targetDir)) {

12
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

@ -124,7 +124,7 @@ EOF
{
// create a temporary kernel
$realKernel = $this->getContainer()->get('kernel');
$realKernelClass = get_class($realKernel);
$realKernelClass = \get_class($realKernel);
$namespace = '';
if (false !== $pos = strrpos($realKernelClass, '\\')) {
$namespace = substr($realKernelClass, 0, $pos);
@ -144,8 +144,8 @@ EOF
$warmer->warmUp($warmupDir);
// fix references to the Kernel in .meta files
$safeTempKernel = str_replace('\\', '\\\\', get_class($tempKernel));
$realKernelFQN = get_class($realKernel);
$safeTempKernel = str_replace('\\', '\\\\', \get_class($tempKernel));
$realKernelFQN = \get_class($realKernel);
foreach (Finder::create()->files()->depth('<3')->name('*.meta')->in($warmupDir) as $file) {
file_put_contents($file, preg_replace(
@ -166,8 +166,8 @@ EOF
}
// fix references to container's class
$tempContainerClass = get_class($tempKernel->getContainer());
$realContainerClass = get_class($realKernel->getContainer());
$tempContainerClass = \get_class($tempKernel->getContainer());
$realContainerClass = \get_class($realKernel->getContainer());
foreach (Finder::create()->files()->depth('<2')->name($tempContainerClass.'*')->in($warmupDir) as $file) {
$content = str_replace($tempContainerClass, $realContainerClass, file_get_contents($file));
file_put_contents($file, $content);
@ -195,7 +195,7 @@ EOF
// to avoid the many problems in serialized resources files
$class = substr($parentClass, 0, -1).'_';
// the temp container class must be changed too
$containerClass = var_export(substr(get_class($parent->getContainer()), 0, -1).'_', true);
$containerClass = var_export(substr(\get_class($parent->getContainer()), 0, -1).'_', true);
$code = <<<EOF
<?php

2
src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
View File

@ -23,7 +23,7 @@ abstract class ServerCommand extends ContainerAwareCommand
*/
public function isEnabled()
{
if (\PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
if (\PHP_VERSION_ID < 50400 || \defined('HHVM_VERSION')) {
return false;
}

2
src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
View File

@ -76,7 +76,7 @@ EOF
{
$io = new SymfonyStyle($input, $cliOutput = $output);
if (!extension_loaded('pcntl')) {
if (!\extension_loaded('pcntl')) {
$io->error(array(
'This command needs the pcntl extension to run.',
'You can either install it or use the "server:run" command instead to run the built-in web server.',

6
src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
View File

@ -181,8 +181,8 @@ EOF
$states[] = self::MESSAGE_UNUSED;
}
if (!in_array(self::MESSAGE_UNUSED, $states) && true === $input->getOption('only-unused')
|| !in_array(self::MESSAGE_MISSING, $states) && true === $input->getOption('only-missing')) {
if (!\in_array(self::MESSAGE_UNUSED, $states) && true === $input->getOption('only-unused')
|| !\in_array(self::MESSAGE_MISSING, $states) && true === $input->getOption('only-missing')) {
continue;
}
@ -246,7 +246,7 @@ EOF
if (mb_strlen($string, $encoding) > $length) {
return mb_substr($string, 0, $length - 3, $encoding).'...';
}
} elseif (strlen($string) > $length) {
} elseif (\strlen($string) > $length) {
return substr($string, 0, $length - 3).'...';
}

6
src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
View File

@ -82,7 +82,7 @@ EOF
// check format
$writer = $this->getContainer()->get('translation.writer');
$supportedFormats = $writer->getFormats();
if (!in_array($input->getOption('output-format'), $supportedFormats)) {
if (!\in_array($input->getOption('output-format'), $supportedFormats)) {
$io->error(array('Wrong output format', 'Supported formats are: '.implode(', ', $supportedFormats).'.'));
return 1;
@ -145,7 +145,7 @@ EOF
: new MergeOperation($currentCatalogue, $extractedCatalogue);
// Exit if no messages found.
if (!count($operation->getDomains())) {
if (!\count($operation->getDomains())) {
$io->warning('No translation messages were found.');
return;
@ -171,7 +171,7 @@ EOF
}, array_keys($operation->getObsoleteMessages($domain)))
);
$domainMessagesCount = count($list);
$domainMessagesCount = \count($list);
$io->section(sprintf('Messages extracted for domain "<info>%s</info>" (%d message%s)', $domain, $domainMessagesCount, $domainMessagesCount > 1 ? 's' : ''));
$io->listing($list);

6
src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
View File

@ -143,9 +143,9 @@ EOF
}
if (0 === $errors) {
$io->success(sprintf('All %d YAML files contain valid syntax.', count($filesInfo)));
$io->success(sprintf('All %d YAML files contain valid syntax.', \count($filesInfo)));
} else {
$io->warning(sprintf('%d YAML files have valid syntax and %d contain errors.', count($filesInfo) - $errors, $errors));
$io->warning(sprintf('%d YAML files have valid syntax and %d contain errors.', \count($filesInfo) - $errors, $errors));
}
return min($errors, 1);
@ -162,7 +162,7 @@ EOF
}
});
$output->writeln(json_encode($filesInfo, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
$output->writeln(json_encode($filesInfo, \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
return min($errors, 1);
}

12
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
View File

@ -72,11 +72,11 @@ abstract class Descriptor implements DescriptorInterface
case $object instanceof EventDispatcherInterface:
$this->describeEventDispatcherListeners($object, $options);
break;
case is_callable($object):
case \is_callable($object):
$this->describeCallable($object, $options);
break;
default:
throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', \get_class($object)));
}
}
@ -198,11 +198,11 @@ abstract class Descriptor implements DescriptorInterface
*/
protected function formatValue($value)
{
if (is_object($value)) {
return sprintf('object(%s)', get_class($value));
if (\is_object($value)) {
return sprintf('object(%s)', \get_class($value));
}
if (is_string($value)) {
if (\is_string($value)) {
return $value;
}
@ -218,7 +218,7 @@ abstract class Descriptor implements DescriptorInterface
*/
protected function formatParameter($value)
{
if (is_bool($value) || is_array($value) || (null === $value)) {
if (\is_bool($value) || \is_array($value) || (null === $value)) {
$jsonString = json_encode($value);
if (preg_match('/^(.{60})./us', $jsonString, $matches)) {

20
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
View File

@ -88,7 +88,7 @@ class JsonDescriptor extends Descriptor
} elseif ($service instanceof Definition) {
$this->writeData($this->getContainerDefinitionData($service), $options);
} else {
$this->writeData(get_class($service), $options);
$this->writeData(\get_class($service), $options);
}
}
@ -111,7 +111,7 @@ class JsonDescriptor extends Descriptor
$data['definitions'][$serviceId] = $this->getContainerDefinitionData($service);
}
} else {
$data['services'][$serviceId] = get_class($service);
$data['services'][$serviceId] = \get_class($service);
}
}
@ -169,7 +169,7 @@ class JsonDescriptor extends Descriptor
{
$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
if (defined('JSON_PRETTY_PRINT')) {
if (\defined('JSON_PRETTY_PRINT')) {
$flags |= JSON_PRETTY_PRINT;
}
@ -191,7 +191,7 @@ class JsonDescriptor extends Descriptor
'hostRegex' => '' !== $route->getHost() ? $route->compile()->getHostRegex() : '',
'scheme' => $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY',
'method' => $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY',
'class' => get_class($route),
'class' => \get_class($route),
'defaults' => $route->getDefaults(),
'requirements' => $requirements ?: 'NO CUSTOM',
'options' => $route->getOptions(),
@ -237,7 +237,7 @@ class JsonDescriptor extends Descriptor
}
if ($factory = $definition->getFactory()) {
if (is_array($factory)) {
if (\is_array($factory)) {
if ($factory[0] instanceof Reference) {
$data['factory_service'] = (string) $factory[0];
} elseif ($factory[0] instanceof Definition) {
@ -316,12 +316,12 @@ class JsonDescriptor extends Descriptor
{
$data = array();
if (is_array($callable)) {
if (\is_array($callable)) {
$data['type'] = 'function';
if (is_object($callable[0])) {
if (\is_object($callable[0])) {
$data['name'] = $callable[1];
$data['class'] = get_class($callable[0]);
$data['class'] = \get_class($callable[0]);
} else {
if (0 !== strpos($callable[1], 'parent::')) {
$data['name'] = $callable[1];
@ -338,7 +338,7 @@ class JsonDescriptor extends Descriptor
return $data;
}
if (is_string($callable)) {
if (\is_string($callable)) {
$data['type'] = 'function';
if (false === strpos($callable, '::')) {
@ -362,7 +362,7 @@ class JsonDescriptor extends Descriptor
if (method_exists($callable, '__invoke')) {
$data['type'] = 'object';
$data['name'] = get_class($callable);
$data['name'] = \get_class($callable);
return $data;
}

26
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
View File

@ -58,13 +58,13 @@ class MarkdownDescriptor extends Descriptor
."\n".'- Host Regex: '.('' !== $route->getHost() ? $route->compile()->getHostRegex() : '')
."\n".'- Scheme: '.($route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY')
."\n".'- Method: '.($route->getMethods() ? implode('|', $route->getMethods()) : 'ANY')
."\n".'- Class: '.get_class($route)
."\n".'- Class: '.\get_class($route)
."\n".'- Defaults: '.$this->formatRouterConfig($route->getDefaults())
."\n".'- Requirements: '.($requirements ? $this->formatRouterConfig($requirements) : 'NO CUSTOM')
."\n".'- Options: '.$this->formatRouterConfig($route->getOptions());
$this->write(isset($options['name'])
? $options['name']."\n".str_repeat('-', strlen($options['name']))."\n\n".$output
? $options['name']."\n".str_repeat('-', \strlen($options['name']))."\n\n".$output
: $output);
$this->write("\n");
}
@ -89,7 +89,7 @@ class MarkdownDescriptor extends Descriptor
$this->write("Container tags\n==============");
foreach ($this->findDefinitionsByTag($builder, $showPrivate) as $tag => $definitions) {
$this->write("\n\n".$tag."\n".str_repeat('-', strlen($tag)));
$this->write("\n\n".$tag."\n".str_repeat('-', \strlen($tag)));
foreach ($definitions as $serviceId => $definition) {
$this->write("\n\n");
$this->describeContainerDefinition($definition, array('omit_tags' => true, 'id' => $serviceId));
@ -113,7 +113,7 @@ class MarkdownDescriptor extends Descriptor
} elseif ($service instanceof Definition) {
$this->describeContainerDefinition($service, $childOptions);
} else {
$this->write(sprintf('**`%s`:** `%s`', $options['id'], get_class($service)));
$this->write(sprintf('**`%s`:** `%s`', $options['id'], \get_class($service)));
}
}
@ -128,7 +128,7 @@ class MarkdownDescriptor extends Descriptor
if (isset($options['tag'])) {
$title .= ' with tag `'.$options['tag'].'`';
}
$this->write($title."\n".str_repeat('=', strlen($title)));
$this->write($title."\n".str_repeat('=', \strlen($title)));
$serviceIds = isset($options['tag']) && $options['tag'] ? array_keys($builder->findTaggedServiceIds($options['tag'])) : $builder->getServiceIds();
$showPrivate = isset($options['show_private']) && $options['show_private'];
@ -168,7 +168,7 @@ class MarkdownDescriptor extends Descriptor
$this->write("\n\nServices\n--------\n");
foreach ($services['services'] as $id => $service) {
$this->write("\n");
$this->write(sprintf('- `%s`: `%s`', $id, get_class($service)));
$this->write(sprintf('- `%s`: `%s`', $id, \get_class($service)));
}
}
}
@ -210,7 +210,7 @@ class MarkdownDescriptor extends Descriptor
}
if ($factory = $definition->getFactory()) {
if (is_array($factory)) {
if (\is_array($factory)) {
if ($factory[0] instanceof Reference) {
$output .= "\n".'- Factory Service: `'.$factory[0].'`';
} elseif ($factory[0] instanceof Definition) {
@ -254,7 +254,7 @@ class MarkdownDescriptor extends Descriptor
*/
protected function describeContainerParameter($parameter, array $options = array())
{
$this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);
$this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);
}
/**
@ -300,12 +300,12 @@ class MarkdownDescriptor extends Descriptor
{
$string = '';
if (is_array($callable)) {
if (\is_array($callable)) {
$string .= "\n- Type: `function`";
if (is_object($callable[0])) {
if (\is_object($callable[0])) {
$string .= "\n".sprintf('- Name: `%s`', $callable[1]);
$string .= "\n".sprintf('- Class: `%s`', get_class($callable[0]));
$string .= "\n".sprintf('- Class: `%s`', \get_class($callable[0]));
} else {
if (0 !== strpos($callable[1], 'parent::')) {
$string .= "\n".sprintf('- Name: `%s`', $callable[1]);
@ -322,7 +322,7 @@ class MarkdownDescriptor extends Descriptor
return $this->write($string."\n");
}
if (is_string($callable)) {
if (\is_string($callable)) {
$string .= "\n- Type: `function`";
if (false === strpos($callable, '::')) {
@ -346,7 +346,7 @@ class MarkdownDescriptor extends Descriptor
if (method_exists($callable, '__invoke')) {
$string .= "\n- Type: `object`";
$string .= "\n".sprintf('- Name: `%s`', get_class($callable));
$string .= "\n".sprintf('- Name: `%s`', \get_class($callable));
return $this->write($string."\n");
}

30
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
View File

@ -55,8 +55,8 @@ class TextDescriptor extends Descriptor
$controller = $route->getDefault('_controller');
if ($controller instanceof \Closure) {
$controller = 'Closure';
} elseif (is_object($controller)) {
$controller = get_class($controller);
} elseif (\is_object($controller)) {
$controller = \get_class($controller);
}
$row[] = $controller;
}
@ -91,7 +91,7 @@ class TextDescriptor extends Descriptor
array('Scheme', ($route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY')),
array('Method', ($route->getMethods() ? implode('|', $route->getMethods()) : 'ANY')),
array('Requirements', ($requirements ? $this->formatRouterConfig($requirements) : 'NO CUSTOM')),
array('Class', get_class($route)),
array('Class', \get_class($route)),
array('Defaults', $this->formatRouterConfig($route->getDefaults())),
array('Options', $this->formatRouterConfig($route->getOptions())),
);
@ -154,7 +154,7 @@ class TextDescriptor extends Descriptor
$options['output']->table(
array('Service ID', 'Class'),
array(
array(isset($options['id']) ? $options['id'] : '-', get_class($service)),
array(isset($options['id']) ? $options['id'] : '-', \get_class($service)),
)
);
}
@ -196,10 +196,10 @@ class TextDescriptor extends Descriptor
foreach ($tags as $tag) {
foreach ($tag as $key => $value) {
if (!isset($maxTags[$key])) {
$maxTags[$key] = strlen($key);
$maxTags[$key] = \strlen($key);
}
if (strlen($value) > $maxTags[$key]) {
$maxTags[$key] = strlen($value);
if (\strlen($value) > $maxTags[$key]) {
$maxTags[$key] = \strlen($value);
}
}
}
@ -207,7 +207,7 @@ class TextDescriptor extends Descriptor
}
}
$tagsCount = count($maxTags);
$tagsCount = \count($maxTags);
$tagsNames = array_keys($maxTags);
$tableHeaders = array_merge(array('Service ID'), $tagsNames, array('Class name'));
@ -234,7 +234,7 @@ class TextDescriptor extends Descriptor
$alias = $definition;
$tableRows[] = array_merge(array($serviceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
} else {
$tableRows[] = array_merge(array($serviceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
$tableRows[] = array_merge(array($serviceId, \get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
}
}
@ -304,7 +304,7 @@ class TextDescriptor extends Descriptor
}
if ($factory = $definition->getFactory()) {
if (is_array($factory)) {
if (\is_array($factory)) {
if ($factory[0] instanceof Reference) {
$tableRows[] = array('Factory Service', $factory[0]);
} elseif ($factory[0] instanceof Definition) {
@ -418,15 +418,15 @@ class TextDescriptor extends Descriptor
*/
private function formatCallable($callable)
{
if (is_array($callable)) {
if (is_object($callable[0])) {
return sprintf('%s::%s()', get_class($callable[0]), $callable[1]);
if (\is_array($callable)) {
if (\is_object($callable[0])) {
return sprintf('%s::%s()', \get_class($callable[0]), $callable[1]);
}
return sprintf('%s::%s()', $callable[0], $callable[1]);
}
if (is_string($callable)) {
if (\is_string($callable)) {
return sprintf('%s()', $callable);
}
@ -435,7 +435,7 @@ class TextDescriptor extends Descriptor
}
if (method_exists($callable, '__invoke')) {
return sprintf('%s::__invoke()', get_class($callable));
return sprintf('%s::__invoke()', \get_class($callable));
}
throw new \InvalidArgumentException('Callable is not describable.');

16
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
View File

@ -161,7 +161,7 @@ class XmlDescriptor extends Descriptor
$routeXML->setAttribute('name', $name);
}
$routeXML->setAttribute('class', get_class($route));
$routeXML->setAttribute('class', \get_class($route));
$routeXML->appendChild($pathXML = $dom->createElement('path'));
$pathXML->setAttribute('regex', $route->compile()->getRegex());
@ -273,7 +273,7 @@ class XmlDescriptor extends Descriptor
} else {
$dom->appendChild($serviceXML = $dom->createElement('service'));
$serviceXML->setAttribute('id', $id);
$serviceXML->setAttribute('class', get_class($service));
$serviceXML->setAttribute('class', \get_class($service));
}
return $dom;
@ -340,7 +340,7 @@ class XmlDescriptor extends Descriptor
if ($factory = $definition->getFactory()) {
$serviceXML->appendChild($factoryXML = $dom->createElement('factory'));
if (is_array($factory)) {
if (\is_array($factory)) {
if ($factory[0] instanceof Reference) {
$factoryXML->setAttribute('service', (string) $factory[0]);
} elseif ($factory[0] instanceof Definition) {
@ -474,12 +474,12 @@ class XmlDescriptor extends Descriptor
$dom = new \DOMDocument('1.0', 'UTF-8');
$dom->appendChild($callableXML = $dom->createElement('callable'));
if (is_array($callable)) {
if (\is_array($callable)) {
$callableXML->setAttribute('type', 'function');
if (is_object($callable[0])) {
if (\is_object($callable[0])) {
$callableXML->setAttribute('name', $callable[1]);
$callableXML->setAttribute('class', get_class($callable[0]));
$callableXML->setAttribute('class', \get_class($callable[0]));
} else {
if (0 !== strpos($callable[1], 'parent::')) {
$callableXML->setAttribute('name', $callable[1]);
@ -496,7 +496,7 @@ class XmlDescriptor extends Descriptor
return $dom;
}
if (is_string($callable)) {
if (\is_string($callable)) {
$callableXML->setAttribute('type', 'function');
if (false === strpos($callable, '::')) {
@ -520,7 +520,7 @@ class XmlDescriptor extends Descriptor
if (method_exists($callable, '__invoke')) {
$callableXML->setAttribute('type', 'object');
$callableXML->setAttribute('name', get_class($callable));
$callableXML->setAttribute('name', \get_class($callable));
return $dom;
}

2
src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
View File

@ -355,7 +355,7 @@ class Controller extends ContainerAware
return;
}
if (!is_object($user = $token->getUser())) {
if (!\is_object($user = $token->getUser())) {
// e.g. anonymous authentication
return;
}

6
src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php
View File

@ -42,7 +42,7 @@ class ControllerNameParser
public function parse($controller)
{
$parts = explode(':', $controller);
if (3 !== count($parts) || in_array('', $parts, true)) {
if (3 !== \count($parts) || \in_array('', $parts, true)) {
throw new \InvalidArgumentException(sprintf('The "%s" controller is not a valid "a:b:c" controller string.', $controller));
}
@ -78,7 +78,7 @@ class ControllerNameParser
$msg = sprintf('The _controller value "%s:%s:%s" maps to a "%s" class, but this class was not found. Create this class or check the spelling of the class and its namespace.', $bundle, $controller, $action, $try);
}
if (count($bundles) > 1) {
if (\count($bundles) > 1) {
$msg = sprintf('Unable to find controller "%s:%s" in bundles %s.', $bundle, $controller, implode(', ', $bundles));
}
@ -136,7 +136,7 @@ class ControllerNameParser
}
$lev = levenshtein($nonExistentBundleName, $bundleName);
if ($lev <= strlen($nonExistentBundleName) / 3 && (null === $alternative || $lev < $shortest)) {
if ($lev <= \strlen($nonExistentBundleName) / 3 && (null === $alternative || $lev < $shortest)) {
$alternative = $bundleName;
$shortest = $lev;
}

2
src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
View File

@ -50,7 +50,7 @@ class RedirectController extends ContainerAware
}
$attributes = array();
if (false === $ignoreAttributes || is_array($ignoreAttributes)) {
if (false === $ignoreAttributes || \is_array($ignoreAttributes)) {
$attributes = $request->attributes->get('_route_params');
unset($attributes['route'], $attributes['permanent'], $attributes['ignoreAttributes']);
if ($ignoreAttributes) {

2
src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
View File

@ -24,7 +24,7 @@ class RouterDataCollector extends BaseRouterDataCollector
{
public function guessRoute(Request $request, $controller)
{
if (is_array($controller)) {
if (\is_array($controller)) {
$controller = $controller[0];
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheWarmerPass.php
View File

@ -43,7 +43,7 @@ class AddCacheWarmerPass implements CompilerPassInterface
// sort by priority and flatten
krsort($warmers);
$warmers = call_user_func_array('array_merge', $warmers);
$warmers = \call_user_func_array('array_merge', $warmers);
$container->getDefinition('cache_warmer')->replaceArgument(0, $warmers);
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigCachePass.php
View File

@ -38,7 +38,7 @@ class ConfigCachePass implements CompilerPassInterface
// sort by priority and flatten
krsort($resourceCheckers);
$resourceCheckers = call_user_func_array('array_merge', $resourceCheckers);
$resourceCheckers = \call_user_func_array('array_merge', $resourceCheckers);
$container->getDefinition('config_cache_factory')->replaceArgument(0, $resourceCheckers);
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PropertyInfoPass.php
View File

@ -69,6 +69,6 @@ class PropertyInfoPass implements CompilerPassInterface
krsort($sortedServices);
// Flatten the array
return call_user_func_array('array_merge', $sortedServices);
return \call_user_func_array('array_merge', $sortedServices);
}
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/SerializerPass.php
View File

@ -65,6 +65,6 @@ class SerializerPass implements CompilerPassInterface
krsort($sortedServices);
// Flatten the array
return call_user_func_array('array_merge', $sortedServices);
return \call_user_func_array('array_merge', $sortedServices);
}
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingAssetHelperPass.php
View File

@ -42,7 +42,7 @@ class TemplatingAssetHelperPass implements CompilerPassInterface
return;
}
if (!is_array($args[1])) {
if (!\is_array($args[1])) {
return;
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php
View File

@ -30,7 +30,7 @@ class TemplatingPass implements CompilerPassInterface
}
}
if (count($helpers) > 0) {
if (\count($helpers) > 0) {
$definition = $container->getDefinition('templating.engine.php');
$definition->addMethodCall('setHelpers', array($helpers));
}

4
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
View File

@ -59,7 +59,7 @@ class UnusedTagsPass implements CompilerPassInterface
foreach ($container->findUnusedTags() as $tag) {
// skip whitelisted tags
if (in_array($tag, $this->whitelist)) {
if (\in_array($tag, $this->whitelist)) {
continue;
}
@ -70,7 +70,7 @@ class UnusedTagsPass implements CompilerPassInterface
continue;
}
if (false !== strpos($definedTag, $tag) || levenshtein($tag, $definedTag) <= strlen($tag) / 3) {
if (false !== strpos($definedTag, $tag) || levenshtein($tag, $definedTag) <= \strlen($tag) / 3) {
$candidates[] = $definedTag;
}
}

38
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View File

@ -58,9 +58,9 @@ class Configuration implements ConfigurationInterface
->then(function ($v) {
if (!isset($v['templating'])
|| !$v['templating']['assets_version']
&& !count($v['templating']['assets_base_urls']['http'])
&& !count($v['templating']['assets_base_urls']['ssl'])
&& !count($v['templating']['packages'])
&& !\count($v['templating']['assets_base_urls']['http'])
&& !\count($v['templating']['assets_base_urls']['ssl'])
&& !\count($v['templating']['packages'])
) {
$v['assets'] = array(
'version' => null,
@ -78,9 +78,9 @@ class Configuration implements ConfigurationInterface
->ifTrue(function ($v) { return isset($v['templating']); })
->then(function ($v) {
if ($v['templating']['assets_version']
|| count($v['templating']['assets_base_urls']['http'])
|| count($v['templating']['assets_base_urls']['ssl'])
|| count($v['templating']['packages'])
|| \count($v['templating']['assets_base_urls']['http'])
|| \count($v['templating']['assets_base_urls']['ssl'])
|| \count($v['templating']['packages'])
) {
@trigger_error('The assets settings under framework.templating are deprecated since Symfony 2.7 and will be removed in 3.0. Use the framework.assets configuration key instead', E_USER_DEPRECATED);
@ -128,8 +128,8 @@ class Configuration implements ConfigurationInterface
->end()
->arrayNode('trusted_proxies')
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v) && null !== $v; })
->then(function ($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
->ifTrue(function ($v) { return !\is_array($v) && null !== $v; })
->then(function ($v) { return \is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
->end()
->prototype('scalar')
->validate()
@ -424,11 +424,11 @@ class Configuration implements ConfigurationInterface
->useAttributeAsKey('name')
->prototype('array')
->beforeNormalization()
->ifTrue(function ($v) { return is_array($v) && isset($v['mime_type']); })
->ifTrue(function ($v) { return \is_array($v) && isset($v['mime_type']); })
->then(function ($v) { return $v['mime_type']; })
->end()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->prototype('scalar')->end()
@ -449,7 +449,7 @@ class Configuration implements ConfigurationInterface
);
foreach ($urls as $i => $url) {
if (is_int($i)) {
if (\is_int($i)) {
if (0 === strpos($url, 'https://') || 0 === strpos($url, '//')) {
$urls['http'][] = $urls['ssl'][] = $url;
} else {
@ -479,7 +479,7 @@ class Configuration implements ConfigurationInterface
->addDefaultChildrenIfNoneSet()
->prototype('scalar')->defaultValue('FrameworkBundle:Form')->end()
->validate()
->ifTrue(function ($v) {return !in_array('FrameworkBundle:Form', $v); })
->ifTrue(function ($v) {return !\in_array('FrameworkBundle:Form', $v); })
->then(function ($v) {
return array_merge(array('FrameworkBundle:Form'), $v);
})
@ -495,7 +495,7 @@ class Configuration implements ConfigurationInterface
->performNoDeepMerging()
->addDefaultsIfNotSet()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->beforeNormalization()
@ -520,7 +520,7 @@ class Configuration implements ConfigurationInterface
->isRequired()
->requiresAtLeastOneElement()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->prototype('scalar')->end()
@ -530,7 +530,7 @@ class Configuration implements ConfigurationInterface
->children()
->arrayNode('loaders')
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->prototype('scalar')->end()
@ -556,7 +556,7 @@ class Configuration implements ConfigurationInterface
->performNoDeepMerging()
->addDefaultsIfNotSet()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->beforeNormalization()
@ -596,7 +596,7 @@ class Configuration implements ConfigurationInterface
->arrayNode('base_urls')
->requiresAtLeastOneElement()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->prototype('scalar')->end()
@ -620,7 +620,7 @@ class Configuration implements ConfigurationInterface
->arrayNode('base_urls')
->requiresAtLeastOneElement()
->beforeNormalization()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return array($v); })
->end()
->prototype('scalar')->end()
@ -687,7 +687,7 @@ class Configuration implements ConfigurationInterface
->prototype('scalar')->end()
->treatFalseLike(array())
->validate()
->ifTrue(function ($v) { return !is_array($v); })
->ifTrue(function ($v) { return !\is_array($v); })
->then(function ($v) { return (array) $v; })
->end()
->end()

22
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -49,7 +49,7 @@ class FrameworkExtension extends Extension
*/
public function load(array $configs, ContainerBuilder $container)
{
$loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__).'/Resources/config'));
$loader = new XmlFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
$loader->load('web.xml');
$loader->load('services.xml');
@ -439,7 +439,7 @@ class FrameworkExtension extends Extension
$loaders = array_map(function ($loader) { return new Reference($loader); }, $config['loaders']);
// Use a delegation unless only a single loader was registered
if (1 === count($loaders)) {
if (1 === \count($loaders)) {
$container->setAlias('templating.loader', (string) reset($loaders));
} else {
$container->getDefinition('templating.loader.chain')->addArgument($loaders);
@ -468,7 +468,7 @@ class FrameworkExtension extends Extension
$engines = array_map(function ($engine) { return new Reference('templating.engine.'.$engine); }, $config['engines']);
// Use a delegation unless only a single engine was registered
if (1 === count($engines)) {
if (1 === \count($engines)) {
$container->setAlias('templating', (string) reset($engines));
} else {
$templateEngineDefinition = $container->getDefinition('templating.engine.delegating');
@ -484,7 +484,7 @@ class FrameworkExtension extends Extension
;
// configure the PHP engine if needed
if (in_array('php', $config['engines'], true)) {
if (\in_array('php', $config['engines'], true)) {
$loader->load('templating_php.xml');
$container->setParameter('templating.helper.form.resources', $config['form']['resources']);
@ -592,17 +592,17 @@ class FrameworkExtension extends Extension
if (class_exists('Symfony\Component\Validator\Validation')) {
$r = new \ReflectionClass('Symfony\Component\Validator\Validation');
$dirs[] = dirname($r->getFileName()).'/Resources/translations';
$dirs[] = \dirname($r->getFileName()).'/Resources/translations';
}
if (class_exists('Symfony\Component\Form\Form')) {
$r = new \ReflectionClass('Symfony\Component\Form\Form');
$dirs[] = dirname($r->getFileName()).'/Resources/translations';
$dirs[] = \dirname($r->getFileName()).'/Resources/translations';
}
if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) {
$r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException');
$dirs[] = dirname(dirname($r->getFileName())).'/Resources/translations';
$dirs[] = \dirname(\dirname($r->getFileName())).'/Resources/translations';
}
$rootDir = $container->getParameter('kernel.root_dir');
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
@ -676,11 +676,11 @@ class FrameworkExtension extends Extension
$container->setParameter('validator.translation_domain', $config['translation_domain']);
list($xmlMappings, $yamlMappings) = $this->getValidatorMappingFiles($container);
if (count($xmlMappings) > 0) {
if (\count($xmlMappings) > 0) {
$validatorBuilder->addMethodCall('addXmlMappings', array($xmlMappings));
}
if (count($yamlMappings) > 0) {
if (\count($yamlMappings) > 0) {
$validatorBuilder->addMethodCall('addYamlMappings', array($yamlMappings));
}
@ -719,7 +719,7 @@ class FrameworkExtension extends Extension
if (interface_exists('Symfony\Component\Form\FormInterface')) {
$reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
$files[0][] = dirname($reflClass->getFileName()).'/Resources/config/validation.xml';
$files[0][] = \dirname($reflClass->getFileName()).'/Resources/config/validation.xml';
$container->addResource(new FileResource($files[0][0]));
}
@ -935,7 +935,7 @@ class FrameworkExtension extends Extension
*/
public function getXsdValidationBasePath()
{
return dirname(__DIR__).'/Resources/config/schema';
return \dirname(__DIR__).'/Resources/config/schema';
}
public function getNamespace()

2
src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
View File

@ -90,7 +90,7 @@ class DelegatingLoader extends BaseDelegatingLoader
$this->loading = false;
foreach ($collection->all() as $route) {
if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {
if (!\is_string($controller = $route->getDefault('_controller')) || !$controller) {
continue;
}

8
src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
View File

@ -126,7 +126,7 @@ class Router extends BaseRouter implements WarmableInterface
*/
private function resolve($value)
{
if (is_array($value)) {
if (\is_array($value)) {
foreach ($value as $key => $val) {
$value[$key] = $this->resolve($val);
}
@ -134,7 +134,7 @@ class Router extends BaseRouter implements WarmableInterface
return $value;
}
if (!is_string($value)) {
if (!\is_string($value)) {
return $value;
}
@ -148,7 +148,7 @@ class Router extends BaseRouter implements WarmableInterface
$resolved = $container->getParameter($match[1]);
if (is_string($resolved) || is_numeric($resolved)) {
if (\is_string($resolved) || is_numeric($resolved)) {
return (string) $resolved;
}
@ -157,7 +157,7 @@ class Router extends BaseRouter implements WarmableInterface
'must be a string or numeric, but it is of type %s.',
$match[1],
$value,
gettype($resolved)
\gettype($resolved)
)
);
}, $value);

2
src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
View File

@ -66,7 +66,7 @@ class DelegatingEngine extends BaseDelegatingEngine implements EngineInterface
private function resolveEngines()
{
foreach ($this->engines as $i => $engine) {
if (is_string($engine)) {
if (\is_string($engine)) {
$this->engines[$i] = $this->container->get($engine);
}
}

2
src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
View File

@ -66,7 +66,7 @@ class GlobalVariables
}
$user = $token->getUser();
if (!is_object($user)) {
if (!\is_object($user)) {
return;
}

4
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
View File

@ -43,10 +43,10 @@ class AssetsHelper extends Helper
public function getUrl($path, $packageName = null, $version = null)
{
// BC layer to be removed in 3.0
if (3 === func_num_args()) {
if (3 === \func_num_args()) {
@trigger_error('Forcing a version for an asset was deprecated in 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
$args = func_get_args();
$args = \func_get_args();
return $this->getLegacyAssetUrl($path, $packageName, $args[2]);
}

8
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
View File

@ -84,7 +84,7 @@ class CodeHelper extends Helper
$short = array_pop($parts);
$formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
} elseif ('array' === $item[0]) {
$formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
$formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
} elseif ('string' === $item[0]) {
$formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES, $this->getCharset()));
} elseif ('null' === $item[0]) {
@ -97,7 +97,7 @@ class CodeHelper extends Helper
$formattedValue = str_replace("\n", '', var_export(htmlspecialchars((string) $item[1], ENT_QUOTES, $this->getCharset()), true));
}
$result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
$result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
}
return implode(', ', $result);
@ -114,7 +114,7 @@ class CodeHelper extends Helper
public function fileExcerpt($file, $line)
{
if (is_readable($file)) {
if (extension_loaded('fileinfo')) {
if (\extension_loaded('fileinfo')) {
$finfo = new \finfo();
// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
@ -131,7 +131,7 @@ class CodeHelper extends Helper
$content = explode('<br />', $code);
$lines = array();
for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {
for ($i = max($line - 3, 1), $max = min($line + 3, \count($content)); $i <= $max; ++$i) {
$lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
}

2
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php
View File

@ -37,7 +37,7 @@ class StopwatchHelper extends Helper
{
if (null !== $this->stopwatch) {
if (method_exists($this->stopwatch, $method)) {
return call_user_func_array(array($this->stopwatch, $method), $arguments);
return \call_user_func_array(array($this->stopwatch, $method), $arguments);
}
throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));

2
src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php
View File

@ -46,7 +46,7 @@ class PhpEngine extends BasePhpEngine implements EngineInterface
throw new \InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
}
if (is_string($this->helpers[$name])) {
if (\is_string($this->helpers[$name])) {
$this->helpers[$name] = $this->container->get($this->helpers[$name]);
$this->helpers[$name]->setCharset($this->charset);
}

2
src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php
View File

@ -34,7 +34,7 @@ class TemplateFilenameParser implements TemplateNameParserInterface
$parts = explode('/', str_replace('\\', '/', $name));
$elements = explode('.', array_pop($parts));
if (3 > count($elements)) {
if (3 > \count($elements)) {
return false;
}
$engine = array_pop($elements);

8
src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
View File

@ -59,7 +59,7 @@ abstract class KernelTestCase extends TestCase
}
if (!is_dir($dir)) {
$dir = dirname($dir);
$dir = \dirname($dir);
}
return $dir;
@ -82,11 +82,11 @@ abstract class KernelTestCase extends TestCase
$dir = realpath($reversedArgs[$argIndex - 1]);
break;
} elseif (0 === strpos($testArg, '--configuration=')) {
$argPath = substr($testArg, strlen('--configuration='));
$argPath = substr($testArg, \strlen('--configuration='));
$dir = realpath($argPath);
break;
} elseif (0 === strpos($testArg, '-c')) {
$argPath = substr($testArg, strlen('-c'));
$argPath = substr($testArg, \strlen('-c'));
$dir = realpath($argPath);
break;
}
@ -122,7 +122,7 @@ abstract class KernelTestCase extends TestCase
$finder = new Finder();
$finder->name('*Kernel.php')->depth(0)->in($dir);
$results = iterator_to_array($finder);
if (!count($results)) {
if (!\count($results)) {
throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to https://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
View File

@ -81,6 +81,6 @@ class CacheClearCommandTest extends TestCase
}
}
$this->assertTrue($found, 'Kernel file should present as resource');
$this->assertRegExp(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', get_class($this->kernel->getContainer())), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
$this->assertRegExp(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', \get_class($this->kernel->getContainer())), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
}
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
View File

@ -81,7 +81,7 @@ class ControllerResolverTest extends BaseControllerResolverTest
$controller = $resolver->getController($request);
$this->assertInstanceOf(get_class($this), $controller[0]);
$this->assertInstanceOf(\get_class($this), $controller[0]);
$this->assertSame('controllerMethod1', $controller[1]);
}

10
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View File

@ -254,19 +254,19 @@ abstract class FrameworkExtensionTest extends TestCase
$files = array_map('realpath', $options['resource_files']['en']);
$ref = new \ReflectionClass('Symfony\Component\Validator\Validation');
$this->assertContains(
strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
strtr(\dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
$files,
'->registerTranslatorConfiguration() finds Validator translation resources'
);
$ref = new \ReflectionClass('Symfony\Component\Form\Form');
$this->assertContains(
strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
strtr(\dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
$files,
'->registerTranslatorConfiguration() finds Form translation resources'
);
$ref = new \ReflectionClass('Symfony\Component\Security\Core\Security');
$this->assertContains(
strtr(dirname($ref->getFileName()).'/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
strtr(\dirname($ref->getFileName()).'/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
$files,
'->registerTranslatorConfiguration() finds Security translation resources'
);
@ -303,7 +303,7 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('full');
$ref = new \ReflectionClass('Symfony\Component\Form\Form');
$xmlMappings = array(dirname($ref->getFileName()).'/Resources/config/validation.xml');
$xmlMappings = array(\dirname($ref->getFileName()).'/Resources/config/validation.xml');
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
@ -596,7 +596,7 @@ abstract class FrameworkExtensionTest extends TestCase
protected function createContainerFromFile($file, $data = array())
{
$cacheKey = md5(get_class($this).$file.serialize($data));
$cacheKey = md5(\get_class($this).$file.serialize($data));
if (isset(self::$containerCache[$cacheKey])) {
return self::$containerCache[$cacheKey];
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php
View File

@ -22,7 +22,7 @@ class AnnotatedController
*/
public function requestDefaultNullAction(Request $request = null)
{
return new Response($request ? get_class($request) : null);
return new Response($request ? \get_class($request) : null);
}
/**

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
View File

@ -68,6 +68,6 @@ class WebTestCase extends BaseWebTestCase
protected static function getVarDir()
{
return substr(strrchr(get_called_class(), '\\'), 1);
return substr(strrchr(\get_called_class(), '\\'), 1);
}
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
View File

@ -32,7 +32,7 @@ while ($dir !== $lastDir) {
break;
}
$dir = dirname($dir);
$dir = \dirname($dir);
}
use Symfony\Component\Config\Loader\LoaderInterface;

4
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
View File

@ -36,7 +36,7 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
// should be moved to the Form component once absolute file paths are supported
// by the default name parser in the Templating component
$reflClass = new \ReflectionClass('Symfony\Bundle\FrameworkBundle\FrameworkBundle');
$root = realpath(dirname($reflClass->getFileName()).'/Resources/views');
$root = realpath(\dirname($reflClass->getFileName()).'/Resources/views');
$rootTheme = realpath(__DIR__.'/Resources');
$templateNameParser = new StubTemplateNameParser($root, $rootTheme);
$loader = new FilesystemLoader(array());
@ -105,7 +105,7 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
protected function renderEnctype(FormView $view)
{
if (!method_exists($form = $this->engine->get('form'), 'enctype')) {
$this->markTestSkipped(sprintf('Deprecated method %s->enctype() is not implemented.', get_class($form)));
$this->markTestSkipped(sprintf('Deprecated method %s->enctype() is not implemented.', \get_class($form)));
}
return (string) $form->enctype($view);

4
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
View File

@ -60,7 +60,7 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
// should be moved to the Form component once absolute file paths are supported
// by the default name parser in the Templating component
$reflClass = new \ReflectionClass('Symfony\Bundle\FrameworkBundle\FrameworkBundle');
$root = realpath(dirname($reflClass->getFileName()).'/Resources/views');
$root = realpath(\dirname($reflClass->getFileName()).'/Resources/views');
$rootTheme = realpath(__DIR__.'/Resources');
$templateNameParser = new StubTemplateNameParser($root, $rootTheme);
$loader = new FilesystemLoader(array());
@ -94,7 +94,7 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
protected function renderEnctype(FormView $view)
{
if (!method_exists($form = $this->engine->get('form'), 'enctype')) {
$this->markTestSkipped(sprintf('Deprecated method %s->enctype() is not implemented.', get_class($form)));
$this->markTestSkipped(sprintf('Deprecated method %s->enctype() is not implemented.', \get_class($form)));
}
return (string) $form->enctype($view);

2
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
View File

@ -27,7 +27,7 @@ class TemplateNameParserTest extends TestCase
->expects($this->any())
->method('getBundle')
->will($this->returnCallback(function ($bundle) {
if (in_array($bundle, array('SensioFooBundle', 'SensioCmsFooBundle', 'FooBundle'))) {
if (\in_array($bundle, array('SensioFooBundle', 'SensioCmsFooBundle', 'FooBundle'))) {
return true;
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
View File

@ -22,7 +22,7 @@ class ConstraintValidatorFactoryTest extends TestCase
{
public function testGetInstanceCreatesValidator()
{
$class = get_class($this->getMockForAbstractClass('Symfony\\Component\\Validator\\ConstraintValidator'));
$class = \get_class($this->getMockForAbstractClass('Symfony\\Component\\Validator\\ConstraintValidator'));
$constraint = $this->getMockBuilder('Symfony\\Component\\Validator\\Constraint')->getMock();
$constraint

2
src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
View File

@ -208,7 +208,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
} elseif (self::MESSAGE_TOKEN === $item) {
$message = $this->getValue($tokenIterator);
if (count($sequence) === ($sequenceKey + 1)) {
if (\count($sequence) === ($sequenceKey + 1)) {
break;
}
} elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {

4
src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php
View File

@ -113,9 +113,9 @@ class PhpStringTokenParser
if (isset(self::$replacements[$str])) {
return self::$replacements[$str];
} elseif ('x' === $str[0] || 'X' === $str[0]) {
return chr(hexdec($str));
return \chr(hexdec($str));
} else {
return chr(octdec($str));
return \chr(octdec($str));
}
}

2
src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php
View File

@ -58,7 +58,7 @@ class TranslationLoader
$extension = $catalogue->getLocale().'.'.$format;
$files = $finder->files()->name('*.'.$extension)->in($directory);
foreach ($files as $file) {
$domain = substr($file->getFilename(), 0, -1 * strlen($extension) - 1);
$domain = substr($file->getFilename(), 0, -1 * \strlen($extension) - 1);
$catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));
}
}

4
src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
View File

@ -67,11 +67,11 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
if (!isset($this->validators[$name])) {
if (!class_exists($name)) {
throw new ValidatorException(sprintf('Constraint validator "%s" does not exist or it is not enabled. Check the "validatedBy" method in your constraint class "%s".', $name, get_class($constraint)));
throw new ValidatorException(sprintf('Constraint validator "%s" does not exist or it is not enabled. Check the "validatedBy" method in your constraint class "%s".', $name, \get_class($constraint)));
}
$this->validators[$name] = new $name();
} elseif (is_string($this->validators[$name])) {
} elseif (\is_string($this->validators[$name])) {
$this->validators[$name] = $this->container->get($this->validators[$name]);
}

4
src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
View File

@ -95,7 +95,7 @@ EOF
foreach ($input->getArgument('arguments') as $argument) {
$data = explode(':', $argument, 2);
if (count($data) > 1) {
if (\count($data) > 1) {
$objectIdentities[] = new ObjectIdentity($data[1], strtr($data[0], '/', '\\'));
} else {
$maskBuilder->add($data[0]);
@ -120,7 +120,7 @@ EOF
foreach ($userOption as $user) {
$data = explode(':', $user, 2);
if (1 === count($data)) {
if (1 === \count($data)) {
throw new \InvalidArgumentException('The user must follow the format "Acme/MyUser:username".');
}

Some files were not shown because too many files have changed in this diff Show More