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

Static code analysis

Browse Source
This commit is contained in:
Konstantin.Myakshin 2016-01-25 19:00:36 +02:00
parent b81cac880e
commit 8db691ab94
39 changed files with 63 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,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);

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[] = realpath($file);
$container->addResource(new FileResource($file));
}

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

@ -95,7 +95,7 @@ EOF
$extractor = $this->getContainer()->get('translation.extractor');
$extractor->setPrefix($input->getOption('prefix'));
foreach ($bundleTransPaths as $path) {
$path = $path.'views';
$path .= 'views';
if (is_dir($path)) {
$extractor->extract($path, $extractedCatalogue);
}
@ -106,7 +106,7 @@ EOF
$output->writeln('Loading translation files');
$loader = $this->getContainer()->get('translation.loader');
foreach ($bundleTransPaths as $path) {
$path = $path.'translations';
$path .= 'translations';
if (is_dir($path)) {
$loader->loadMessages($path, $currentCatalogue);
}
@ -151,7 +151,7 @@ EOF
$output->writeln('Writing files');
$bundleTransPath = false;
foreach ($bundleTransPaths as $path) {
$path = $path.'translations';
$path .= 'translations';
if (is_dir($path)) {
$bundleTransPath = $path;
}

2
src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css
View File

@ -117,7 +117,7 @@ build: 56
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
}
.sf-button .btn-bg {
padding: 0px 14px;
padding: 0 14px;
color: #636363;
line-height: 28px;
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;

2
src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
View File

@ -75,7 +75,7 @@ class TwigExtension extends Extension
}
$reflection = new \ReflectionClass($class);
if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/views')) {
if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/views')) {
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
}
}

2
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/body.css.twig
View File

@ -116,7 +116,7 @@ build: 56
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
}
.sf-button .btn-bg {
padding: 0px 14px;
padding: 0 14px;
color: #636363;
line-height: 28px;
background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;

2
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
View File

@ -66,7 +66,7 @@
var leftIconPath = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAhCAYAAADOHBvaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4tJREFUeNrkl19IU1Ecx7fZJN2arhq2JUWJlEZL1MAm1B582GBErMJqtabzRRAqFAYa9OfFFx+KQEG3MkYRZkkEJUUwctVSKCJWJojL1ZiydJvLtNXW98AW1znv7t0CHzrw5Xe3nXM/O/f8zvf8LjcajXJWo/E4q9T+P/CaNMZw29rahBMTE3LyoaKi4m1zc/M865swSS6bzZbT09NzfG5urjYUCikikYiQ+ntWVlZQKBQ+F4lE/Var9Ta+CmcK5hsMhpNer/fiwsLCFiYzycnJGZfJZOctFss9uj+wInhwcDDfbDb3+Hy+I+msoVQqNZtMpnNlZWUhxuChoaENHR0djwOBwN5MEkgsFtsGBgY0uPzOJKtzu7q6rmcKJW12dlaJpbqGy7WpwPyWlpZGj8dzkMX9B+l+dLlcda2trbrEHbQEPDY2Jh0dHTWxgF5AxqsRz9J1cjqdlxDWrwTO7u3tNWK7SFhAL8e221WE7pU6Ytk2t7e311JnTQWLJycntWyhpCmVShXCKboBMJyjCKJlzgVzKJiamtrBAKoH1JoAvU+2MN2g6enp3QgboRnqjHl2u70kHA7zU0APpQMlze/357vd7gKyhang7GAwKEsx1gLoAwp0E8JdJtB4w1LK4sw4OAtWl51inBGwAxT/9iLUQb+ZgsHgJ4I5hYWFAQZjbYBrKPB+hGNM4DweL1pUVBRMzOpweXm5WyAQ/GIAfwj4GbZwiUTyIy8vby7eLw4mQH9paamX4VO7kgTeTTeguLjYg0AOjAgVTD58UygUb1i41l84ogGhka4z+rwi9p3MQHwajeYRjrNFlvBbiDfoOmFtQzU1NU/J5JKBA3w+/71er3/J8hA6kSKpOPX19c9w+YH4VDIwqRbG1Wr1HZVK5eX8o6bVaj9XV1cTk3HFcinpsUjs7AWKNwvWO5gpFI93pqmpyYxLB0neVBUIcaI90OHOzs7TfX19ErZA8niNRuNXnU53M2apTmiBSc0lgEoh9cjIiBYV5i6c1YxKYblc/rOhoeEdIin2nkCfoHk2VSYpV7ZCVdB+h8OxDyocHh4WoEJZskRwvUhVVVUIcldWVtrx1XPoNfQFWkynvCWzzIe2QSXQTmg7Od5QT+WinuagliaFnI8kJvQxJpJIATo34zJ8WyR/YF2sfBFDpKCPHyqLMUeajSVniJq9mYKXjUtwPdY34a7W+/EfAQYAZM5kh2zoNWsAAAAASUVORK5CYII=",
rightIconPath = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAhCAYAAADOHBvaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4tJREFUeNrsl11IU2EYx91ytrnpmmy4TYNkqGhEJGiiabuQ2EAiZ1kZW9NtF4pgoBB40weJeCHVjReygVmuIhP6gLoJJNQGadhiJcLa2sb8KN2nrprbel7YYh7WzjnOsIsO/Hnes533/Z33PB/nOZRIJJK2GwflP/ifBg8MDGTOzs4eQeOCggJjb2+vH4aRvwGmyeXyZq/Xe9rv99eGQqHs+D+pVKqfxWJNZ2VlPdRoNPfFYnEgVTBNpVI1Op3OG4FAQETkDul0uo3P518dHh6+B6dB0uC5uTlWf3//zcXFRfV2fMjlcsfUarVGIpG4yYCZDQ0Nz10ulziVAGKz2W+7u7ulNTU1q0TAdKVSOWi1Wlt2InqFQuFTvV5/HoYbW+ICc116T0/PBQLQl0TBEB8nYddtKF6SgXNMJtM1nLUuTUxMSMFeIQqfn5+/vLCwIPgTOL2vr++sx+PJS7LGEEBvowHY60ThkII8iHIVDDMSgbMtFssZnDXkkKOS2AkZuM1mk4HhJAJzV1ZWDuHMZ4DGE8AVeODl5eVin8+XiwVT7HZ7rtvt3kfg5hPB74I5lWxSMBikTU5OlsSYMTAVHoWQRJYg+COA8+PgT8Dokk2CkiuM+fk3mMFg0EiAQ6AWgC3FfoCbOA5GlfRuGQwE3bPFxyKRyAvFPkIQeg6gY3HQerRpvIn5+fkerI9DUN58PB4vsA1oJ5hneFAmk7lZVlZmj704YuAwSrfCwkInzvyhBNBbRHxTWlqK3IJeGJvYdHLBQm9w5rfBNUqyUHRUVVW9A7Ma3eSWlwRK7np4/w6azWYWzjp6UDNRqEAg+DEyMtJJo9Eew+k37I59oI+tra2vIMjw1momkQFpCoViGqAfYOhJVLnQs7dWV1ePy2SyLzvV1EEjsCSVSh/A0BzfkWC3hpxv6Ojo0NbV1a2lCgW/eru6ulBRmQKt4TYCoIMg2ejo6EWdTpcXDodJQ5uamr62t7ffgSHy63tQgEjrkwkqBp0wGo2NWq32MNgMIsCioqJN6DRN5eXl43D6AsUNaJ1Ml7kXFRvQUVDtzMzMMYPBsB/EcjgcVEx7E66oqFivrKx0gFBKvkYuA6FY+b6d9hbVVTboAKgkKtTmcqHgM6G/TuNwOBvRFPmMmg3QJ5Alvlik0tCng1Bu50TznRV9Iuj4iaoeKkDRAPIlA6b67UTBlFvSi+zaR9svAQYA6+V18DvfH/8AAAAASUVORK5CYII=",
menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'),
displayState, elem, className;
displayState;
if (null === savedState) {
savedState = 'block';

12
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
View File

@ -128,7 +128,7 @@ abbr {
}
#menu-profiler li a span.label {
display: block;
padding: 20px 0px 16px 65px;
padding: 20px 0 16px 65px;
min-height: 16px;
overflow: hidden;
}
@ -199,7 +199,7 @@ li {
#resume {
background-color: #f6f6f6;
border-bottom: 1px solid #dfdfdf;
padding: 18px 10px 0px;
padding: 18px 10px 0;
margin-left: 250px;
height: 34px;
color: #313131;
@ -266,7 +266,6 @@ ul.alt li.warning {
margin-bottom: 1px;
}
ul.sf-call-stack li {
text-size: small;
padding: 0 0 0 20px;
}
td.main, td.menu {
@ -366,13 +365,12 @@ td.main, td.menu {
line-height: 1.5em;
}
.sf-profiler-timeline .legends span {
border-left-width: 10px;
border-left-style: solid;
border-left: 10px solid;
padding: 0 10px 0 5px;
}
.sf-profiler-timeline canvas {
border: 1px solid #999;
border-width: 1px 0;
border: 1px #999;
border-style: solid none;
}
.collapsed-menu-parents #resume,
.collapsed-menu-parents #collector-content {

10
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
View File

@ -93,9 +93,9 @@
}
.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
padding: 0px 5px;
padding: 0 5px;
border-radius: 5px;
margin-bottom: 0px;
margin-bottom: 0;
vertical-align: top;
}
@ -129,13 +129,11 @@
display: none;
position: absolute;
background-color: #fff;
border: 1px solid #bbb;
padding: 9px 0;
margin-left: -1px;
bottom: 38px;
border-bottom-width: 0;
border-bottom: 1px solid #bbb;
border: 1px solid #bbb;
border-radius: 4px 4px 0 0;
}
@ -198,7 +196,7 @@
}
.sf-toolbar-block .sf-toolbar-icon > a,
.sf-toolbar-block .sf-toolbar-icon > a:link
.sf-toolbar-block .sf-toolbar-icon > a:link,
.sf-toolbar-block .sf-toolbar-icon > a:hover {
color: black !important;
}

2
src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
View File

@ -62,8 +62,6 @@ class ProfilerControllerTest extends \PHPUnit_Framework_TestCase
if ('found' == $token) {
return new Profile($token);
}
return;
}))
;

2
src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
View File

@ -74,7 +74,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
$document = simplexml_import_dom($document);
$bodies = $document->xpath('//body');
$elements = $bodies[0]->xpath($translator->cssToXPath($css));
$this->assertEquals($count, count($elements));
$this->assertCount($count, $elements);
}
public function getXpathLiteralTestData()

12
src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/interfaces1.php
View File

@ -11,15 +11,3 @@ $definition = new Definition('%cla%o%ss%');
$container->setDefinition('foo', $definition);
return $container;
if (!class_exists('FooClass')) {
class FooClass
{
public $bar;
public function setBar($bar)
{
$this->bar = $bar;
}
}
}

26
src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
View File

@ -52,6 +52,18 @@ class ContainerAwareEventDispatcherTest extends \PHPUnit_Framework_TestCase
->with($event)
;
$service
->expects($this->once())
->method('onEventWithPriority')
->with($event)
;
$service
->expects($this->once())
->method('onEventNested')
->with($event)
;
$container = new Container();
$container->set('service.subscriber', $service);
@ -59,6 +71,8 @@ class ContainerAwareEventDispatcherTest extends \PHPUnit_Framework_TestCase
$dispatcher->addSubscriberService('service.subscriber', 'Symfony\Component\EventDispatcher\Tests\SubscriberService');
$dispatcher->dispatch('onEvent', $event);
$dispatcher->dispatch('onEventWithPriority', $event);
$dispatcher->dispatch('onEventNested', $event);
}
public function testPreventDuplicateListenerService()
@ -233,12 +247,20 @@ class SubscriberService implements EventSubscriberInterface
{
return array(
'onEvent' => 'onEvent',
'onEvent' => array('onEvent', 10),
'onEvent' => array('onEvent'),
'onEventWithPriority' => array('onEventWithPriority', 10),
'onEventNested' => array(array('onEventNested')),
);
}
public function onEvent(Event $e)
{
}
public function onEventWithPriority(Event $e)
{
}
public function onEventNested(Event $e)
{
}
}

2
src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
View File

@ -94,7 +94,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
$command->setErrorHandler(
$this->ignoreUnreadableDirs
// If directory is unreadable and finder is set to ignore it, `stderr` is ignored.
? function ($stderr) { return; }
? function ($stderr) { }
: function ($stderr) { throw new AccessDeniedException($stderr); }
);

4
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
View File

@ -71,10 +71,10 @@ class ChoiceType extends AbstractType
if ($options['multiple']) {
$builder->addViewTransformer(new ChoicesToBooleanArrayTransformer($options['choice_list']));
$builder->addEventSubscriber(new FixCheckboxInputListener($options['choice_list']), 10);
$builder->addEventSubscriber(new FixCheckboxInputListener($options['choice_list']));
} else {
$builder->addViewTransformer(new ChoiceToBooleanArrayTransformer($options['choice_list'], $builder->has('placeholder')));
$builder->addEventSubscriber(new FixRadioInputListener($options['choice_list'], $builder->has('placeholder')), 10);
$builder->addEventSubscriber(new FixRadioInputListener($options['choice_list'], $builder->has('placeholder')));
}
} else {
if ($options['multiple']) {

5
src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
View File

@ -558,11 +558,6 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
return array('group1', 'group2');
}
private function getMockExecutionContext()
{
return $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
}
/**
* @param string $name
* @param string $dataClass

2
src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
View File

@ -64,7 +64,7 @@ abstract class BaseValidatorExtensionTest extends TypeTestCase
public function testValidationGroupsCanBeSetToClosure()
{
$form = $this->createForm(array(
'validation_groups' => function (FormInterface $form) { return; },
'validation_groups' => function (FormInterface $form) { },
));
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));

2
src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
View File

@ -482,6 +482,6 @@ class OrderedHashMapTest extends \PHPUnit_Framework_TestCase
unset($map[0]);
$map[] = 3;
$this->assertSame(2, count($map));
$this->assertCount(2, $map);
}
}

2
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -1707,8 +1707,6 @@ class Request
return '/';
}
$pathInfo = '/';
// Remove the query string from REQUEST_URI
if ($pos = strpos($requestUri, '?')) {
$requestUri = substr($requestUri, 0, $pos);

2
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
View File

@ -57,7 +57,7 @@ class PdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
{
$storage = new PdoSessionHandler($this->pdo, array('db_table' => 'bad_name'));
$this->setExpectedException('RuntimeException');
$storage->read('foo', 'bar');
$storage->read('foo');
}
public function testWriteRead()

4
src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
View File

@ -255,7 +255,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
// invalidate only when the response is successful
if ($response->isSuccessful() || $response->isRedirect()) {
try {
$this->store->invalidate($request, $catch);
$this->store->invalidate($request);
// As per the RFC, invalidate Location and Content-Location URLs if present
foreach (array('Location', 'Content-Location') as $header) {
@ -481,7 +481,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
$this->processResponseBody($request, $response);
if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
$response->setPrivate(true);
$response->setPrivate();
} elseif ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) {
$response->setTtl($this->options['default_ttl']);
}

2
src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php
View File

@ -77,7 +77,7 @@ class SqliteProfilerStorage extends PdoProfilerStorage
$return = array();
if ($db instanceof \SQLite3) {
$stmt = $this->prepareStatement($db, $query, true);
$stmt = $this->prepareStatement($db, $query);
foreach ($args as $arg => $val) {
$stmt->bindValue($arg, $val, is_int($val) ? \SQLITE3_INTEGER : \SQLITE3_TEXT);
}

2
src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
View File

@ -121,8 +121,6 @@ class CurrencyDataGenerator extends AbstractDataGenerator
return $data;
}
return;
}
/**

3
src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
View File

@ -133,8 +133,6 @@ class LanguageDataGenerator extends AbstractDataGenerator
return $data;
}
return;
}
/**
@ -142,7 +140,6 @@ class LanguageDataGenerator extends AbstractDataGenerator
*/
protected function generateDataForRoot(BundleReaderInterface $reader, $tempDir)
{
return;
}
/**

2
src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
View File

@ -67,7 +67,7 @@ class LocaleScanner
*/
public function scanAliases($sourceDir)
{
$locales = $this->scanLocales($sourceDir, '.txt');
$locales = $this->scanLocales($sourceDir);
$aliases = array();
// Delete locales that are no aliases

3
src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
View File

@ -647,8 +647,7 @@ class IntlDateFormatter
if (self::NONE !== $this->timetype) {
$patternParts[] = $this->defaultTimeFormats[$this->timetype];
}
$pattern = implode(', ', $patternParts);
return $pattern;
return implode(', ', $patternParts);
}
}

4
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
View File

@ -709,11 +709,9 @@ class NumberFormatter
private function round($value, $precision)
{
$precision = $this->getUnitializedPrecision($value, $precision);
$roundingMode = self::$phpRoundingMap[$this->getAttribute(self::ROUNDING_MODE)];
$value = round($value, $precision, $roundingMode);
return $value;
return round($value, $precision, $roundingMode);
}
/**

1
src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
View File

@ -12,7 +12,6 @@
namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
use Symfony\Component\Intl\Intl;
/**
* @author Bernhard Schussek <bschussek@gmail.com>

1
src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;
use Symfony\Component\Intl\Intl;
/**
* @author Bernhard Schussek <bschussek@gmail.com>

1
src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Intl\Data\Bundle\Writer\PhpBundleWriter;
use Symfony\Component\Intl\Intl;
/**
* @author Bernhard Schussek <bschussek@gmail.com>

4
src/Symfony/Component/Intl/Tests/Data/Util/LocaleScannerTest.php
View File

@ -64,13 +64,13 @@ class LocaleScannerTest extends \PHPUnit_Framework_TestCase
{
$sortedLocales = array('de', 'de_alias', 'en', 'en_alias', 'fr', 'fr_alias');
$this->assertSame($sortedLocales, $this->scanner->scanLocales($this->directory, '.txt'));
$this->assertSame($sortedLocales, $this->scanner->scanLocales($this->directory));
}
public function testScanAliases()
{
$sortedAliases = array('de_alias' => 'de', 'en_alias' => 'en', 'fr_alias' => 'fr');
$this->assertSame($sortedAliases, $this->scanner->scanAliases($this->directory, '.txt'));
$this->assertSame($sortedAliases, $this->scanner->scanAliases($this->directory));
}
}

2
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
View File

@ -337,7 +337,7 @@ class PropertyAccessorTest extends \PHPUnit_Framework_TestCase
{
$value = new MagicianCall();
$this->propertyAccessor->getValue($value, 'foobar', 'bam');
$this->propertyAccessor->getValue($value, 'foobar');
}
public function testGetValueReadsMagicCall()

3
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
View File

@ -623,9 +623,8 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
$method = 'set'.$key;
$context->$method($value);
}
$generator = new UrlGenerator($routes, $context, $logger);
return $generator;
return new UrlGenerator($routes, $context, $logger);
}
protected function getRoutes($name, Route $route)

2
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
View File

@ -856,7 +856,7 @@ QUERY;
*/
private function updateNewAceProperty($name, array $changes)
{
list($old, $new) = $changes;
list(, $new) = $changes;
$sids = new \SplObjectStorage();
$classIds = new \SplObjectStorage();

2
src/Symfony/Component/Security/Tests/Http/Firewall/RememberMeListenerTest.php
View File

@ -140,7 +140,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
public function testSessionStrategy()
{
list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, true, true);
list($listener, $tokenStorage, $service, $manager) = $this->getListener();
$tokenStorage
->expects($this->once())

3
src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php
View File

@ -172,9 +172,8 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
{
$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
$request = new Request();
$response = new Response();
$service->loginFail($request, $response);
$service->loginFail($request);
$cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);
$this->assertTrue($cookie->isCleared());

1
src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
View File

@ -208,7 +208,6 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
array(
array(
'bar' => function ($bar) {
return;
},
),
'baz',

4
src/Symfony/Component/Translation/Dumper/PhpFileDumper.php
View File

@ -25,9 +25,7 @@ class PhpFileDumper extends FileDumper
*/
protected function format(MessageCatalogue $messages, $domain)
{
$output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
return $output;
return "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
}
/**

1
src/Symfony/Component/Yaml/Tests/InlineTest.php
View File

@ -255,7 +255,6 @@ class InlineTest extends \PHPUnit_Framework_TestCase
'12.30e+02' => 12.30e+02,
'1234' => 0x4D2,
'1243' => 02333,
'.Inf' => -log(0),
'-.Inf' => log(0),
"'686e444'" => '686e444',
'.Inf' => 646e444,