Merge branch 'master' into develop

ilovepdf · Jun 21, 2019 · 0996760 · 0996760
2 parents 9309b16 + 04b6c43
commit 0996760
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/init.php b/init.php
@@ -7,7 +7,7 @@
 require_once __DIR__ . '/src/Request/Response.php';
 require_once __DIR__ . '/src/Request/Request.php';
 require_once __DIR__ . '/src/Request/Body.php';
-
+require_once __DIR__ . '/src/Element.php';
 //Exceptions
 require_once __DIR__ . '/src/Exceptions/ExtendedException.php';
 require_once __DIR__ . '/src/Exceptions/DownloadException.php';

diff --git a/src/Element.php b/src/Element.php
@@ -98,6 +98,11 @@ class Element
      */
     public $font_style = 'Regular';
 
+    /**
+     * @var string
+     */
+    public $font_weight = null;
+
     /**
      * @var string
      */
@@ -141,7 +146,11 @@ class Element
     public $layer;
 
 
+    /**
+     * @var bool
+     */
     public $bold = false;
+
     /**
      * string
      * @var
@@ -224,6 +233,15 @@ public function setFontStyle($font_style)
         return $this;
     }
 
+    /**
+     * @param string $font_weight
+     */
+    public function setFontWeight($font_weight)
+    {
+        $this->font_weight = $font_weight;
+        return $this;
+    }
+
     /**
      * @param int $font_size
      */
@@ -295,7 +313,7 @@ public function setVerticalPositionAdjustment($vertical_position_adjustment)
     /**
      * @param int $horizontal_position_adjustment
      */
-    public function setHorizontalAdjustmentPercent($horizontal_adjustment_percent)
+    public function setHorizontalAdjustmentPercent($horizontal_adjustment_percent): Element
     {
         $this->horizontal_adjustment_percent = $horizontal_adjustment_percent;
         return $this;
@@ -305,7 +323,7 @@ public function setHorizontalAdjustmentPercent($horizontal_adjustment_percent)
      * @param $gravity
      * @return $this
      */
-    public function setGravity($gravity)
+    public function setGravity($gravity): Element
     {
         $this->checkValues($gravity, $this->gravityValues);
 
@@ -317,7 +335,7 @@ public function setGravity($gravity)
      * @param int $width_percent
      * @return $this
      */
-    public function setWidthPercent(int $width_percent)
+    public function setWidthPercent(int $width_percent): Element
     {
         $this->width_percent = $width_percent;
         return $this;
@@ -336,4 +354,14 @@ public function checkValues($value, $allowedValues)
         }
     }
 
+    /**
+     * @param bool $mosaic
+     * @return Element
+     */
+    public function setMosaic(bool $mosaic): Element
+    {
+        $this->mosaic = $mosaic;
+        return $this;
+    }
+
 }
diff --git a/tests/Iloveimg/FileTest.php b/tests/Iloveimg/FileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\iloveimg;
+namespace Tests\Iloveimg;
 
 use Iloveimg\File;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Iloveimg/IloveTest.php b/tests/Iloveimg/IloveTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\iloveimg;
+namespace Tests\Iloveimg;
 
 use Iloveimg\CompressTask;
 use Iloveimg\Iloveimg;

diff --git a/tests/Iloveimg/IloveimgTest.php b/tests/Iloveimg/IloveimgTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\iloveimg;
+namespace Tests\Iloveimg;
 
 use Iloveimg\Iloveimg;
 use PHPUnit\Framework\TestCase;
@@ -60,6 +60,7 @@ public function testCanGetJwt()
 
     /**
      * @test
+     * @expectedException \Exception
      */
     public function testEmptyTaskShouldThrowException()
     {

diff --git a/tests/bootstrap.no_autoload.php b/tests/bootstrap.no_autoload.php
@@ -1,4 +1,3 @@
 <?php
 
 require_once __DIR__ . '/../init.php';
-require_once __DIR__ . '/TestCase.php';