fix: Update syntax to PHP 7.4 using Rector (#221)

meyfa · Feb 15, 2024 · cf4c38e · cf4c38e
1 parent da6dca5
commit cf4c38e
Show file tree

Hide file tree

Showing 113 changed files with 367 additions and 356 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
     "require-dev": {
         "phpunit/phpunit": "^9.6.16",
         "meyfa/phpunit-assert-gd": "^v3.0.0",
-        "phpmd/phpmd" : "^2.15.0"
+        "phpmd/phpmd" : "^2.15.0",
+        "rector/rector": "^1.0"
     },
     "suggest": {
         "ext-gd": "Needed to rasterize images",

diff --git a/rector.php b/rector.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+
+    ->withPhpSets(php74: true)
+    ->withRules([
+        AddVoidReturnTypeWhereNoReturnRector::class,
+    ]);
diff --git a/src/Fonts/TrueTypeFontFile.php b/src/Fonts/TrueTypeFontFile.php
@@ -44,10 +44,7 @@ public function getFamily(): string
 
     public function getWeight(): float
     {
-        if (isset($this->weightClass)) {
-            return $this->weightClass;
-        }
-        return $this->subfamily === 'Bold' || $this->subfamily === 'Bold Italic' ? 700 : 400;
+        return $this->weightClass ?? ($this->subfamily === 'Bold' || $this->subfamily === 'Bold Italic' ? 700 : 400);
     }
 
     public function isItalic(): bool

diff --git a/src/Nodes/Embedded/SVGForeignObject.php b/src/Nodes/Embedded/SVGForeignObject.php
@@ -10,7 +10,7 @@
  */
 class SVGForeignObject extends SVGNodeContainer
 {
-    const TAG_NAME = 'foreignObject';
+    public const TAG_NAME = 'foreignObject';
 
     public function __construct()
     {

diff --git a/src/Nodes/Embedded/SVGImage.php b/src/Nodes/Embedded/SVGImage.php
@@ -14,7 +14,7 @@
  */
 class SVGImage extends SVGNodeContainer
 {
-    const TAG_NAME = 'image';
+    public const TAG_NAME = 'image';
 
     /**
      * @param string|null $href   The image path, URL or URI.

diff --git a/src/Nodes/Filters/SVGFEBlend.php b/src/Nodes/Filters/SVGFEBlend.php
@@ -10,7 +10,7 @@
  */
 class SVGFEBlend extends SVGNodeContainer
 {
-    const TAG_NAME = 'feBlend';
+    public const TAG_NAME = 'feBlend';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEColorMatrix.php b/src/Nodes/Filters/SVGFEColorMatrix.php
@@ -10,7 +10,7 @@
  */
 class SVGFEColorMatrix extends SVGNodeContainer
 {
-    const TAG_NAME = 'feColorMatrix';
+    public const TAG_NAME = 'feColorMatrix';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEComponentTransfer.php b/src/Nodes/Filters/SVGFEComponentTransfer.php
@@ -10,7 +10,7 @@
  */
 class SVGFEComponentTransfer extends SVGNodeContainer
 {
-    const TAG_NAME = 'feComponentTransfer';
+    public const TAG_NAME = 'feComponentTransfer';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEComposite.php b/src/Nodes/Filters/SVGFEComposite.php
@@ -10,7 +10,7 @@
  */
 class SVGFEComposite extends SVGNodeContainer
 {
-    const TAG_NAME = 'feComposite';
+    public const TAG_NAME = 'feComposite';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEConvolveMatrix.php b/src/Nodes/Filters/SVGFEConvolveMatrix.php
@@ -10,7 +10,7 @@
  */
 class SVGFEConvolveMatrix extends SVGNodeContainer
 {
-    const TAG_NAME = 'feConvolveMatrix';
+    public const TAG_NAME = 'feConvolveMatrix';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEDiffuseLighting.php b/src/Nodes/Filters/SVGFEDiffuseLighting.php
@@ -10,7 +10,7 @@
  */
 class SVGFEDiffuseLighting extends SVGNodeContainer
 {
-    const TAG_NAME = 'feDiffuseLighting';
+    public const TAG_NAME = 'feDiffuseLighting';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEDisplacementMap.php b/src/Nodes/Filters/SVGFEDisplacementMap.php
@@ -10,7 +10,7 @@
  */
 class SVGFEDisplacementMap extends SVGNodeContainer
 {
-    const TAG_NAME = 'feDisplacementMap';
+    public const TAG_NAME = 'feDisplacementMap';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEDistantLight.php b/src/Nodes/Filters/SVGFEDistantLight.php
@@ -10,7 +10,7 @@
  */
 class SVGFEDistantLight extends SVGNodeContainer
 {
-    const TAG_NAME = 'feDistantLight';
+    public const TAG_NAME = 'feDistantLight';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEDropShadow.php b/src/Nodes/Filters/SVGFEDropShadow.php
@@ -10,7 +10,7 @@
  */
 class SVGFEDropShadow extends SVGNodeContainer
 {
-    const TAG_NAME = 'feDropShadow';
+    public const TAG_NAME = 'feDropShadow';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEFlood.php b/src/Nodes/Filters/SVGFEFlood.php
@@ -10,7 +10,7 @@
  */
 class SVGFEFlood extends SVGNodeContainer
 {
-    const TAG_NAME = 'feFlood';
+    public const TAG_NAME = 'feFlood';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEFuncA.php b/src/Nodes/Filters/SVGFEFuncA.php
@@ -10,7 +10,7 @@
  */
 class SVGFEFuncA extends SVGNodeContainer
 {
-    const TAG_NAME = 'feFuncA';
+    public const TAG_NAME = 'feFuncA';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEFuncB.php b/src/Nodes/Filters/SVGFEFuncB.php
@@ -10,7 +10,7 @@
  */
 class SVGFEFuncB extends SVGNodeContainer
 {
-    const TAG_NAME = 'feFuncB';
+    public const TAG_NAME = 'feFuncB';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEFuncG.php b/src/Nodes/Filters/SVGFEFuncG.php
@@ -10,7 +10,7 @@
  */
 class SVGFEFuncG extends SVGNodeContainer
 {
-    const TAG_NAME = 'feFuncG';
+    public const TAG_NAME = 'feFuncG';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEFuncR.php b/src/Nodes/Filters/SVGFEFuncR.php
@@ -10,7 +10,7 @@
  */
 class SVGFEFuncR extends SVGNodeContainer
 {
-    const TAG_NAME = 'feFuncR';
+    public const TAG_NAME = 'feFuncR';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEGaussianBlur.php b/src/Nodes/Filters/SVGFEGaussianBlur.php
@@ -10,7 +10,7 @@
  */
 class SVGFEGaussianBlur extends SVGNodeContainer
 {
-    const TAG_NAME = 'feGaussianBlur';
+    public const TAG_NAME = 'feGaussianBlur';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEImage.php b/src/Nodes/Filters/SVGFEImage.php
@@ -10,7 +10,7 @@
  */
 class SVGFEImage extends SVGNodeContainer
 {
-    const TAG_NAME = 'feImage';
+    public const TAG_NAME = 'feImage';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEMerge.php b/src/Nodes/Filters/SVGFEMerge.php
@@ -10,7 +10,7 @@
  */
 class SVGFEMerge extends SVGNodeContainer
 {
-    const TAG_NAME = 'feMerge';
+    public const TAG_NAME = 'feMerge';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEMergeNode.php b/src/Nodes/Filters/SVGFEMergeNode.php
@@ -10,7 +10,7 @@
  */
 class SVGFEMergeNode extends SVGNodeContainer
 {
-    const TAG_NAME = 'feMergeNode';
+    public const TAG_NAME = 'feMergeNode';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEMorphology.php b/src/Nodes/Filters/SVGFEMorphology.php
@@ -10,7 +10,7 @@
  */
 class SVGFEMorphology extends SVGNodeContainer
 {
-    const TAG_NAME = 'feMorphology';
+    public const TAG_NAME = 'feMorphology';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEOffset.php b/src/Nodes/Filters/SVGFEOffset.php
@@ -10,7 +10,7 @@
  */
 class SVGFEOffset extends SVGNodeContainer
 {
-    const TAG_NAME = 'feOffset';
+    public const TAG_NAME = 'feOffset';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFEPointLight.php b/src/Nodes/Filters/SVGFEPointLight.php
@@ -10,7 +10,7 @@
  */
 class SVGFEPointLight extends SVGNodeContainer
 {
-    const TAG_NAME = 'fePointLight';
+    public const TAG_NAME = 'fePointLight';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFESpecularLighting.php b/src/Nodes/Filters/SVGFESpecularLighting.php
@@ -10,7 +10,7 @@
  */
 class SVGFESpecularLighting extends SVGNodeContainer
 {
-    const TAG_NAME = 'feSpecularLighting';
+    public const TAG_NAME = 'feSpecularLighting';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFESpotLight.php b/src/Nodes/Filters/SVGFESpotLight.php
@@ -10,7 +10,7 @@
  */
 class SVGFESpotLight extends SVGNodeContainer
 {
-    const TAG_NAME = 'feSpotLight';
+    public const TAG_NAME = 'feSpotLight';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFETile.php b/src/Nodes/Filters/SVGFETile.php
@@ -10,7 +10,7 @@
  */
 class SVGFETile extends SVGNodeContainer
 {
-    const TAG_NAME = 'feTile';
+    public const TAG_NAME = 'feTile';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFETurbulence.php b/src/Nodes/Filters/SVGFETurbulence.php
@@ -10,7 +10,7 @@
  */
 class SVGFETurbulence extends SVGNodeContainer
 {
-    const TAG_NAME = 'feTurbulence';
+    public const TAG_NAME = 'feTurbulence';
 
     public function __construct()
     {

diff --git a/src/Nodes/Filters/SVGFilter.php b/src/Nodes/Filters/SVGFilter.php
@@ -10,7 +10,7 @@
  */
 class SVGFilter extends SVGNodeContainer
 {
-    const TAG_NAME = 'filter';
+    public const TAG_NAME = 'filter';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGAnimate.php b/src/Nodes/Presentation/SVGAnimate.php
@@ -10,7 +10,7 @@
  */
 class SVGAnimate extends SVGNodeContainer
 {
-    const TAG_NAME = 'animate';
+    public const TAG_NAME = 'animate';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGAnimateMotion.php b/src/Nodes/Presentation/SVGAnimateMotion.php
@@ -10,7 +10,7 @@
  */
 class SVGAnimateMotion extends SVGNodeContainer
 {
-    const TAG_NAME = 'animateMotion';
+    public const TAG_NAME = 'animateMotion';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGAnimateTransform.php b/src/Nodes/Presentation/SVGAnimateTransform.php
@@ -10,7 +10,7 @@
  */
 class SVGAnimateTransform extends SVGNodeContainer
 {
-    const TAG_NAME = 'animateTransform';
+    public const TAG_NAME = 'animateTransform';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGLinearGradient.php b/src/Nodes/Presentation/SVGLinearGradient.php
@@ -10,7 +10,7 @@
  */
 class SVGLinearGradient extends SVGNodeContainer
 {
-    const TAG_NAME = 'linearGradient';
+    public const TAG_NAME = 'linearGradient';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGMPath.php b/src/Nodes/Presentation/SVGMPath.php
@@ -10,7 +10,7 @@
  */
 class SVGMPath extends SVGNodeContainer
 {
-    const TAG_NAME = 'mpath';
+    public const TAG_NAME = 'mpath';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGRadialGradient.php b/src/Nodes/Presentation/SVGRadialGradient.php
@@ -10,7 +10,7 @@
  */
 class SVGRadialGradient extends SVGNodeContainer
 {
-    const TAG_NAME = 'radialGradient';
+    public const TAG_NAME = 'radialGradient';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGSet.php b/src/Nodes/Presentation/SVGSet.php
@@ -10,7 +10,7 @@
  */
 class SVGSet extends SVGNodeContainer
 {
-    const TAG_NAME = 'set';
+    public const TAG_NAME = 'set';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGStop.php b/src/Nodes/Presentation/SVGStop.php
@@ -10,7 +10,7 @@
  */
 class SVGStop extends SVGNodeContainer
 {
-    const TAG_NAME = 'stop';
+    public const TAG_NAME = 'stop';
 
     public function __construct()
     {

diff --git a/src/Nodes/Presentation/SVGView.php b/src/Nodes/Presentation/SVGView.php
@@ -10,7 +10,7 @@
  */
 class SVGView extends SVGNodeContainer
 {
-    const TAG_NAME = 'view';
+    public const TAG_NAME = 'view';
 
     public function __construct()
     {

diff --git a/src/Nodes/SVGNodeContainer.php b/src/Nodes/SVGNodeContainer.php
@@ -49,7 +49,7 @@ public function addChild(SVGNode $node, int $index = null): SVGNodeContainer
             $node->parent->removeChild($node);
         }
 
-        $index = ($index !== null) ? $index : count($this->children);
+        $index ??= count($this->children);
 
         // insert and set new parent
         array_splice($this->children, $index, 0, [$node]);

diff --git a/src/Nodes/Shapes/SVGCircle.php b/src/Nodes/Shapes/SVGCircle.php
@@ -13,7 +13,7 @@
  */
 class SVGCircle extends SVGNodeContainer
 {
-    const TAG_NAME = 'circle';
+    public const TAG_NAME = 'circle';
 
     /**
      * @param mixed $cx The center's x coordinate.

diff --git a/src/Nodes/Shapes/SVGEllipse.php b/src/Nodes/Shapes/SVGEllipse.php
@@ -13,7 +13,7 @@
  */
 class SVGEllipse extends SVGNodeContainer
 {
-    const TAG_NAME = 'ellipse';
+    public const TAG_NAME = 'ellipse';
 
     /**
      * @param mixed $cx The center's x coordinate.