Merge pull request #47 from cidilabs/chuck/phpunit-cleanup

Composer unit test cleanup

Author: cidilabs

src/PhpAllyIssue.php

@@ -3,9 +3,9 @@
 namespace CidiLabs\PhpAlly;
 
 use DOMElement;
-use DOMDocument;
 
-class PhpAllyIssue implements \JsonSerializable {
+class PhpAllyIssue implements \JsonSerializable 
+{
     protected $ruleId;
     protected $element;
     protected $previewElement;
@@ -68,7 +68,7 @@ public function getPreview()
         return $this->element->ownerDocument->saveHTML($this->previewElement);
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return [
             'ruleId' => $this->ruleId,
@@ -83,7 +83,7 @@ public function __toString()
         return \json_encode($this->toArray());
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->toArray();
     }

src/PhpAllyReport.php

@@ -2,7 +2,8 @@
 
 namespace CidiLabs\PhpAlly;
 
-class PhpAllyReport implements \JsonSerializable {
+class PhpAllyReport implements \JsonSerializable
+{
     protected $issues = [];
     protected $errors = [];
     protected $html = '';
@@ -12,7 +13,7 @@ public function __construct()
     {
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return [
             'issues' => $this->getIssues(),
@@ -21,14 +22,14 @@ public function toArray()
         ];
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->toArray();
     }
 
     public function __toString()
     {
-        return \json_encode($this->toArray());        
+        return \json_encode($this->toArray());
     }
 
     public function getIssues()
@@ -66,9 +67,9 @@ public function getIssueCounts()
         return $this->issueCounts;
     }
 
-    public function setIssueCounts($ruleId, $issueCount, $total) {
-        $ruleId = str_replace(['CidiLabs\\PhpAlly\\Rule\\','App\\Rule\\'], '', $ruleId);
+    public function setIssueCounts($ruleId, $issueCount, $total)
+    {
+        $ruleId = str_replace(['CidiLabs\\PhpAlly\\Rule\\', 'App\\Rule\\'], '', $ruleId);
         $this->issueCounts[$ruleId] = array('issueCount' => $issueCount, "totalCount" => $total);
     }
-
-}
+}

src/Rule/ContentTooLong.php

@@ -2,8 +2,6 @@
 
 namespace CidiLabs\PhpAlly\Rule;
 
-use CidiLabs\PhpAlly\Rule\HtmlElement;
-
 use DOMElement;
 
 /**
@@ -22,6 +20,7 @@ public function check()
     {
         $pageText = '';
 		$wordCount = 0;
+        $this->totalTests++;
 
         // Ignore html with script tags
         if (count($this->getAllElements('script')) === 0) {
@@ -31,7 +30,6 @@ public function check()
                 if($text != null){
                     $pageText = $pageText . $text;
                 }
-                $this->totalTests++;
             }
             $wordCount = str_word_count($pageText);