Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[CS Fix] Consistent coding-style of concatenation operator usage

  • Loading branch information...
commit 7c47e34928c39e4797edc841423237a16588395e 1 parent 54b32f1
@canni canni authored
Showing with 305 additions and 305 deletions.
  1. +2 −2 UPGRADE-2.1.md
  2. +1 −1  UPGRADE-2.2.md
  3. +1 −1  src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
  4. +5 −5 src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
  5. +2 −2 src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
  6. +1 −1  src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
  7. +2 −2 src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
  8. +2 −2 src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php
  9. +1 −1  src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
  10. +1 −1  src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
  11. +1 −1  src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
  12. +2 −2 src/Symfony/Bundle/FrameworkBundle/Resources/config/router.php
  13. +1 −1  src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
  14. +1 −1  src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
  15. +1 −1  src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
  16. +2 −2 src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
  17. +1 −1  src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
  18. +1 −1  src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php
  19. +6 −6 src/Symfony/Component/ClassLoader/ClassLoader.php
  20. +1 −1  src/Symfony/Component/ClassLoader/ClassMapGenerator.php
  21. +1 −1  src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
  22. +1 −1  src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
  23. +1 −1  src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php
  24. +2 −2 src/Symfony/Component/Config/Definition/ReferenceDumper.php
  25. +3 −3 src/Symfony/Component/Console/Helper/DialogHelper.php
  26. +1 −1  src/Symfony/Component/Console/Helper/ProgressHelper.php
  27. +7 −7 src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
  28. +1 −1  src/Symfony/Component/DependencyInjection/Extension/Extension.php
  29. +1 −1  src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php
  30. +1 −1  src/Symfony/Component/Filesystem/Filesystem.php
  31. +5 −5 src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
  32. +11 −11 src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
  33. +6 −6 src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
  34. +4 −4 src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
  35. +2 −2 src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
  36. +1 −1  src/Symfony/Component/Form/Extension/Core/ChoiceList/LazyChoiceList.php
  37. +1 −1  src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
  38. +1 −1  src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
  39. +1 −1  src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
  40. +1 −1  src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
  41. +1 −1  src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
  42. +3 −3 src/Symfony/Component/Form/Extension/Core/Type/FormType.php
  43. +1 −1  src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
  44. +2 −2 src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
  45. +5 −5 src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
  46. +9 −9 src/Symfony/Component/Form/Form.php
  47. +2 −2 src/Symfony/Component/Form/FormRenderer.php
  48. +2 −2 src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
  49. +2 −2 src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
  50. +55 −55 src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
  51. +2 −2 src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
  52. +4 −4 src/Symfony/Component/Form/Tests/SimpleFormTest.php
  53. +1 −1  src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
  54. +1 −1  src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
  55. +1 −1  src/Symfony/Component/HttpKernel/Kernel.php
  56. +2 −2 src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
  57. +2 −2 src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
  58. +1 −1  src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php
  59. +1 −1  src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
  60. +1 −1  src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
  61. +1 −1  src/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php
  62. +8 −8 src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
  63. +2 −2 src/Symfony/Component/Locale/Resources/data/UPDATE.txt
  64. +3 −3 src/Symfony/Component/OptionsResolver/Options.php
  65. +2 −2 src/Symfony/Component/OptionsResolver/OptionsResolver.php
  66. +4 −4 src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
  67. +1 −1  src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php
  68. +2 −2 src/Symfony/Component/Process/Tests/AbstractProcessTest.php
  69. +2 −2 src/Symfony/Component/PropertyAccess/PropertyAccessor.php
  70. +3 −3 src/Symfony/Component/PropertyAccess/PropertyPath.php
  71. +5 −5 src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
  72. +2 −2 src/Symfony/Component/PropertyAccess/StringUtil.php
  73. +9 −9 src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
  74. +5 −5 src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
  75. +3 −3 src/Symfony/Component/Routing/Generator/UrlGenerator.php
  76. +1 −1  src/Symfony/Component/Routing/Loader/XmlFileLoader.php
  77. +1 −1  src/Symfony/Component/Routing/Route.php
  78. +1 −1  src/Symfony/Component/Routing/RouteCollection.php
  79. +2 −2 src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
  80. +1 −1  src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
  81. +1 −1  src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
  82. +1 −1  src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
  83. +1 −1  src/Symfony/Component/Security/Tests/Core/Encoder/BCryptPasswordEncoderTest.php
  84. +6 −6 src/Symfony/Component/Security/Tests/Http/Firewall/DigestDataTest.php
  85. +1 −1  src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
  86. +7 −7 src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
  87. +6 −6 src/Symfony/Component/Translation/Dumper/MoFileDumper.php
  88. +4 −4 src/Symfony/Component/Translation/Loader/schema/dic/xliff-core/xml.xsd
  89. +1 −1  src/Symfony/Component/Translation/README.md
  90. +1 −1  src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
  91. +2 −2 src/Symfony/Component/Validator/ConstraintViolation.php
  92. +1 −1  src/Symfony/Component/Validator/ConstraintViolationList.php
  93. +2 −2 src/Symfony/Component/Validator/Constraints/All.php
  94. +3 −3 src/Symfony/Component/Validator/Constraints/Collection.php
  95. +1 −1  src/Symfony/Component/Validator/Constraints/Count.php
  96. +1 −1  src/Symfony/Component/Validator/Constraints/Length.php
  97. +1 −1  src/Symfony/Component/Validator/Constraints/Range.php
  98. +2 −2 src/Symfony/Component/Validator/Constraints/Regex.php
  99. +1 −1  src/Symfony/Component/Validator/Constraints/Valid.php
  100. +2 −2 src/Symfony/Component/Validator/ExecutionContext.php
  101. +2 −2 src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
  102. +1 −1  src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
  103. +1 −1  src/Symfony/Component/Validator/Tests/Fixtures/Entity.php
  104. +2 −2 src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
  105. +4 −4 src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
  106. +6 −6 src/Symfony/Component/Validator/Validator.php
  107. +1 −1  src/Symfony/Component/Yaml/Tests/InlineTest.php
View
4 UPGRADE-2.1.md
@@ -901,7 +901,7 @@
public function guessPattern($class, $property)
{
if (/* condition */) {
- return new ValueGuess('.{' . $minLength . ',}', Guess::LOW_CONFIDENCE);
+ return new ValueGuess('.{'.$minLength.',}', Guess::LOW_CONFIDENCE);
}
}
```
@@ -1189,7 +1189,7 @@
public function isPropertyValid(ExecutionContext $context)
{
// ...
- $propertyPath = $context->getPropertyPath() . '.property';
+ $propertyPath = $context->getPropertyPath().'.property';
$context->setPropertyPath($propertyPath);
$context->addViolation('Error Message', array(), null);
}
View
2  UPGRADE-2.2.md
@@ -464,7 +464,7 @@
$path .= '.';
}
- $context->getGraphWalker()->walkReference($someObject, $group, $path . 'myProperty', false);
+ $context->getGraphWalker()->walkReference($someObject, $group, $path.'myProperty', false);
}
}
```
View
2  src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -304,7 +304,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, $cacheName)
{
$cacheDriver = $objectManager[$cacheName.'_driver'];
- $cacheDriverService = $this->getObjectManagerElementName($objectManager['name'] . '_' . $cacheName);
+ $cacheDriverService = $this->getObjectManagerElementName($objectManager['name'].'_'.$cacheName);
switch ($cacheDriver['type']) {
case 'service':
View
10 src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -51,21 +51,21 @@ public function process(ContainerBuilder $container)
*/
private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension)
{
- if ( ! $container->hasParameter('validator.mapping.loader.' . $mapping . '_files_loader.mapping_files')) {
+ if ( ! $container->hasParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files')) {
return;
}
- $files = $container->getParameter('validator.mapping.loader.' . $mapping . '_files_loader.mapping_files');
- $validationPath = 'Resources/config/validation.' . $this->managerType . '.' . $extension;
+ $files = $container->getParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files');
+ $validationPath = 'Resources/config/validation.'.$this->managerType.'.'.$extension;
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[] = realpath($file);
$container->addResource(new FileResource($file));
}
}
- $container->setParameter('validator.mapping.loader.' . $mapping . '_files_loader.mapping_files', $files);
+ $container->setParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files', $files);
}
}
View
4 src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
@@ -120,7 +120,7 @@ public function testCollapsedEntityField()
*/
public function testCollapsedEntityFieldWithChoices()
{
- $choices = $this->em->createQuery('SELECT c FROM ' . self::ENTITY_CLASS . ' c')->getResult();
+ $choices = $this->em->createQuery('SELECT c FROM '.self::ENTITY_CLASS.' c')->getResult();
$this->setMaxRunningTime(1);
for ($i = 0; $i < 40; ++$i) {
@@ -139,7 +139,7 @@ public function testCollapsedEntityFieldWithChoices()
*/
public function testCollapsedEntityFieldWithPreferredChoices()
{
- $choices = $this->em->createQuery('SELECT c FROM ' . self::ENTITY_CLASS . ' c')->getResult();
+ $choices = $this->em->createQuery('SELECT c FROM '.self::ENTITY_CLASS.' c')->getResult();
$this->setMaxRunningTime(1);
for ($i = 0; $i < 40; ++$i) {
View
2  src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -95,7 +95,7 @@ public function validate($entity, Constraint $constraint)
if (count($relatedId) > 1) {
throw new ConstraintDefinitionException(
"Associated entities are not allowed to have more than one identifier field to be " .
- "part of a unique constraint in: " . $class->getName() . "#" . $fieldName
+ "part of a unique constraint in: ".$class->getName()."#".$fieldName
);
}
$criteria[$fieldName] = array_pop($relatedId);
View
4 src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -84,7 +84,7 @@ public function __construct($class, $labelPath = null, $choices = null, $queryOb
{
$this->class = $class;
- $queryClass = $this->class . 'Query';
+ $queryClass = $this->class.'Query';
$query = new $queryClass();
$this->identifier = $query->getTableMap()->getPrimaryKeys();
@@ -198,7 +198,7 @@ public function getChoicesForValues(array $values)
{
if (!$this->loaded) {
if (1 === count($this->identifier)) {
- $filterBy = 'filterBy' . current($this->identifier)->getPhpName();
+ $filterBy = 'filterBy'.current($this->identifier)->getPhpName();
return (array) $this->query->create()
->$filterBy($values)
View
4 src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php
@@ -53,7 +53,7 @@ class PropelUserProvider implements UserProviderInterface
public function __construct($class, $property = null)
{
$this->class = $class;
- $this->queryClass = $class . 'Query';
+ $this->queryClass = $class.'Query';
$this->property = $property;
}
@@ -66,7 +66,7 @@ public function loadUserByUsername($username)
$query = $queryClass::create();
if (null !== $this->property) {
- $filter = 'filterBy' . ucfirst($this->property);
+ $filter = 'filterBy'.ucfirst($this->property);
$query->$filter($username);
} else {
$query->filterByUsername($username);
View
2  src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
@@ -29,7 +29,7 @@ public function compile(\Twig_Compiler $compiler)
if (isset($arguments[0])) {
$compiler->subcompile($arguments[0]);
- $compiler->raw(', \'' . $blockNameSuffix . '\'');
+ $compiler->raw(', \''.$blockNameSuffix.'\'');
if (isset($arguments[1])) {
if ('label' === $blockNameSuffix) {
View
2  src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -134,7 +134,7 @@ public function isSelectedChoiceProvider()
*/
public function testIsChoiceSelected($expected, $choice, $value)
{
- $choice = new ChoiceView($choice, $choice, $choice . ' label');
+ $choice = new ChoiceView($choice, $choice, $choice.' label');
$this->assertSame($expected, $this->extension->isSelectedChoice($choice, $value));
}
View
2  src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -184,7 +184,7 @@ private function formatConfigs(array $array)
$string = '';
ksort($array);
foreach ($array as $name => $value) {
- $string .= ($string ? "\n" . str_repeat(' ', 13) : '') . $name . ': ' . $this->formatValue($value);
+ $string .= ($string ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
}
return $string;
View
4 src/Symfony/Bundle/FrameworkBundle/Resources/config/router.php
@@ -21,10 +21,10 @@
* @author: Albert Jessurum <ajessu@gmail.com>
*/
-if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_NAME'])) {
+if (is_file($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.$_SERVER['SCRIPT_NAME'])) {
return false;
}
-$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . 'app_dev.php';
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app_dev.php';
require 'app_dev.php';
View
2  src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -47,7 +47,7 @@ protected function getExtensions()
// 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());
View
2  src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -47,7 +47,7 @@ protected function getExtensions()
// 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());
View
2  src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
try {
$schema->addToSchema($connection->getSchemaManager()->createSchema());
} catch (SchemaException $e) {
- $output->writeln("Aborting: " . $e->getMessage());
+ $output->writeln("Aborting: ".$e->getMessage());
return 1;
}
View
4 src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
@@ -101,10 +101,10 @@ private function generateLogoutUrl($key, $referenceType)
if ('/' === $logoutPath[0]) {
$request = $this->container->get('request');
- $url = UrlGeneratorInterface::ABSOLUTE_URL === $referenceType ? $request->getUriForPath($logoutPath) : $request->getBasePath() . $logoutPath;
+ $url = UrlGeneratorInterface::ABSOLUTE_URL === $referenceType ? $request->getUriForPath($logoutPath) : $request->getBasePath().$logoutPath;
if (!empty($parameters)) {
- $url .= '?' . http_build_query($parameters);
+ $url .= '?'.http_build_query($parameters);
}
} else {
$url = $this->router->generate($logoutPath, $parameters, $referenceType);
View
2  src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
@@ -23,7 +23,7 @@ public function testSwitchUser($originalUser, $targetUser, $expectedUser, $expec
{
$client = $this->createAuthenticatedClient($originalUser);
- $client->request('GET', '/profile?_switch_user=' . $targetUser);
+ $client->request('GET', '/profile?_switch_user='.$targetUser);
$this->assertEquals($expectedStatus, $client->getResponse()->getStatusCode());
$this->assertEquals($expectedUser, $client->getProfile()->getCollector('security')->getUser());
View
2  src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php
@@ -60,7 +60,7 @@ protected static function createKernel(array $options = array())
return new $class(
$options['test_case'],
isset($options['root_config']) ? $options['root_config'] : 'config.yml',
- isset($options['environment']) ? $options['environment'] : 'securitybundletest' . strtolower($options['test_case']),
+ isset($options['environment']) ? $options['environment'] : 'securitybundletest'.strtolower($options['test_case']),
isset($options['debug']) ? $options['debug'] : true
);
}
View
12 src/Symfony/Component/ClassLoader/ClassLoader.php
@@ -170,7 +170,7 @@ public function findFile($class)
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
- $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
+ $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)).DIRECTORY_SEPARATOR;
$className = substr($class, $pos + 1);
} else {
// PEAR-like class name
@@ -178,21 +178,21 @@ public function findFile($class)
$className = $class;
}
- $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+ $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
foreach ($this->prefixes as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
+ return $dir.DIRECTORY_SEPARATOR.$classPath;
}
}
}
}
foreach ($this->fallbackDirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
+ return $dir.DIRECTORY_SEPARATOR.$classPath;
}
}
View
2  src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -121,7 +121,7 @@ private static function findClasses($path)
}
}
- $classes[] = ltrim($namespace . $class, '\\');
+ $classes[] = ltrim($namespace.$class, '\\');
break;
default:
break;
View
2  src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
@@ -100,7 +100,7 @@ public function testUseIncludePath()
$loader->setUseIncludePath(true);
$this->assertTrue($loader->getUseIncludePath());
- set_include_path(__DIR__.'/Fixtures/includepath' . PATH_SEPARATOR . $includePath);
+ set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
$this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'includepath'.DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));
View
2  src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -125,7 +125,7 @@ public function testCreateMapFinderSupport()
}
$finder = new \Symfony\Component\Finder\Finder();
- $finder->files()->in(__DIR__ . '/Fixtures/beta/NamespaceCollision');
+ $finder->files()->in(__DIR__.'/Fixtures/beta/NamespaceCollision');
$this->assertEqualsNormalized(array(
'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
View
2  src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php
@@ -49,7 +49,7 @@ public function testUseIncludePath()
$loader->useIncludePath(true);
$this->assertTrue($loader->getUseIncludePath());
- set_include_path(__DIR__.'/Fixtures/includepath' . PATH_SEPARATOR . $includePath);
+ set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
$this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'includepath'.DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));
View
4 src/Symfony/Component/Config/Definition/ReferenceDumper.php
@@ -115,12 +115,12 @@ private function writeNode(NodeInterface $node, $depth = 0)
$default = (string) $default != '' ? ' '.$default : '';
$comments = count($comments) ? '# '.implode(', ', $comments) : '';
- $text = rtrim(sprintf('%-20s %s %s', $node->getName() . ':', $default, $comments), ' ');
+ $text = rtrim(sprintf('%-20s %s %s', $node->getName().':', $default, $comments), ' ');
if ($info = $node->getInfo()) {
$this->writeLine('');
// indenting multi-line info
- $info = str_replace("\n", sprintf("\n%" . $depth * 4 . "s# ", ' '), $info);
+ $info = str_replace("\n", sprintf("\n%".$depth * 4 . "s# ", ' '), $info);
$this->writeLine('# '.$info, $depth * 4);
}
View
6 src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -178,7 +178,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $
// Save cursor position
$output->write("\0337");
// Write highlighted text
- $output->write('<hl>' . substr($matches[$ofs], $i) . '</hl>');
+ $output->write('<hl>'.substr($matches[$ofs], $i).'</hl>');
// Restore cursor position
$output->write("\0338");
}
@@ -230,11 +230,11 @@ public function askConfirmation(OutputInterface $output, $question, $default = t
public function askHiddenResponse(OutputInterface $output, $question, $fallback = true)
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $exe = __DIR__ . '/../Resources/bin/hiddeninput.exe';
+ $exe = __DIR__.'/../Resources/bin/hiddeninput.exe';
// handle code running from a phar
if ('phar:' === substr(__FILE__, 0, 5)) {
- $tmpExe = sys_get_temp_dir() . '/hiddeninput.exe';
+ $tmpExe = sys_get_temp_dir().'/hiddeninput.exe';
copy($exe, $tmpExe);
$exe = $tmpExe;
}
View
2  src/Symfony/Component/Console/Helper/ProgressHelper.php
@@ -402,7 +402,7 @@ private function humaneTime($secs)
$text = $format[1];
break;
} else {
- $text = ceil($secs / $format[2]) . ' ' . $format[1];
+ $text = ceil($secs / $format[2]).' '.$format[1];
break;
}
}
View
14 src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
@@ -37,15 +37,15 @@ public function testFormatBlock()
);
$this->assertEquals(
- '<error> Some text to display </error>' . "\n" .
+ '<error> Some text to display </error>'."\n" .
'<error> foo bar </error>',
$formatter->formatBlock(array('Some text to display', 'foo bar'), 'error'),
'::formatBlock() formats a message in a block'
);
$this->assertEquals(
- '<error> </error>' . "\n" .
- '<error> Some text to display </error>' . "\n" .
+ '<error> </error>'."\n" .
+ '<error> Some text to display </error>'."\n" .
'<error> </error>',
$formatter->formatBlock('Some text to display', 'error', true),
'::formatBlock() formats a message in a block'
@@ -61,8 +61,8 @@ public function testFormatBlockWithDiacriticLetters()
$formatter = new FormatterHelper();
$this->assertEquals(
- '<error> </error>' . "\n" .
- '<error> Du texte à afficher </error>' . "\n" .
+ '<error> </error>'."\n" .
+ '<error> Du texte à afficher </error>'."\n" .
'<error> </error>',
$formatter->formatBlock('Du texte à afficher', 'error', true),
'::formatBlock() formats a message in a block'
@@ -74,8 +74,8 @@ public function testFormatBlockLGEscaping()
$formatter = new FormatterHelper();
$this->assertEquals(
- '<error> </error>' . "\n" .
- '<error> \<info>some info\</info> </error>' . "\n" .
+ '<error> </error>'."\n" .
+ '<error> \<info>some info\</info> </error>'."\n" .
'<error> </error>',
$formatter->formatBlock('<info>some info</info>', 'error', true),
'::formatBlock() escapes \'<\' chars'
View
2  src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -85,7 +85,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
$reflected = new \ReflectionClass($this);
$namespace = $reflected->getNamespaceName();
- $class = $namespace . '\\Configuration';
+ $class = $namespace.'\\Configuration';
if (class_exists($class)) {
$r = new \ReflectionClass($class);
$container->addResource(new FileResource($r->getFileName()));
View
2  src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php
@@ -1,6 +1,6 @@
<?php
-$file = __DIR__ . '/ProjectWithXsdExtensionInPhar.phar';
+$file = __DIR__.'/ProjectWithXsdExtensionInPhar.phar';
if (is_file($file)) {
@unlink($file);
}
View
2  src/Symfony/Component/Filesystem/Filesystem.php
@@ -321,7 +321,7 @@ public function makePathRelative($endPath, $startPath)
$endPathRemainder = implode('/', array_slice($endPathArr, $index));
// Construct $endPath from traversing to the common path, then to the remaining $endPath
- $relativePath = $traverser . (strlen($endPathRemainder) > 0 ? $endPathRemainder . '/' : '');
+ $relativePath = $traverser.(strlen($endPathRemainder) > 0 ? $endPathRemainder.'/' : '');
return (strlen($relativePath) === 0) ? './' : $relativePath;
}
View
10 src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -531,7 +531,7 @@ public function testChownSymlinkFails()
$this->filesystem->symlink($file, $link);
- $this->filesystem->chown($link, 'user' . time() . mt_rand(1000, 9999));
+ $this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
}
/**
@@ -544,7 +544,7 @@ public function testChownFail()
$dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
mkdir($dir);
- $this->filesystem->chown($dir, 'user' . time() . mt_rand(1000, 9999));
+ $this->filesystem->chown($dir, 'user'.time().mt_rand(1000, 9999));
}
public function testChgrp()
@@ -597,7 +597,7 @@ public function testChgrpSymlinkFails()
$this->filesystem->symlink($file, $link);
- $this->filesystem->chgrp($link, 'user' . time() . mt_rand(1000, 9999));
+ $this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
}
/**
@@ -610,7 +610,7 @@ public function testChgrpFail()
$dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
mkdir($dir);
- $this->filesystem->chgrp($dir, 'user' . time() . mt_rand(1000, 9999));
+ $this->filesystem->chgrp($dir, 'user'.time().mt_rand(1000, 9999));
}
public function testRename()
@@ -843,7 +843,7 @@ public function testMirrorCopiesLinkedDirectoryContents()
$sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
- mkdir($sourcePath . 'nested/', 0777, true);
+ mkdir($sourcePath.'nested/', 0777, true);
file_put_contents($sourcePath.'/nested/file1.txt', 'FILE1');
// Note: We symlink directory, not file
symlink($sourcePath.'nested', $sourcePath.'link1');
View
22 src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -242,20 +242,20 @@ private function buildSizesFiltering(Command $command, array $sizes)
switch ($size->getOperator()) {
case '<=':
- $command->add('-size -' . ($size->getTarget() + 1) . 'c');
+ $command->add('-size -'.($size->getTarget() + 1).'c');
break;
case '>=':
- $command->add('-size +'. ($size->getTarget() - 1) . 'c');
+ $command->add('-size +'. ($size->getTarget() - 1).'c');
break;
case '>':
- $command->add('-size +' . $size->getTarget() . 'c');
+ $command->add('-size +'.$size->getTarget().'c');
break;
case '!=':
- $command->add('-size -' . $size->getTarget() . 'c');
- $command->add('-size +' . $size->getTarget() . 'c');
+ $command->add('-size -'.$size->getTarget().'c');
+ $command->add('-size +'.$size->getTarget().'c');
case '<':
default:
- $command->add('-size -' . $size->getTarget() . 'c');
+ $command->add('-size -'.$size->getTarget().'c');
}
}
}
@@ -280,20 +280,20 @@ private function buildDatesFiltering(Command $command, array $dates)
switch ($date->getOperator()) {
case '<=':
- $command->add('-mmin +' . ($mins - 1));
+ $command->add('-mmin +'.($mins - 1));
break;
case '>=':
- $command->add('-mmin -' . ($mins + 1));
+ $command->add('-mmin -'.($mins + 1));
break;
case '>':
- $command->add('-mmin -' . $mins);
+ $command->add('-mmin -'.$mins);
break;
case '!=':
- $command->add('-mmin +' . $mins.' -or -mmin -' . $mins);
+ $command->add('-mmin +'.$mins.' -or -mmin -'.$mins);
break;
case '<':
default:
- $command->add('-mmin +' . $mins);
+ $command->add('-mmin +'.$mins);
}
}
}
View
12 src/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php
@@ -32,37 +32,37 @@ public function getTestFilterData()
//PATH: A/B/C/abc.dat
$inner[] = new MockSplFileInfo(array(
'name' => 'abc.dat',
- 'relativePathname' => 'A' . DIRECTORY_SEPARATOR . 'B' . DIRECTORY_SEPARATOR . 'C' . DIRECTORY_SEPARATOR . 'abc.dat',
+ 'relativePathname' => 'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
));
//PATH: A/B/ab.dat
$inner[] = new MockSplFileInfo(array(
'name' => 'ab.dat',
- 'relativePathname' => 'A' . DIRECTORY_SEPARATOR . 'B' . DIRECTORY_SEPARATOR . 'ab.dat',
+ 'relativePathname' => 'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat',
));
//PATH: A/a.dat
$inner[] = new MockSplFileInfo(array(
'name' => 'a.dat',
- 'relativePathname' => 'A' . DIRECTORY_SEPARATOR . 'a.dat',
+ 'relativePathname' => 'A'.DIRECTORY_SEPARATOR.'a.dat',
));
//PATH: copy/A/B/C/abc.dat.copy
$inner[] = new MockSplFileInfo(array(
'name' => 'abc.dat.copy',
- 'relativePathname' => 'copy' . DIRECTORY_SEPARATOR . 'A' . DIRECTORY_SEPARATOR . 'B' . DIRECTORY_SEPARATOR . 'C' . DIRECTORY_SEPARATOR . 'abc.dat',
+ 'relativePathname' => 'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
));
//PATH: copy/A/B/ab.dat.copy
$inner[] = new MockSplFileInfo(array(
'name' => 'ab.dat.copy',
- 'relativePathname' => 'copy' . DIRECTORY_SEPARATOR . 'A' . DIRECTORY_SEPARATOR . 'B' . DIRECTORY_SEPARATOR . 'ab.dat',
+ 'relativePathname' => 'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat',
));
//PATH: copy/A/a.dat.copy
$inner[] = new MockSplFileInfo(array(
'name' => 'a.dat.copy',
- 'relativePathname' => 'copy' . DIRECTORY_SEPARATOR . 'A' . DIRECTORY_SEPARATOR . 'a.dat',
+ 'relativePathname' => 'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'a.dat',
));
return array(
View
8 src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
@@ -19,7 +19,7 @@
public static function setUpBeforeClass()
{
- self::$tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'symfony2_finder';
+ self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony2_finder';
self::$files = array(
'.git/',
@@ -75,13 +75,13 @@ protected static function toAbsolute($files = null)
* Without the call to setUpBeforeClass() property can be null.
*/
if (!self::$tmpDir) {
- self::$tmpDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'symfony2_finder';
+ self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony2_finder';
}
if (is_array($files)) {
$f = array();
foreach ($files as $file) {
- $f[] = self::$tmpDir . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $file);
+ $f[] = self::$tmpDir.DIRECTORY_SEPARATOR.str_replace('/', DIRECTORY_SEPARATOR, $file);
}
return $f;
@@ -89,7 +89,7 @@ protected static function toAbsolute($files = null)
if (is_string($files)) {
- return self::$tmpDir . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $files);
+ return self::$tmpDir.DIRECTORY_SEPARATOR.str_replace('/', DIRECTORY_SEPARATOR, $files);
}
return self::$tmpDir;
View
4 src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
@@ -345,13 +345,13 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain
$index = $this->createIndex($choice);
if ('' === $index || null === $index || !FormConfigBuilder::isValidName((string) $index)) {
- throw new InvalidConfigurationException('The index "' . $index . '" created by the choice list is invalid. It should be a valid, non-empty Form name.');
+ throw new InvalidConfigurationException('The index "'.$index.'" created by the choice list is invalid. It should be a valid, non-empty Form name.');
}
$value = $this->createValue($choice);
if (!is_string($value)) {
- throw new InvalidConfigurationException('The value created by the choice list is of type "' . gettype($value) . '", but should be a string.');
+ throw new InvalidConfigurationException('The value created by the choice list is of type "'.gettype($value).'", but should be a string.');
}
$view = new ChoiceView($choice, $value, $label);
View
2  src/Symfony/Component/Form/Extension/Core/ChoiceList/LazyChoiceList.php
@@ -141,7 +141,7 @@ private function load()
$choiceList = $this->loadChoiceList();
if (!$choiceList instanceof ChoiceListInterface) {
- throw new Exception('loadChoiceList() should return a ChoiceListInterface instance. Got ' . gettype($choiceList));
+ throw new Exception('loadChoiceList() should return a ChoiceListInterface instance. Got '.gettype($choiceList));
}
$this->choiceList = $choiceList;
View
2  src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
@@ -176,7 +176,7 @@ private function extractLabels($choices, array &$labels)
} elseif (method_exists($choice, '__toString')) {
$labels[$i] = (string) $choice;
} else {
- throw new StringCastException('A "__toString()" method was not found on the objects of type "' . get_class($choice) . '" passed to the choice field. To read a custom getter instead, set the argument $labelPath to the desired property path.');
+ throw new StringCastException('A "__toString()" method was not found on the objects of type "'.get_class($choice).'" passed to the choice field. To read a custom getter instead, set the argument $labelPath to the desired property path.');
}
}
}
View
2  ...Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -98,7 +98,7 @@ public function reverseTransform($values)
if (isset($choices[$i])) {
return $choices[$i] === '' ? null : $choices[$i];
} else {
- throw new TransformationFailedException('The choice "' . $i . '" does not exist');
+ throw new TransformationFailedException('The choice "'.$i.'" does not exist');
}
}
}
View
2  src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -53,7 +53,7 @@ public function reverseTransform($value)
$choices = $this->choiceList->getChoicesForValues(array($value));
if (1 !== count($choices)) {
- throw new TransformationFailedException('The choice "' . $value . '" does not exist or is not unique');
+ throw new TransformationFailedException('The choice "'.$value.'" does not exist or is not unique');
}
$choice = current($choices);
View
2  ...ymfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
@@ -109,7 +109,7 @@ public function reverseTransform($values)
}
if (count($unknown) > 0) {
- throw new TransformationFailedException('The choices "' . implode('", "', $unknown) . '" were not found');
+ throw new TransformationFailedException('The choices "'.implode('", "', $unknown).'" were not found');
}
return $result;
View
2  src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{
if ($options['allow_add'] && $options['prototype']) {
$prototype = $builder->create($options['prototype_name'], $options['type'], array_replace(array(
- 'label' => $options['prototype_name'] . 'label__',
+ 'label' => $options['prototype_name'].'label__',
), $options['options']));
$builder->setAttribute('prototype', $prototype->getForm());
}
View
6 src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -82,7 +82,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
} else {
$id = $name;
$fullName = $name;
- $uniqueBlockPrefix = '_' . $blockName;
+ $uniqueBlockPrefix = '_'.$blockName;
}
// Complex fields are read-only if they themselves or their parents are.
@@ -96,7 +96,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
} else {
$id = $name;
$fullName = $name;
- $uniqueBlockPrefix = '_' . $blockName;
+ $uniqueBlockPrefix = '_'.$blockName;
// Strip leading underscores and digits. These are allowed in
// form names, but not in HTML4 ID attributes.
@@ -143,7 +143,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
// collection form have different types (dynamically), they should
// be rendered differently.
// https://github.com/symfony/symfony/issues/5038
- 'cache_key' => $uniqueBlockPrefix . '_' . $form->getConfig()->getType()->getName(),
+ 'cache_key' => $uniqueBlockPrefix.'_'.$form->getConfig()->getType()->getName(),
));
}
View
2  src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
@@ -114,7 +114,7 @@ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockNam
*/
protected function loadResourceFromTheme($cacheKey, $blockName, $theme)
{
- if ($this->engine->exists($templateName = $theme . ':' . $blockName . '.html.php')) {
+ if ($this->engine->exists($templateName = $theme.':'.$blockName.'.html.php')) {
$this->resources[$cacheKey][$blockName] = $templateName;
return true;
View
4 src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -174,9 +174,9 @@ private function matchChild(FormInterface $form, PropertyPathIteratorInterface $
}
if ($it->isIndex()) {
- $chunk .= '[' . $it->current() . ']';
+ $chunk .= '['.$it->current().']';
} else {
- $chunk .= ('' === $chunk ? '' : '.') . $it->current();
+ $chunk .= ('' === $chunk ? '' : '.').$it->current();
}
// Test mapping rules as long as we have any
View
10 src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -155,7 +155,7 @@ public function getElements()
public function getElement($index)
{
if (!isset($this->elements[$index])) {
- throw new \OutOfBoundsException('The index ' . $index . ' is not within the violation path');
+ throw new \OutOfBoundsException('The index '.$index.' is not within the violation path');
}
return $this->elements[$index];
@@ -167,7 +167,7 @@ public function getElement($index)
public function isProperty($index)
{
if (!isset($this->isIndex[$index])) {
- throw new \OutOfBoundsException('The index ' . $index . ' is not within the violation path');
+ throw new \OutOfBoundsException('The index '.$index.' is not within the violation path');
}
return !$this->isIndex[$index];
@@ -179,7 +179,7 @@ public function isProperty($index)
public function isIndex($index)
{
if (!isset($this->isIndex[$index])) {
- throw new \OutOfBoundsException('The index ' . $index . ' is not within the violation path');
+ throw new \OutOfBoundsException('The index '.$index.' is not within the violation path');
}
return $this->isIndex[$index];
@@ -206,7 +206,7 @@ public function isIndex($index)
public function mapsForm($index)
{
if (!isset($this->mapsForm[$index])) {
- throw new \OutOfBoundsException('The index ' . $index . ' is not within the violation path');
+ throw new \OutOfBoundsException('The index '.$index.' is not within the violation path');
}
return $this->mapsForm[$index];
@@ -234,7 +234,7 @@ private function buildString()
if ($this->mapsForm[$index]) {
$this->pathAsString .= ".children[$element]";
} elseif (!$data) {
- $this->pathAsString .= '.data' . ($this->isIndex[$index] ? "[$element]" : ".$element");
+ $this->pathAsString .= '.data'.($this->isIndex[$index] ? "[$element]" : ".$element");
$data = true;
} else {
$this->pathAsString .= $this->isIndex[$index] ? "[$element]" : ".$element";
View
18 src/Symfony/Component/Form/Form.php
@@ -194,7 +194,7 @@ public function getPropertyPath()
}
if ($this->parent && null === $this->parent->getConfig()->getDataClass()) {
- return new PropertyPath('[' . $this->getName() . ']');
+ return new PropertyPath('['.$this->getName().']');
}
return new PropertyPath($this->getName());
@@ -314,27 +314,27 @@ public function setData($modelData)
if (!FormUtil::isEmpty($viewData)) {
$dataClass = $this->config->getDataClass();
- $actualType = is_object($viewData) ? 'an instance of class ' . get_class($viewData) : ' a(n) ' . gettype($viewData);
+ $actualType = is_object($viewData) ? 'an instance of class '.get_class($viewData) : ' a(n) '.gettype($viewData);
if (null === $dataClass && is_object($viewData) && !$viewData instanceof \ArrayAccess) {
$expectedType = 'scalar, array or an instance of \ArrayAccess';
throw new Exception(
- 'The form\'s view data is expected to be of type ' . $expectedType . ', ' .
- 'but is ' . $actualType . '. You ' .
+ 'The form\'s view data is expected to be of type '.$expectedType.', ' .
+ 'but is '.$actualType.'. You ' .
'can avoid this error by setting the "data_class" option to ' .
- '"' . get_class($viewData) . '" or by adding a view transformer ' .
- 'that transforms ' . $actualType . ' to ' . $expectedType . '.'
+ '"'.get_class($viewData).'" or by adding a view transformer ' .
+ 'that transforms '.$actualType.' to '.$expectedType.'.'
);
}
if (null !== $dataClass && !$viewData instanceof $dataClass) {
throw new Exception(
'The form\'s view data is expected to be an instance of class ' .
- $dataClass . ', but is '. $actualType . '. You can avoid this error ' .
+ $dataClass.', but is '. $actualType.'. You can avoid this error ' .
'by setting the "data_class" option to null or by adding a view ' .
- 'transformer that transforms ' . $actualType . ' to an instance of ' .
- $dataClass . '.'
+ 'transformer that transforms '.$actualType.' to an instance of ' .
+ $dataClass.'.'
);
}
}
View
4 src/Symfony/Component/Form/FormRenderer.php
@@ -138,7 +138,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
// The cache key for storing the variables and types
$viewCacheKey = $view->vars[self::CACHE_KEY_VAR];
- $viewAndSuffixCacheKey = $viewCacheKey . $blockNameSuffix;
+ $viewAndSuffixCacheKey = $viewCacheKey.$blockNameSuffix;
// In templates, we have to deal with two kinds of block hierarchies:
//
@@ -173,7 +173,7 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
// the bottom level of the hierarchy (= "_<id>_<section>" block)
$blockNameHierarchy = array();
foreach ($view->vars['block_prefixes'] as $blockNamePrefix) {
- $blockNameHierarchy[] = $blockNamePrefix . '_' . $blockNameSuffix;
+ $blockNameHierarchy[] = $blockNamePrefix.'_'.$blockNameSuffix;
}
$hierarchyLevel = count($blockNameHierarchy) - 1;
View
4 src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -79,8 +79,8 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
$this->fail(sprintf(
"Failed asserting that \n\n%s\n\nmatches exactly %s. Matches %s in \n\n%s",
$expression,
- $count == 1 ? 'once' : $count . ' times',
- $nodeList->length == 1 ? 'once' : $nodeList->length . ' times',
+ $count == 1 ? 'once' : $count.' times',
+ $nodeList->length == 1 ? 'once' : $nodeList->length.' times',
// strip away <root> and </root>
substr($dom->saveHTML(), 6, -8)
));
View
4 ...nt/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -58,13 +58,13 @@ public function dataProvider()
array(null, \IntlDateFormatter::SHORT, null, '03.02.2010 04:05', '2010-02-03 04:05:00 UTC'),
array(null, \IntlDateFormatter::MEDIUM, null, '03.02.2010 04:05:06', '2010-02-03 04:05:06 UTC'),
array(null, \IntlDateFormatter::LONG, null,
- '03.02.2010 04:05:06 GMT' . ($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''),
+ '03.02.2010 04:05:06 GMT'.($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''),
'2010-02-03 04:05:06 UTC'),
// see below for extra test case for time format FULL
array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'),
array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'),
array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null,
- '04:05:06 GMT' . ($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''),
+ '04:05:06 GMT'.($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''),
'1970-01-01 04:05:06 UTC'),
array(null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'),
array(null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'),
View
110 src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -130,9 +130,9 @@ public function testMapToVirtualFormIfDataDoesNotMatch()
$this->mapper->mapViolation($violation, $parent);
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $child->getErrors(), $child->getName() . ' should have an error, but has none');
- $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName() . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $child->getErrors(), $child->getName().' should have an error, but has none');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
}
public function testFollowDotRules()
@@ -155,10 +155,10 @@ public function testFollowDotRules()
$this->mapper->mapViolation($violation, $parent);
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $child->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName() . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $grandGrandChild->getErrors(), $grandGrandChild->getName() . ' should have an error, but has none');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $grandGrandChild->getErrors(), $grandGrandChild->getName().' should have an error, but has none');
}
public function testAbortMappingIfNotSynchronized()
@@ -178,9 +178,9 @@ public function testAbortMappingIfNotSynchronized()
$this->mapper->mapViolation($violation, $parent);
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $child->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName() . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
}
public function testAbortVirtualFormMappingIfNotSynchronized()
@@ -200,9 +200,9 @@ public function testAbortVirtualFormMappingIfNotSynchronized()
$this->mapper->mapViolation($violation, $parent);
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $child->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName() . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
}
public function testAbortDotRuleMappingIfNotSynchronized()
@@ -224,9 +224,9 @@ public function testAbortDotRuleMappingIfNotSynchronized()
$this->mapper->mapViolation($violation, $parent);
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $child->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName() . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
}
public function provideDefaultTests()
@@ -771,16 +771,16 @@ public function testDefaultErrorMapping($target, $childName, $childPath, $grandC
$this->mapper->mapViolation($violation, $parent);
if (self::LEVEL_0 === $target) {
- $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName() . ' should have an error, but has none');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName().' should have an error, but has none');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} elseif (self::LEVEL_1 === $target) {
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName . ' should have an error, but has none');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName.' should have an error, but has none');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} else {
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
$this->assertEquals(array($this->getFormError()), $grandChild->getErrors(), $grandChildName. ' should have an error, but has none');
}
}
@@ -1243,16 +1243,16 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
}
if (self::LEVEL_0 === $target) {
- $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName() . ' should have an error, but has none');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName().' should have an error, but has none');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} elseif (self::LEVEL_1 === $target) {
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName . ' should have an error, but has none');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName.' should have an error, but has none');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} else {
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
$this->assertEquals(array($this->getFormError()), $grandChild->getErrors(), $grandChildName. ' should have an error, but has none');
}
}
@@ -1424,24 +1424,24 @@ public function testCustomFormErrorMapping($target, $mapFrom, $mapTo, $errorName
$this->mapper->mapViolation($violation, $parent);
if (self::LEVEL_0 === $target) {
- $this->assertCount(0, $errorChild->getErrors(), $errorName . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName() . ' should have an error, but has none');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertCount(0, $errorChild->getErrors(), $errorName.' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName().' should have an error, but has none');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} elseif (self::LEVEL_1 === $target) {
- $this->assertCount(0, $errorChild->getErrors(), $errorName . ' should not have an error, but has one');
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName . ' should have an error, but has none');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertCount(0, $errorChild->getErrors(), $errorName.' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName.' should have an error, but has none');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} elseif (self::LEVEL_1B === $target) {
- $this->assertEquals(array($this->getFormError()), $errorChild->getErrors(), $errorName . ' should have an error, but has none');
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $errorChild->getErrors(), $errorName.' should have an error, but has none');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} else {
- $this->assertCount(0, $errorChild->getErrors(), $errorName . ' should not have an error, but has one');
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
+ $this->assertCount(0, $errorChild->getErrors(), $errorName.' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
$this->assertEquals(array($this->getFormError()), $grandChild->getErrors(), $grandChildName. ' should have an error, but has none');
}
}
@@ -1487,16 +1487,16 @@ public function testVirtualFormErrorMapping($target, $childName, $childPath, $gr
$this->mapper->mapViolation($violation, $parent);
if (self::LEVEL_0 === $target) {
- $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName() . ' should have an error, but has none');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $parent->getErrors(), $parent->getName().' should have an error, but has none');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} elseif (self::LEVEL_1 === $target) {
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName . ' should have an error, but has none');
- $this->assertCount(0, $grandChild->getErrors(), $grandChildName . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertEquals(array($this->getFormError()), $child->getErrors(), $childName.' should have an error, but has none');
+ $this->assertCount(0, $grandChild->getErrors(), $grandChildName.' should not have an error, but has one');
} else {
- $this->assertCount(0, $parent->getErrors(), $parent->getName() . ' should not have an error, but has one');
- $this->assertCount(0, $child->getErrors(), $childName . ' should not have an error, but has one');
+ $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
+ $this->assertCount(0, $child->getErrors(), $childName.' should not have an error, but has one');
$this->assertEquals(array($this->getFormError()), $grandChild->getErrors(), $grandChildName. ' should have an error, but has none');
}
}
View
4 src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
@@ -72,7 +72,7 @@ public function testCreateBuilder()
$assertIndex = function ($index) use (&$i, $test) {
return function () use (&$i, $test, $index) {
/* @var \PHPUnit_Framework_TestCase $test */
- $test->assertEquals($index, $i, 'Executed at index ' . $index);
+ $test->assertEquals($index, $i, 'Executed at index '.$index);
++$i;
};
@@ -170,7 +170,7 @@ public function testCreateView()
$assertIndexAndNbOfChildViews = function ($index, $nbOfChildViews) use (&$i, $test) {
return function (FormView $view) use (&$i, $test, $index, $nbOfChildViews) {
/* @var \PHPUnit_Framework_TestCase $test */
- $test->assertEquals($index, $i, 'Executed at index ' . $index);
+ $test->assertEquals($index, $i, 'Executed at index '.$index);
$test->assertCount($nbOfChildViews, $view);
++$i;
View
8 src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -204,7 +204,7 @@ public function testEmptyIfEmptyArray()
public function testEmptyIfEmptyCountable()
{
- $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__ . '\SimpleFormTest_Countable', $this->dispatcher));
+ $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__.'\SimpleFormTest_Countable', $this->dispatcher));
$this->form->setData(new SimpleFormTest_Countable(0));
@@ -213,7 +213,7 @@ public function testEmptyIfEmptyCountable()
public function testNotEmptyIfFilledCountable()
{
- $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__ . '\SimpleFormTest_Countable', $this->dispatcher));
+ $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__.'\SimpleFormTest_Countable', $this->dispatcher));
$this->form->setData(new SimpleFormTest_Countable(1));
@@ -222,7 +222,7 @@ public function testNotEmptyIfFilledCountable()
public function testEmptyIfEmptyTraversable()
{
- $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__ . '\SimpleFormTest_Traversable', $this->dispatcher));
+ $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__.'\SimpleFormTest_Traversable', $this->dispatcher));
$this->form->setData(new SimpleFormTest_Traversable(0));
@@ -231,7 +231,7 @@ public function testEmptyIfEmptyTraversable()
public function testNotEmptyIfFilledTraversable()
{
- $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__ . '\SimpleFormTest_Traversable', $this->dispatcher));
+ $this->form = new Form(new FormConfigBuilder('name', __NAMESPACE__.'\SimpleFormTest_Traversable', $this->dispatcher));
$this->form->setData(new SimpleFormTest_Traversable(1));
View
2  src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -183,7 +183,7 @@ public function prepare(Request $request)
$pathPrefix = trim($mapping[1]);
if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) {
- $path = $location . substr($path, strlen($pathPrefix));
+ $path = $location.substr($path, strlen($pathPrefix));
break;
}
}
View
2  src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -139,6 +139,6 @@ public function testToString()
$cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
- $this->assertEquals('foo=deleted; expires=' . gmdate("D, d-M-Y H:i:s T", time()-31536001) . '; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
+ $this->assertEquals('foo=deleted; expires='.gmdate("D, d-M-Y H:i:s T", time()-31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
}
}
View
2  src/Symfony/Component/HttpKernel/Kernel.php
@@ -749,7 +749,7 @@ public static function stripComments($source)
if (is_string($token)) {
$rawChunk .= $token;
} elseif (T_START_HEREDOC === $token[0]) {
- $output .= preg_replace(array('/\s+$/Sm', '/\n+/S'), "\n", $rawChunk) . $token[1];
+ $output .= preg_replace(array('/\s+$/Sm', '/\n+/S'), "\n", $rawChunk).$token[1];
do {
$token = next($tokens);
$output .= $token[1];
View
4 src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php
@@ -269,7 +269,7 @@ private function createProfileFromData($token, $data, $parent = null)
*/
private function getItemName($token)
{
- $name = self::TOKEN_PREFIX . $token;
+ $name = self::TOKEN_PREFIX.$token;
if ($this->isItemNameValid($name)) {
return $name;
@@ -285,7 +285,7 @@ private function getItemName($token)
*/
private function getIndexName()
{
- $name = self::TOKEN_PREFIX . 'index';
+ $name = self::TOKEN_PREFIX.'index';
if ($this->isItemNameValid($name)) {
return $name;
View
4 src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -238,12 +238,12 @@ protected function readLineFromFile($file)
$buffer = fread($file, $chunkSize);
if (false === ($upTo = strrpos($buffer, "\n"))) {
- $line = $buffer . $line;
+ $line = $buffer.$line;
continue;
}
$position += $upTo;
- $line = substr($buffer, $upTo + 1) . $line;
+ $line = substr($buffer, $upTo + 1).$line;
fseek($file, max(0, $position), SEEK_SET);
if ('' !== $line) {
View
2  src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php
@@ -105,6 +105,6 @@ protected function appendValue($key, $value, $expiration = 0)
//simulate append in Memcache <3.0
$content = $memcache->get($key);
- return $memcache->set($key, $content . $value, false, $expiration);
+ return $memcache->set($key, $content.$value, false, $expiration);
}
}
View
2  src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
@@ -101,7 +101,7 @@ protected function getMongo()
{
if ($this->mongo === null) {
if (preg_match('#^(mongodb://.*)/(.*)/(.*)$#', $this->dsn, $matches)) {
- $server = $matches[1] . (!empty($matches[2]) ? '/' . $matches[2] : '');
+ $server = $matches[1].(!empty($matches[2]) ? '/'.$matches[2] : '');
$database = $matches[2];
$collection = $matches[3];
View
2  src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -82,7 +82,7 @@ public function testControllerInspection(Request $request, Response $response)
'Closure',
function() { return 'foo'; },
array(
- 'class' => __NAMESPACE__ . '\{closure}',
+ 'class' => __NAMESPACE__.'\{closure}',
'method' => null,
'file' => __FILE__,
'line' => __LINE__ - 5,
View
2  src/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php
@@ -218,7 +218,7 @@ public function testPurge()
public function testDuplicates()
{
for ($i = 1; $i <= 5; $i++) {
- $profile = new Profile('foo' . $i);
+ $profile = new Profile('foo'.$i);
$profile->setIp('127.0.0.1');
$profile->setUrl('http://example.net/');
$profile->setMethod('GET');
View
16 src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -34,7 +34,7 @@ protected static function cleanDir()
public static function setUpBeforeClass()
{
- self::$tmpDir = sys_get_temp_dir() . '/sf2_profiler_file_storage';
+ self::$tmpDir = sys_get_temp_dir().'/sf2_profiler_file_storage';
if (is_dir(self::$tmpDir)) {
self::cleanDir();
}
@@ -63,9 +63,9 @@ public function testMultiRowIndexFile()
{
$iteration = 3;
for ($i = 0; $i < $iteration; $i++) {
- $profile = new Profile('token' . $i);
- $profile->setIp('127.0.0.' . $i);
- $profile->setUrl('http://foo.bar/' . $i);
+ $profile = new Profile('token'.$i);
+ $profile->setIp('127.0.0.'.$i);
+ $profile->setUrl('http://foo.bar/'.$i);
$storage = $this->getStorage();
$storage->write($profile);
@@ -73,12 +73,12 @@ public function testMultiRowIndexFile()
$storage->write($profile);
}
- $handle = fopen(self::$tmpDir . '/index.csv', 'r');
+ $handle = fopen(self::$tmpDir.'/index.csv', 'r');
for ($i = 0; $i < $iteration; $i++) {
$row = fgetcsv($handle);
- $this->assertEquals('token' . $i, $row[0]);
- $this->assertEquals('127.0.0.' . $i, $row[1]);
- $this->assertEquals('http://foo.bar/' . $i, $row[3]);
+ $this->assertEquals('token'.$i, $row[0]);
+ $this->assertEquals('127.0.0.'.$i, $row[1]);
+ $this->assertEquals('http://foo.bar/'.$i, $row[3]);
}
$this->assertFalse(fgetcsv($handle));
}
View
4 src/Symfony/Component/Locale/Resources/data/UPDATE.txt
@@ -33,8 +33,8 @@ Once it is, the following steps have to be followed to build the .dat-file:
3. Package the resource bundles into a single file
- $ find . -name *.res | sed -e "s/\.\///g" > packagelist.txt
- $ pkgdata -p region -T build -d . packagelist.txt
+ $ find.-name *.res | sed -e "s/\.\///g" > packagelist.txt
+ $ pkgdata -p region -T build -d.packagelist.txt
4. Clean up
View
6 src/Symfony/Component/OptionsResolver/Options.php
@@ -225,7 +225,7 @@ public function get($option)
$this->reading = true;
if (!array_key_exists($option, $this->options)) {
- throw new \OutOfBoundsException('The option "' . $option . '" does not exist.');
+ throw new \OutOfBoundsException('The option "'.$option.'" does not exist.');
}
if (isset($this->lazy[$option])) {
@@ -459,7 +459,7 @@ private function resolve($option)
}
}
- throw new OptionDefinitionException('The options "' . implode('", "', $conflicts) . '" have a cyclic dependency.');
+ throw new OptionDefinitionException('The options "'.implode('", "', $conflicts).'" have a cyclic dependency.');
}