Fixed #24638569: pdepend crashes on vanilia drupal site

pdepend · Feb 8, 2012 · f20f40a · f20f40a
1 parent 97189b0
commit f20f40a
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 3 deletions.
diff --git a/src/main/php/PHP/Depend.php b/src/main/php/PHP/Depend.php
@@ -547,7 +547,7 @@ private function _performParseProcess()
                 $this->_builder,
                 $this->_cacheFactory->create()
             );
-            $parser->setMaxNestingLevel(1024);
+            $parser->setMaxNestingLevel($this->configuration->parser->nesting);
 
             // Disable annotation parsing?
             if ($this->_withoutAnnotations === true) {
@@ -582,7 +582,7 @@ private function _performAnalyzeProcess()
 
         $this->fireStartAnalyzeProcess();
 
-        ini_set('xdebug.max_nesting_level', 1024);
+        ini_set('xdebug.max_nesting_level', $this->configuration->parser->nesting);
 
         foreach ($analyzerLoader as $analyzer) {
             // Add filters if this analyzer is filter aware

diff --git a/src/main/php/PHP/Depend/Util/Configuration/Factory.php b/src/main/php/PHP/Depend/Util/Configuration/Factory.php
@@ -103,6 +103,9 @@ public function __construct()
         $this->default->imageConvert             = new stdClass();
         $this->default->imageConvert->fontSize   = '11';
         $this->default->imageConvert->fontFamily = 'Arial';
+
+        $this->default->parser          = new stdClass();
+        $this->default->parser->nesting = 8192;
     }
 
     /**

diff --git a/src/main/php/PHP/Depend/Util/Configuration/Parser.php b/src/main/php/PHP/Depend/Util/Configuration/Parser.php
@@ -109,6 +109,7 @@ public function parse($file)
         $this->sxml = new SimpleXMLElement($file, null, true);
 
         $this->parseCache();
+        $this->parseParser();
         $this->parseImageConvert();
 
         return $this->settings;
@@ -145,4 +146,17 @@ protected function parseImageConvert()
                 = (float) $this->sxml->imageConvert->fontSize;
         }
     }
+
+    /**
+     * This method parses the parser related configuration settings.
+     *
+     * @return void
+     * @since 1.0.1
+     */
+    protected function parseParser()
+    {
+        if (isset($this->sxml->parser->nesting)) {
+            $this->settings->parser->nesting = (int) $this->sxml->parser->nesting;
+        }
+    }
 }
diff --git a/src/site/docx/changes.xml b/src/site/docx/changes.xml
@@ -13,9 +13,12 @@
                  date="2012/02/08"
                  description="This release fixes two bugs in PHP_Depend's
                               parser, which resulted in uncatchable errors.">
-            <action date="" dev="mapi" issue="24635313" system="pivotaltracker" type="fix">
+            <action date="97189b0" dev="mapi" issue="24635313" system="pivotaltracker" type="fix" due-to="Rex Mcconnell">
                 _parseOptionalExpression() returning null causes exception
             </action>
+            <action date="" dev="mapi" issue="24638569" system="pivotaltracker" type="fix" due-to="bluszcz">
+                pdepend crashes on vanilia drupal site
+            </action>
         </release>
 
 		<release version="1.0.0"

diff --git a/src/test/php/PHP/Depend/Util/Configuration/FactoryTest.php b/src/test/php/PHP/Depend/Util/Configuration/FactoryTest.php
@@ -203,6 +203,19 @@ public function testCreateDefaultOverwritesSettingsWithValuesDefinedInXmlAndXmlD
         self::assertEquals(42, $config->imageConvert->fontSize);
     }
 
+    /**
+     * testDefaultConfigurationHasExpectedParserNesting
+     *
+     * @return void
+     */
+    public function testDefaultConfigurationHasExpectedParserNesting()
+    {
+        $factory = new PHP_Depend_Util_Configuration_Factory();
+        $config  = $factory->createDefault();
+
+        self::assertEquals(8192, $config->parser->nesting);
+    }
+
     /**
      * testCreateForNotExistingFileThrowsExpectedException
      *

diff --git a/src/test/php/PHP/Depend/Util/Configuration/ParserTest.php b/src/test/php/PHP/Depend/Util/Configuration/ParserTest.php
@@ -133,6 +133,19 @@ public function testParserHandlesImagickFontSizeConfigurationValue()
         self::assertEquals(23, $values->imageConvert->fontSize);
     }
 
+    /**
+     * testParserHandlesParserNestingConfigurationValue
+     *
+     * @return void
+     */
+    public function testParserHandlesParserNestingConfigurationValue()
+    {
+        $parser = new PHP_Depend_Util_Configuration_Parser($this->createFixture());
+        $values = $parser->parse($this->getTestConfiguration('pdepend.xml'));
+
+        self::assertEquals(423, $values->parser->nesting);
+    }
+
     /**
      * testParserModifiesConfigurationAdaptive
      *
@@ -191,6 +204,9 @@ protected function createFixture()
                 "imageConvert": {
                     "fontFamily": "Arial",
                     "fontSize":   42
+                },
+                "parser": {
+                    "nesting": 4096
                 }
             }'
         );

diff --git a/...es/Util/Configuration/Parser/testParserHandlesParserNestingConfigurationValue/pdepend.xml b/...es/Util/Configuration/Parser/testParserHandlesParserNestingConfigurationValue/pdepend.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns="http://pdepend.org/schema/configuration"
+               xsi:schemaLocation="http://pdepend.org/schema/configuration http://pdepend.org/schema/1.0/configuration.xsd">
+
+    <parser>
+        <nesting>423</nesting>
+    </parser>
+</configuration>