Merge pull request #4 from vincentKool/VK-issue161

Vk issue161
PHPOffice · Aug 23, 2016 · b3a7756 · b3a7756
2 parents 6122baf + feee2a4
commit b3a7756
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/phpmd.xml.dist b/phpmd.xml.dist
@@ -4,11 +4,25 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <rule ref="rulesets/naming.xml"/>
+    <rule ref="rulesets/naming.xml">
+        <exclude name="LongVariable" />
+    </rule>
+    <rule ref="rulesets/naming.xml/LongVariable">
+        <properties>
+            <property name="maximum" value="32" />
+        </properties>
+    </rule>
     <rule ref="rulesets/design.xml/ExitExpression" />
     <rule ref="rulesets/design.xml/EvalExpression" />
     <rule ref="rulesets/design.xml/GotoStatement" />
     <rule ref="rulesets/design.xml/DepthOfInheritance" />
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects">
+        <!-- PptSlides needs more coupling (default: 13) -->
+        <!-- Writer/Office2007/AbstractSlide needs more coupling (default: 13) -->
+        <properties>
+            <property name="minimum" value="31" />
+        </properties>
+    </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">
         <!-- AbstractStyle needs more children (default: 15) -->
         <properties>

diff --git a/src/PhpPresentation/Shape/Line.php b/src/PhpPresentation/Shape/Line.php
@@ -43,7 +43,6 @@ public function __construct($fromX, $fromY, $toX, $toY)
         $this->setOffsetY($fromY);
         $this->setWidth($toX - $fromX);
         $this->setHeight($toY - $fromY);
-
     }
 
     /**

diff --git a/src/PhpPresentation/Writer/ODPresentation/Content.php b/src/PhpPresentation/Writer/ODPresentation/Content.php
@@ -1343,6 +1343,5 @@ protected function writeStylePartShadow(XMLWriter $objWriter, Shadow $oShadow)
         }
         $objWriter->writeAttribute('draw:shadow-opacity', (100 - $oShadow->getAlpha()) . '%');
         $objWriter->writeAttribute('style:mirror', 'none');
-
     }
 }
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/AbstractSlide.php b/src/PhpPresentation/Writer/PowerPoint2007/AbstractSlide.php
@@ -19,7 +19,6 @@
 use PhpOffice\Common\Drawing as CommonDrawing;
 use PhpOffice\Common\Text;
 use PhpOffice\Common\XMLWriter;
-use PhpOffice\PhpPresentation\Shape\AbstractDrawing;
 use PhpOffice\PhpPresentation\Shape\AbstractGraphic;
 use PhpOffice\PhpPresentation\Shape\Chart as ShapeChart;
 use PhpOffice\PhpPresentation\Shape\Comment;

diff --git a/tests/PhpPresentation/Tests/Slide/TransitionTest.php b/tests/PhpPresentation/Tests/Slide/TransitionTest.php
@@ -88,6 +88,5 @@ public function testTransitionType()
         $this->assertNull($object->getTransitionType());
         $this->assertInstanceOf('PhpOffice\\PhpPresentation\\Slide\\Transition', $object->setTransitionType(Transition::TRANSITION_RANDOM));
         $this->assertEquals(Transition::TRANSITION_RANDOM, $object->getTransitionType());
-
     }
 }
diff --git a/tests/PhpPresentation/Tests/Writer/ODPresentation/ObjectsChartTest.php b/tests/PhpPresentation/Tests/Writer/ODPresentation/ObjectsChartTest.php
@@ -86,7 +86,6 @@ public function testAxisFont()
         $this->assertEquals('normal', $oXMLDoc->getElementAttribute($element, 'fo:font-style', 'Object 1/content.xml'));//Italic YAxis
         $this->assertEquals('16pt', $oXMLDoc->getElementAttribute($element, 'fo:font-size', 'Object 1/content.xml'));//Size YAxis
         $this->assertEquals('Arial', $oXMLDoc->getElementAttribute($element, 'fo:font-family', 'Object 1/content.xml'));//Size YAxis
-
     }
 
     public function testLegend()
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,6 @@ public function __construct($fromX, $fromY, $toX, $toY) @@
             $this->setOffsetY($fromY);
             $this->setWidth($toX - $fromX);
             $this->setHeight($toY - $fromY);
         }
         /**
@@ Expand Down @@