Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 8c5fe4461b03 · 2018-04-20T11:59:25.000+02:00
* 2.7:
  [minor] SCA
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -97,11 +97,10 @@ private function findTemplatesInFolder($dir)
     private function findTemplatesInBundle(BundleInterface $bundle)
     {
         $name = $bundle->getName();
-        $templates = array_merge(
+        $templates = array_unique(array_merge(
             $this->findTemplatesInFolder($bundle->getPath().'/Resources/views'),
             $this->findTemplatesInFolder($this->rootDir.'/'.$name.'/views')
-        );
-        $templates = array_unique($templates);
+        ));
 
         foreach ($templates as $i => $template) {
             $templates[$i] = $template->set('bundle', $name);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -160,7 +160,7 @@ public function formatFile($file, $line, $text = null)
             $file = trim($file);
             $fileStr = $file;
             if (0 === strpos($fileStr, $this->rootDir)) {
-                $fileStr = str_replace($this->rootDir, '', str_replace('\\', '/', $fileStr));
+                $fileStr = str_replace(array('\\', $this->rootDir), array('/', ''), $fileStr);
                 $fileStr = htmlspecialchars($fileStr, $flags, $this->charset);
                 $fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', htmlspecialchars($this->rootDir, $flags, $this->charset), $fileStr);
             }
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -109,7 +109,7 @@ private function getInputOptionData(InputOption $option)
     {
         return array(
             'name' => '--'.$option->getName(),
-            'shortcut' => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '',
+            'shortcut' => $option->getShortcut() ? '-'.str_replace('|', '|-', $option->getShortcut()) : '',
             'accept_value' => $option->acceptValue(),
             'is_value_required' => $option->isValueRequired(),
             'is_multiple' => $option->isArray(),
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -50,7 +50,7 @@ protected function describeInputOption(InputOption $option, array $options = arr
         $this->write(
             '**'.$option->getName().':**'."\n\n"
             .'* Name: `--'.$option->getName().'`'."\n"
-            .'* Shortcut: '.($option->getShortcut() ? '`-'.implode('|-', explode('|', $option->getShortcut())).'`' : '<none>')."\n"
+            .'* Shortcut: '.($option->getShortcut() ? '`-'.str_replace('|', '|-', $option->getShortcut()).'`' : '<none>')."\n"
             .'* Accept value: '.($option->acceptValue() ? 'yes' : 'no')."\n"
             .'* Is value required: '.($option->isValueRequired() ? 'yes' : 'no')."\n"
             .'* Is multiple: '.($option->isArray() ? 'yes' : 'no')."\n"
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -223,7 +223,7 @@ private function getInputOptionDocument(InputOption $option)
         $pos = strpos($option->getShortcut(), '|');
         if (false !== $pos) {
             $objectXML->setAttribute('shortcut', '-'.substr($option->getShortcut(), 0, $pos));
-            $objectXML->setAttribute('shortcuts', '-'.implode('|-', explode('|', $option->getShortcut())));
+            $objectXML->setAttribute('shortcuts', '-'.str_replace('|', '|-', $option->getShortcut()));
         } else {
             $objectXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
         }
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
@@ -195,7 +195,7 @@ public function getDescription()
      *
      * @return bool
      */
-    public function equals(InputOption $option)
+    public function equals(self $option)
     {
         return $option->getName() === $this->getName()
             && $option->getShortcut() === $this->getShortcut()
diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -162,10 +162,6 @@ public function hasMetadataFor($value)
 
         $class = ltrim(is_object($value) ? get_class($value) : $value, '\\');
 
-        if (class_exists($class) || interface_exists($class)) {
-            return true;
-        }
-
-        return false;
+        return class_exists($class) || interface_exists($class, false);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function formatFile($file, $line, $text = null)`
`160`	`160`	`$file = trim($file);`
`161`	`161`	`$fileStr = $file;`
`162`	`162`	`if (0 === strpos($fileStr, $this->rootDir)) {`
`163`		`- $fileStr = str_replace($this->rootDir, '', str_replace('\\', '/', $fileStr));`
	`163`	`+ $fileStr = str_replace(array('\\', $this->rootDir), array('/', ''), $fileStr);`
`164`	`164`	`$fileStr = htmlspecialchars($fileStr, $flags, $this->charset);`
`165`	`165`	`$fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', htmlspecialchars($this->rootDir, $flags, $this->charset), $fileStr);`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private function getInputOptionData(InputOption $option)`
`109`	`109`	`{`
`110`	`110`	`return array(`
`111`	`111`	`'name' => '--'.$option->getName(),`
`112`		`- 'shortcut' => $option->getShortcut() ? '-'.implode('\|-', explode('\|', $option->getShortcut())) : '',`
	`112`	`+ 'shortcut' => $option->getShortcut() ? '-'.str_replace('\|', '\|-', $option->getShortcut()) : '',`
`113`	`113`	`'accept_value' => $option->acceptValue(),`
`114`	`114`	`'is_value_required' => $option->isValueRequired(),`
`115`	`115`	`'is_multiple' => $option->isArray(),`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ private function getInputOptionDocument(InputOption $option)`
`223`	`223`	`$pos = strpos($option->getShortcut(), '\|');`
`224`	`224`	`if (false !== $pos) {`
`225`	`225`	`$objectXML->setAttribute('shortcut', '-'.substr($option->getShortcut(), 0, $pos));`
`226`		`- $objectXML->setAttribute('shortcuts', '-'.implode('\|-', explode('\|', $option->getShortcut())));`
	`226`	`+ $objectXML->setAttribute('shortcuts', '-'.str_replace('\|', '\|-', $option->getShortcut()));`
`227`	`227`	`} else {`
`228`	`228`	`$objectXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');`
`229`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function getDescription()`
`195`	`195`	`*`
`196`	`196`	`* @return bool`
`197`	`197`	`*/`
`198`		`- public function equals(InputOption $option)`
	`198`	`+ public function equals(self $option)`
`199`	`199`	`{`
`200`	`200`	`return $option->getName() === $this->getName()`
`201`	`201`	`&& $option->getShortcut() === $this->getShortcut()`
Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,6 @@ public function hasMetadataFor($value)`
`162`	`162`
`163`	`163`	`$class = ltrim(is_object($value) ? get_class($value) : $value, '\\');`
`164`	`164`
`165`		`- if (class_exists($class) \|\| interface_exists($class)) {`
`166`		`- return true;`
`167`		`- }`
`168`		`-`
`169`		`- return false;`
	`165`	`+ return class_exists($class) \|\| interface_exists($class, false);`
`170`	`166`	`}`
`171`	`167`	`}`