Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 5c9913f1bfd6 · 2017-09-15T12:08:59.000+02:00
* 2.8:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction
  [Filesystem] mirror - fix copying content with same name as source/target.
  .php_cs.dist - simplify config
  [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces
diff --git a/Command/ConfigDumpReferenceCommand.php b/Command/ConfigDumpReferenceCommand.php
@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $format = $input->getOption('format');
         $path = $input->getArgument('path');
 
-        if ($path !== null && 'yaml' !== $format) {
+        if (null !== $path && 'yaml' !== $format) {
             $errorIo->error('The "path" option is only available for the "yaml" format.');
 
             return 1;
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $message = sprintf('Default configuration for "%s"', $name);
         }
 
-        if ($path !== null) {
+        if (null !== $path) {
             $message .= sprintf(' at path "%s"', $path);
         }
 
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $errorIo = $io->getErrorStyle();
 
         // 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')) {
             $errorIo->error('You must choose one of --force or --dump-messages');
 
             return 1;
@@ -199,19 +199,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $extractedMessagesCount += $domainMessagesCount;
             }
 
-            if ($input->getOption('output-format') == 'xlf') {
+            if ('xlf' == $input->getOption('output-format')) {
                 $errorIo->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')) {
             $errorIo->comment('Writing files...');
 
             $bundleTransPath = false;
diff --git a/Controller/ControllerNameParser.php b/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;
             }
diff --git a/Controller/ControllerTrait.php b/Controller/ControllerTrait.php
@@ -136,7 +136,7 @@ protected function json($data, $status = 200, $headers = array(), $context = arr
     protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
     {
         $response = new BinaryFileResponse($file);
-        $response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFilename() : $fileName);
+        $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName);
 
         return $response;
     }
diff --git a/Controller/RedirectController.php b/Controller/RedirectController.php
@@ -103,7 +103,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;
diff --git a/Controller/TemplateController.php b/Controller/TemplateController.php
@@ -54,7 +54,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();
         }
 
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -516,9 +516,9 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
 
             $transitions = array();
             foreach ($workflow['transitions'] as $transition) {
-                if ($type === 'workflow') {
+                if ('workflow' === $type) {
                     $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $transition['from'], $transition['to']));
-                } elseif ($type === 'state_machine') {
+                } elseif ('state_machine' === $type) {
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
                             $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $from, $to));
diff --git a/Resources/views/FormTable/button_row.html.php b/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>
diff --git a/Resources/views/FormTable/form_row.html.php b/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>
diff --git a/Resources/views/FormTable/form_widget_compound.html.php b/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>
diff --git a/Resources/views/FormTable/hidden_row.html.php b/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>
diff --git a/Test/KernelTestCase.php b/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=')) {
diff --git a/Tests/Templating/Helper/Fixtures/StubTemplateNameParser.php b/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;
diff --git a/Tests/Templating/Helper/Resources/Child/form_label.html.php b/Tests/Templating/Helper/Resources/Child/form_label.html.php
@@ -1 +1 @@
-<label><?php echo $global ?>child</label>
+<label><?php echo $global; ?>child</label>
diff --git a/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php b/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" />
diff --git a/Tests/Templating/TemplateFilenameParserTest.php b/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());

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`94`	`94`	`$format = $input->getOption('format');`
`95`	`95`	`$path = $input->getArgument('path');`
`96`	`96`
`97`		`- if ($path !== null && 'yaml' !== $format) {`
	`97`	`+ if (null !== $path && 'yaml' !== $format) {`
`98`	`98`	`$errorIo->error('The "path" option is only available for the "yaml" format.');`
`99`	`99`
`100`	`100`	`return 1;`
`@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`106`	`106`	`$message = sprintf('Default configuration for "%s"', $name);`
`107`	`107`	`}`
`108`	`108`
`109`		`- if ($path !== null) {`
	`109`	`+ if (null !== $path) {`
`110`	`110`	`$message .= sprintf(' at path "%s"', $path);`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`88`	`88`	`$errorIo = $io->getErrorStyle();`
`89`	`89`
`90`	`90`	`// check presence of force or dump-message`
`91`		`- if ($input->getOption('force') !== true && $input->getOption('dump-messages') !== true) {`
	`91`	`+ if (true !== $input->getOption('force') && true !== $input->getOption('dump-messages')) {`
`92`	`92`	`$errorIo->error('You must choose one of --force or --dump-messages');`
`93`	`93`
`94`	`94`	`return 1;`
`@@ -199,19 +199,19 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`199`	`199`	`$extractedMessagesCount += $domainMessagesCount;`
`200`	`200`	`}`
`201`	`201`
`202`		`- if ($input->getOption('output-format') == 'xlf') {`
	`202`	`+ if ('xlf' == $input->getOption('output-format')) {`
`203`	`203`	`$errorIo->comment('Xliff output version is <info>1.2</info>');`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`$resultMessage = sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');`
`207`	`207`	`}`
`208`	`208`
`209`		`- if ($input->getOption('no-backup') === true) {`
	`209`	`+ if (true === $input->getOption('no-backup')) {`
`210`	`210`	`$writer->disableBackup();`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`// save the files`
`214`		`- if ($input->getOption('force') === true) {`
	`214`	`+ if (true === $input->getOption('force')) {`
`215`	`215`	`$errorIo->comment('Writing files...');`
`216`	`216`
`217`	`217`	`$bundleTransPath = false;`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private function findAlternative($nonExistentBundleName)`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`$lev = levenshtein($nonExistentBundleName, $bundleName);`
`144`		`- if ($lev <= strlen($nonExistentBundleName) / 3 && ($alternative === null \|\| $lev < $shortest)) {`
	`144`	`+ if ($lev <= strlen($nonExistentBundleName) / 3 && (null === $alternative \|\| $lev < $shortest)) {`
`145`	`145`	`$alternative = $bundleName;`
`146`	`146`	`$shortest = $lev;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ protected function json($data, $status = 200, $headers = array(), $context = arr`
`136`	`136`	`protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)`
`137`	`137`	`{`
`138`	`138`	`$response = new BinaryFileResponse($file);`
`139`		`- $response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFilename() : $fileName);`
	`139`	`+ $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName);`
`140`	`140`
`141`	`141`	`return $response;`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function templateAction($template, $maxAge = null, $sharedAge = null, $pr`
`54`	`54`
`55`	`55`	`if ($private) {`
`56`	`56`	`$response->setPrivate();`
`57`		`- } elseif ($private === false \|\| (null === $private && ($maxAge \|\| $sharedAge))) {`
	`57`	`+ } elseif (false === $private \|\| (null === $private && ($maxAge \|\| $sharedAge))) {`
`58`	`58`	`$response->setPublic();`
`59`	`59`	`}`
`60`	`60`