Merge pull request #8 from PHPOffice/unittest

PHPUnit : Improved Unit Tests

Author: Progi1984

.github/workflows/deploy.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.1
+          php-version: 7.2
           extensions: dom, xml
           coverage: xdebug
       - name: Create directory public/coverage
@@ -35,12 +35,13 @@ jobs:
       - name: Build Coverage Report
         run: XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./ --coverage-text --coverage-html ./public/coverage
         ### PHPDoc
-      #- name: Create directory public/docs
-      #  run: mkdir ./public/docs
-      #- name: Install PhpDocumentor
-      #  run: wget https://phpdoc.org/phpDocumentor.phar && chmod +x phpDocumentor.phar
-      #- name: Build Documentation
-      #  run: ./phpDocumentor.phar run -d ./src -t ./public/docs
+      - name: Create directory public/docs
+        run: mkdir ./public/docs
+      - name: Install PhpDocumentor
+        ## Support PHP 7.2
+        run: wget https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0/phpDocumentor.phar && chmod +x phpDocumentor.phar
+      - name: Build Documentation
+        run: ./phpDocumentor.phar run -d ./src -t ./public/docs
 
       ### Deploy
       - name: Deploy

.github/workflows/php.yml

@@ -81,23 +81,23 @@ jobs:
           with:
               php-version: ${{ matrix.php }}
               extensions: xml
-              coverage: ${{ (matrix.php == '7.1') && 'xdebug' || 'none' }}
+              coverage: ${{ (matrix.php == '8.1') && 'xdebug' || 'none' }}
 
       -   uses: actions/checkout@v4
 
       -   name: Install dependencies
           run: composer install --ansi --prefer-dist --no-interaction --no-progress
 
       -   name: Run PHPUnit
-          if: matrix.php != '7.1'
+          if: matrix.php != '8.1'
           run: ./vendor/bin/phpunit -c phpunit.xml.dist
 
       -   name: Run PHPUnit (w CodeCoverage)
-          if: matrix.php == '7.1'
-          run: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
+          if: matrix.php == '8.1'
+          run: XDEBUG_MODE=coverage ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
 
       -   name: Upload coverage results to Coveralls
-          if: matrix.php == '7.1'
+          if: matrix.php == '8.1'
           env:
             COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           run: |

.gitignore

@@ -1,4 +1,5 @@
 .php_cs.cache
+.php-cs-fixer.cache
 .phpunit.cache
 .phpunit.result.cache
 composer.lock

composer.json

@@ -2,6 +2,7 @@
     "name": "phpoffice/math",
     "description": "Math - Manipulate Math Formula",
     "keywords": ["PHP","mathml", "officemathml"],
+    "homepage": "https://phpoffice.github.io/Math/",
     "type": "library",
     "license": "MIT",
     "autoload": {
@@ -22,7 +23,7 @@
         "ext-xml": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=7.0",
+        "phpunit/phpunit": "^7.0 || ^9.0",
         "phpstan/phpstan": "^0.12.88 || ^1.0.0"
     }
 }

docs/changes/0.1.0.md

@@ -4,6 +4,7 @@
 
 - Initial version by [@Progi1984](https://github/Progi1984)
 - MathML Reader : Support for Semantics by [@Progi1984](https://github/Progi1984) in [#4](https://github.com/PHPOffice/Math/pull/4)
+- PHPUnit : Improved Unit Tests by [@Progi1984](https://github/Progi1984) in [#8](https://github.com/PHPOffice/Math/pull/8)
 
 ## Bug fixes
 

phpunit.xml.dist

@@ -21,4 +21,9 @@
         <log type="coverage-html" target="./build/coverage" />
         <log type="coverage-clover" target="./build/clover.xml" />
     </logging>
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>

src/Math/Element/AbstractElement.php

@@ -2,30 +2,6 @@
 
 namespace PhpOffice\Math\Element;
 
-use PhpOffice\Math\Math;
-
 abstract class AbstractElement
 {
-    /**
-     * @var Math|AbstractGroupElement|null
-     */
-    protected $parent;
-
-    /**
-     * @param Math|AbstractGroupElement|null $parent
-     */
-    public function setParent($parent): self
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * @return Math|AbstractGroupElement|null
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
 }

src/Math/Element/AbstractGroupElement.php

@@ -12,7 +12,6 @@ abstract class AbstractGroupElement extends AbstractElement
     public function add(AbstractElement $element): self
     {
         $this->elements[] = $element;
-        $element->setParent($this);
 
         return $this;
     }
@@ -23,8 +22,6 @@ public function remove(AbstractElement $element): self
             return $child != $element;
         });
 
-        $element->setParent(null);
-
         return $this;
     }
 

src/Math/Element/Fraction.php

@@ -14,6 +14,12 @@ class Fraction extends AbstractElement
      */
     protected $numerator;
 
+    public function __construct(AbstractElement $numerator, AbstractElement $denominator)
+    {
+        $this->setNumerator($numerator);
+        $this->setDenominator($denominator);
+    }
+
     public function getDenominator(): AbstractElement
     {
         return $this->denominator;

src/Math/Element/Superscript.php

@@ -14,6 +14,12 @@ class Superscript extends AbstractElement
      */
     protected $superscript;
 
+    public function __construct(AbstractElement $base, AbstractElement $superscript)
+    {
+        $this->setBase($base);
+        $this->setSuperscript($superscript);
+    }
+
     public function getBase(): AbstractElement
     {
         return $this->base;