Merge branch '2.7' into 2.8

* 2.7:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction

Author: nicolas-grekas

Command/TranslationUpdateCommand.php

@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io = new SymfonyStyle($input, $output);
 
         // check presence of force or dump-message
-        if ($input->getOption('force') !== true && $input->getOption('dump-messages') !== true) {
+        if (true !== $input->getOption('force') && true !== $input->getOption('dump-messages')) {
             $io->error('You must choose one of --force or --dump-messages');
 
             return 1;
@@ -179,19 +179,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $extractedMessagesCount += $domainMessagesCount;
             }
 
-            if ($input->getOption('output-format') == 'xlf') {
+            if ('xlf' == $input->getOption('output-format')) {
                 $io->comment('Xliff output version is <info>1.2</info>');
             }
 
             $resultMessage = sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');
         }
 
-        if ($input->getOption('no-backup') === true) {
+        if (true === $input->getOption('no-backup')) {
             $writer->disableBackup();
         }
 
         // save the files
-        if ($input->getOption('force') === true) {
+        if (true === $input->getOption('force')) {
             $io->comment('Writing files...');
 
             $bundleTransPath = false;

Command/YamlLintCommand.php

@@ -142,7 +142,7 @@ private function displayTxt(OutputInterface $output, SymfonyStyle $io, $filesInf
             }
         }
 
-        if ($errors === 0) {
+        if (0 === $errors) {
             $io->success(sprintf('All %d YAML files contain valid syntax.', count($filesInfo)));
         } else {
             $io->warning(sprintf('%d YAML files have valid syntax and %d contain errors.', count($filesInfo) - $errors, $errors));

Controller/ControllerNameParser.php

@@ -141,7 +141,7 @@ private function findAlternative($nonExistentBundleName)
             }
 
             $lev = levenshtein($nonExistentBundleName, $bundleName);
-            if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null || $lev < $shortest)) {
+            if ($lev <= strlen($nonExistentBundleName) / 3 && (null === $alternative || $lev < $shortest)) {
                 $alternative = $bundleName;
                 $shortest = $lev;
             }

Controller/RedirectController.php

@@ -100,7 +100,7 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
 
         $qs = $request->getQueryString();
         if ($qs) {
-            if (strpos($path, '?') === false) {
+            if (false === strpos($path, '?')) {
                 $qs = '?'.$qs;
             } else {
                 $qs = '&'.$qs;

Controller/TemplateController.php

@@ -51,7 +51,7 @@ public function templateAction($template, $maxAge = null, $sharedAge = null, $pr
 
         if ($private) {
             $response->setPrivate();
-        } elseif ($private === false || (null === $private && ($maxAge || $sharedAge))) {
+        } elseif (false === $private || (null === $private && ($maxAge || $sharedAge))) {
             $response->setPublic();
         }
 

Resources/views/FormTable/button_row.html.php

@@ -1,6 +1,6 @@
 <tr>
     <td></td>
     <td>
-        <?php echo $view['form']->widget($form) ?>
+        <?php echo $view['form']->widget($form); ?>
     </td>
 </tr>

Resources/views/FormTable/form_row.html.php

@@ -1,9 +1,9 @@
 <tr>
     <td>
-        <?php echo $view['form']->label($form) ?>
+        <?php echo $view['form']->label($form); ?>
     </td>
     <td>
-        <?php echo $view['form']->errors($form) ?>
-        <?php echo $view['form']->widget($form) ?>
+        <?php echo $view['form']->errors($form); ?>
+        <?php echo $view['form']->widget($form); ?>
     </td>
 </tr>

Resources/views/FormTable/form_widget_compound.html.php

@@ -1,11 +1,11 @@
-<table <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
+<table <?php echo $view['form']->block($form, 'widget_container_attributes'); ?>>
     <?php if (!$form->parent && $errors): ?>
     <tr>
         <td colspan="2">
-            <?php echo $view['form']->errors($form) ?>
+            <?php echo $view['form']->errors($form); ?>
         </td>
     </tr>
-    <?php endif ?>
-    <?php echo $view['form']->block($form, 'form_rows') ?>
-    <?php echo $view['form']->rest($form) ?>
+    <?php endif; ?>
+    <?php echo $view['form']->block($form, 'form_rows'); ?>
+    <?php echo $view['form']->rest($form); ?>
 </table>

Resources/views/FormTable/hidden_row.html.php

@@ -1,5 +1,5 @@
 <tr style="display: none">
     <td colspan="2">
-        <?php echo $view['form']->widget($form) ?>
+        <?php echo $view['form']->widget($form); ?>
     </td>
 </tr>

Test/KernelTestCase.php

@@ -78,7 +78,7 @@ private static function getPhpUnitCliConfigArgument()
         $dir = null;
         $reversedArgs = array_reverse($_SERVER['argv']);
         foreach ($reversedArgs as $argIndex => $testArg) {
-            if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
+            if (preg_match('/^-[^ \-]*c$/', $testArg) || '--configuration' === $testArg) {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
             } elseif (0 === strpos($testArg, '--configuration=')) {

Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php

@@ -30,9 +30,9 @@ public function parse($name)
     {
         list($bundle, $controller, $template) = explode(':', $name, 3);
 
-        if ($template[0] == '_') {
+        if ('_' == $template[0]) {
             $path = $this->rootTheme.'/Custom/'.$template;
-        } elseif ($bundle === 'TestBundle') {
+        } elseif ('TestBundle' === $bundle) {
             $path = $this->rootTheme.'/'.$controller.'/'.$template;
         } else {
             $path = $this->root.'/'.$controller.'/'.$template;

Tests/Templating/Helper/Resources/Child/form_label.html.php

@@ -1 +1 @@
-<label><?php echo $global ?>child</label>
+<label><?php echo $global; ?>child</label>

Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php

@@ -1,2 +1,2 @@
-<?php $type = isset($type) ? $type : 'text' ?>
-<input type="<?php echo $type ?>" <?php $view['form']->block($form, 'widget_attributes') ?> value="<?php echo $value ?>" rel="theme" />
+<?php $type = isset($type) ? $type : 'text'; ?>
+<input type="<?php echo $type; ?>" <?php $view['form']->block($form, 'widget_attributes'); ?> value="<?php echo $value; ?>" rel="theme" />

Tests/Templating/TemplateFilenameParserTest.php

@@ -36,7 +36,7 @@ public function testParseFromFilename($file, $ref)
     {
         $template = $this->parser->parse($file);
 
-        if ($ref === false) {
+        if (false === $ref) {
             $this->assertFalse($template);
         } else {
             $this->assertEquals($template->getLogicalName(), $ref->getLogicalName());