This commit is contained in:
Fabien Potencier 2016-01-21 10:24:53 +01:00
parent 9188f0507d
commit 3aafa78f4d
16 changed files with 11 additions and 17 deletions

View File

@ -109,5 +109,4 @@ EOPHP
);
}
}
}

View File

@ -74,7 +74,7 @@ class ProxyDumper implements DumperInterface
if (defined('Symfony\Component\DependencyInjection\ContainerInterface::SCOPE_CONTAINER') && ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope(false)) {
$instantiation .= " \$this->scopedServices['$scope']['$id'] =";
}
}
}
$methodName = 'get'.Container::camelize($id).'Service';
$proxyClass = $this->getProxyClassName($definition);

View File

@ -199,7 +199,7 @@ class MarkdownDescriptor extends Descriptor
$output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no');
foreach ($definition->getAutowiringTypes() as $autowiringType) {
$output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
$output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
}
}

View File

@ -53,7 +53,7 @@ class PropertyInfoPassTest extends \PHPUnit_Framework_TestCase
{
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));
$container->expects($this->any())
$container->expects($this->any())
->method('findTaggedServiceIds')
->will($this->returnValue(array()));

View File

@ -89,7 +89,7 @@ class SecurityDataCollector extends DataCollector
if (null !== $this->logoutUrlGenerator) {
$logoutUrl = $this->logoutUrlGenerator->getLogoutPath();
}
} catch(\Exception $e) {
} catch (\Exception $e) {
// fail silently when the logout URL cannot be generated
}

View File

@ -52,7 +52,7 @@ class LdapFactory implements UserProviderFactoryInterface
->scalarNode('search_dn')->end()
->scalarNode('search_password')->end()
->arrayNode('default_roles')
->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
->requiresAtLeastOneElement()
->prototype('scalar')->end()
->end()

View File

@ -45,5 +45,4 @@ interface ResourceCheckerInterface
* @return bool True if the resource has not changed since the given timestamp, false otherwise.
*/
public function isFresh(ResourceInterface $resource, $timestamp);
}

View File

@ -151,7 +151,7 @@ class SymfonyStyle extends OutputStyle
$messages = is_array($message) ? array_values($message) : array($message);
foreach ($messages as $message) {
$this->writeln(sprintf(' %s', $message));
$this->writeln(sprintf(' %s', $message));
}
}
@ -164,7 +164,7 @@ class SymfonyStyle extends OutputStyle
$messages = is_array($message) ? array_values($message) : array($message);
foreach ($messages as $message) {
$this->writeln(sprintf(' // %s', $message));
$this->writeln(sprintf(' // %s', $message));
}
}

View File

@ -205,7 +205,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
public function testInterfaceExtendsDeprecatedInterface()
{
set_error_handler(function() { return false; });
set_error_handler(function () { return false; });
$e = error_reporting(0);
trigger_error('', E_USER_NOTICE);

View File

@ -622,7 +622,6 @@ EOF;
*
* This service is autowired.
EOF;
}
if ($definition->isLazy()) {

View File

@ -1005,7 +1005,6 @@ class FilesystemTest extends FilesystemTestCase
// The compress.zlib:// stream does not support mode x: creates the file, errors "failed to open stream: operation failed" and returns false
$this->filesystem->tempnam($dirname, 'bar');
}
public function testTempnamWithPHPTempSchemeFails()

View File

@ -132,7 +132,7 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
->method('isOutputDisabled')
->will($this->returnValue(true));
$process->expects($this->once())
$process->expects($this->once())
->method('getWorkingDirectory')
->will($this->returnValue($workingDirectory));

View File

@ -105,5 +105,4 @@ class LdapUserProvider implements UserProviderInterface
{
return $class === 'Symfony\Component\Security\Core\User\User';
}
}

View File

@ -42,7 +42,7 @@ class TargetOperation extends AbstractOperation
//
// For 'obsolete' messages, the code can't be simplifed as ``array_diff_assoc($this->source->all($domain), $this->target->all($domain))``
// because doing so will not exclude messages like {x: x ∈ source ∧ x ∉ target.all ∧ x ∈ target.fallback}
foreach ($this->source->all($domain) as $id => $message) {
if ($this->target->has($id, $domain)) {
$this->messages[$domain]['all'][$id] = $message;

View File

@ -79,5 +79,4 @@ class TargetOperationTest extends AbstractOperationTest
{
return new TargetOperation($source, $target);
}
}

View File

@ -34,7 +34,7 @@ class Unescaper
/**
* Regex fragment that matches an escaped character in a double quoted string.
*/
const REGEX_ESCAPED_CHARACTER = "\\\\(x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8}|.)";
const REGEX_ESCAPED_CHARACTER = '\\\\(x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8}|.)';
/**
* Unescapes a single quoted string.