Merge pull request FriendsOfSymfony#1389 from FriendsOfSymfony/INSIGHT

Fix several issues from Sensio Insight
araines · Mar 12, 2016 · 23594b2 · 23594b2
2 parents d6cbe3d + 3a21be0
commit 23594b2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -314,7 +314,7 @@ protected function getParameters(ViewHandler $viewHandler, $currentContent, $cod
     protected function findTemplate(Request $request, $format, $statusCode, $showException)
     {
         $name = $showException ? 'exception' : 'error';
-        if ($showException && 'html' == $format) {
+        if ($showException && 'html' === $format) {
             $name = 'exception_full';
         }
 

diff --git a/Resources/meta/LICENSE b/Resources/meta/LICENSE
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
diff --git a/Routing/Loader/RestXmlCollectionLoader.php b/Routing/Loader/RestXmlCollectionLoader.php
@@ -152,7 +152,7 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
         $length = $node->childNodes->length;
         for ($i = 0; $i < $length; ++$i) {
             $loopNode = $node->childNodes->item($i);
-            if ($loopNode->nodeType == XML_TEXT_NODE) {
+            if ($loopNode->nodeType === XML_TEXT_NODE) {
                 continue;
             }
 
@@ -266,7 +266,7 @@ private function getXmlErrors_($internalErrors)
         $errors = array();
         foreach (libxml_get_errors() as $error) {
             $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
-                LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
+                LIBXML_ERR_WARNING === $error->level ? 'WARNING' : 'ERROR',
                 $error->code,
                 trim($error->message),
                 $error->file ? $error->file : 'n/a',

diff --git a/Serializer/JMSSerializerAdapter.php b/Serializer/JMSSerializerAdapter.php
@@ -75,8 +75,9 @@ private function convertContext($context, $direction)
                 $jmsContext = JMSSerializationContext::create();
             } else {
                 $jmsContext = JMSDeserializationContext::create();
-                if (null !== $context->getMaxDepth()) {
-                    for ($i = 0; $i < $context->getMaxDepth(); ++$i) {
+                $maxDepth = $context->getMaxDepth();
+                if (null !== $maxDepth) {
+                    for ($i = 0; $i < $maxDepth; ++$i) {
                         $jmsContext->increaseDepth();
                     }
                 }

diff --git a/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php b/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php
@@ -173,7 +173,7 @@ public function testControllerAsServiceWithClassName()
         $this->containerMock->expects($this->any())
             ->method('has')
             ->will($this->returnCallback(function ($serviceId) use ($controller) {
-                return $serviceId == get_class($controller);
+                return $serviceId === get_class($controller);
             }));
         $this->containerMock->expects($this->once())
             ->method('get')

diff --git a/View/ViewHandler.php b/View/ViewHandler.php
@@ -285,7 +285,7 @@ protected function getSerializationContext(View $view)
     {
         // BC < 1.8
         $viewClass = 'FOS\RestBundle\View\View';
-        if (get_class($view) == $viewClass) {
+        if (get_class($view) === $viewClass) {
             $context = $view->getContext();
         } else {
             $method = new \ReflectionMethod($view, 'getSerializationContext');
@@ -370,7 +370,7 @@ public function handle(View $view, Request $request = null)
     public function createRedirectResponse(View $view, $location, $format)
     {
         $content = null;
-        if (($view->getStatusCode() == Codes::HTTP_CREATED || $view->getStatusCode() == Codes::HTTP_ACCEPTED) && $view->getData() != null) {
+        if (($view->getStatusCode() === Codes::HTTP_CREATED || $view->getStatusCode() === Codes::HTTP_ACCEPTED) && $view->getData() !== null) {
             $response = $this->initResponse($view, $format);
         } else {
             $response = $view->getResponse();