Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,14 @@ This repository contains Aspose.Words Cloud SDK for PHP source code. This SDK al
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 23.12
+
+- Properties Name, Text, StartRange, EndRange marked as required for InsertBookmark operation.
+- Implemented DeleteOfficeMathObjects operation to delete all office math objects from document.
+- Parameter ProtectionRequest was removed from the UnprotectDocument operation. Now removing protection from a document does not require a password.
+- Model ProtectionRequest marked as deprecated, please use ProtectionRequestV2 instead for perform ProtectDocument operation. To change the password or protection type of protected document, the old password is no required.
+
+
 ## Enhancements in Version 23.11
 
 - Support of required properties in models.

src/Aspose/Words/Configuration.php

@@ -134,7 +134,7 @@ class Configuration
      * Version of Aspose.Words Cloud API
      *
      */
-    protected $clientVersion = '23.11';
+    protected $clientVersion = '23.12';
 
     /*
      * Stores timeout in seconds
@@ -539,7 +539,7 @@ public static function toDebugReport()
         $report  = 'PHP SDK (Aspose\Words) Debug Report:' . PHP_EOL;
         $report .= '    OS: ' . php_uname() . PHP_EOL;
         $report .= '    PHP Version: ' . PHP_VERSION . PHP_EOL;
-        $report .= '    OpenAPI Spec Version: 23.11' . PHP_EOL;
+        $report .= '    OpenAPI Spec Version: 23.12' . PHP_EOL;
         $report .= '    Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
 
         return $report;

src/Aspose/Words/Model/BookmarkInsert.php

@@ -27,14 +27,15 @@
  */
 
 namespace Aspose\Words\Model;
+use \ArrayAccess;
 use \Aspose\Words\ObjectSerializer;
 
 /*
  * BookmarkInsert
  *
  * @description Represents a bookmark to insert.
  */
-class BookmarkInsert extends BookmarkData
+class BookmarkInsert implements ArrayAccess
 {
     const DISCRIMINATOR = null;
 
@@ -51,6 +52,8 @@ class BookmarkInsert extends BookmarkData
      * @var string[]
      */
     protected static $swaggerTypes = [
+        'name' => 'string',
+        'text' => 'string',
         'start_range' => '\Aspose\Words\Model\NewDocumentPosition',
         'end_range' => '\Aspose\Words\Model\NewDocumentPosition'
     ];
@@ -61,6 +64,8 @@ class BookmarkInsert extends BookmarkData
      * @var string[]
      */
     protected static $swaggerFormats = [
+        'name' => 'null',
+        'text' => 'null',
         'start_range' => 'null',
         'end_range' => 'null'
     ];
@@ -72,7 +77,7 @@ class BookmarkInsert extends BookmarkData
      */
     public static function swaggerTypes()
     {
-        return self::$swaggerTypes + parent::swaggerTypes();
+        return self::$swaggerTypes;
     }
 
     /*
@@ -82,7 +87,7 @@ public static function swaggerTypes()
      */
     public static function swaggerFormats()
     {
-        return self::$swaggerFormats + parent::swaggerFormats();
+        return self::$swaggerFormats;
     }
 
     /*
@@ -92,6 +97,8 @@ public static function swaggerFormats()
      * @var string[]
      */
     protected static $attributeMap = [
+        'name' => 'Name',
+        'text' => 'Text',
         'start_range' => 'StartRange',
         'end_range' => 'EndRange'
     ];
@@ -102,6 +109,8 @@ public static function swaggerFormats()
      * @var string[]
      */
     protected static $setters = [
+        'name' => 'setName',
+        'text' => 'setText',
         'start_range' => 'setStartRange',
         'end_range' => 'setEndRange'
     ];
@@ -112,6 +121,8 @@ public static function swaggerFormats()
      * @var string[]
      */
     protected static $getters = [
+        'name' => 'getName',
+        'text' => 'getText',
         'start_range' => 'getStartRange',
         'end_range' => 'getEndRange'
     ];
@@ -124,7 +135,7 @@ public static function swaggerFormats()
      */
     public static function attributeMap()
     {
-        return parent::attributeMap() + self::$attributeMap;
+        return self::$attributeMap;
     }
 
     /*
@@ -134,7 +145,7 @@ public static function attributeMap()
      */
     public static function setters()
     {
-        return parent::setters() + self::$setters;
+        return self::$setters;
     }
 
     /*
@@ -144,7 +155,7 @@ public static function setters()
      */
     public static function getters()
     {
-        return parent::getters() + self::$getters;
+        return self::$getters;
     }
 
     /*
@@ -159,6 +170,13 @@ public function getModelName()
 
 
 
+    /*
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
     /*
      * Constructor
      *
@@ -167,7 +185,8 @@ public function getModelName()
      */
     public function __construct(array $data = null)
     {
-        parent::__construct($data);
+        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
+        $this->container['text'] = isset($data['text']) ? $data['text'] : null;
         $this->container['start_range'] = isset($data['start_range']) ? $data['start_range'] : null;
         $this->container['end_range'] = isset($data['end_range']) ? $data['end_range'] : null;
     }
@@ -177,20 +196,80 @@ public function __construct(array $data = null)
      */
     public function validate()
     {
-        parent::validate();
+        if (!isset($this->container['name'])) {
+            throw new \InvalidArgumentException('Property Name in BookmarkInsert is required.');
+        }
 
+        if (!isset($this->container['text'])) {
+            throw new \InvalidArgumentException('Property Text in BookmarkInsert is required.');
+        }
+
+        if (!isset($this->container['start_range'])) {
+            throw new \InvalidArgumentException('Property StartRange in BookmarkInsert is required.');
+        }
 
         if (isset($this->container['start_range'])) {
             $this->getStartRange()->validate();
         }
 
+        if (!isset($this->container['end_range'])) {
+            throw new \InvalidArgumentException('Property EndRange in BookmarkInsert is required.');
+        }
 
         if (isset($this->container['end_range'])) {
             $this->getEndRange()->validate();
         }
 
     }
 
+    /*
+     * Gets name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->container['name'];
+    }
+
+    /*
+     * Sets name
+     *
+     * @param string $name Gets or sets the name of the bookmark.
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->container['name'] = $name;
+        return $this;
+    }
+
+
+    /*
+     * Gets text
+     *
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->container['text'];
+    }
+
+    /*
+     * Sets text
+     *
+     * @param string $text Gets or sets text, enclosed in the bookmark.
+     *
+     * @return $this
+     */
+    public function setText($text)
+    {
+        $this->container['text'] = $text;
+        return $this;
+    }
+
+
     /*
      * Gets start_range
      *

src/Aspose/Words/Model/CompareData.php

@@ -56,6 +56,7 @@ class CompareData implements ArrayAccess
         'compare_options' => '\Aspose\Words\Model\CompareOptions',
         'comparing_with_document' => 'string',
         'date_time' => '\DateTime',
+        'file_reference' => '\Aspose\Words\Model\FileReference',
         'result_document_format' => 'string'
     ];
 
@@ -69,6 +70,7 @@ class CompareData implements ArrayAccess
         'compare_options' => 'null',
         'comparing_with_document' => 'null',
         'date_time' => 'null',
+        'file_reference' => 'null',
         'result_document_format' => 'null'
     ];
 
@@ -103,6 +105,7 @@ public static function swaggerFormats()
         'compare_options' => 'CompareOptions',
         'comparing_with_document' => 'ComparingWithDocument',
         'date_time' => 'DateTime',
+        'file_reference' => 'FileReference',
         'result_document_format' => 'ResultDocumentFormat'
     ];
 
@@ -116,6 +119,7 @@ public static function swaggerFormats()
         'compare_options' => 'setCompareOptions',
         'comparing_with_document' => 'setComparingWithDocument',
         'date_time' => 'setDateTime',
+        'file_reference' => 'setFileReference',
         'result_document_format' => 'setResultDocumentFormat'
     ];
 
@@ -129,6 +133,7 @@ public static function swaggerFormats()
         'compare_options' => 'getCompareOptions',
         'comparing_with_document' => 'getComparingWithDocument',
         'date_time' => 'getDateTime',
+        'file_reference' => 'getFileReference',
         'result_document_format' => 'getResultDocumentFormat'
     ];
 
@@ -194,6 +199,7 @@ public function __construct(array $data = null)
         $this->container['compare_options'] = isset($data['compare_options']) ? $data['compare_options'] : null;
         $this->container['comparing_with_document'] = isset($data['comparing_with_document']) ? $data['comparing_with_document'] : null;
         $this->container['date_time'] = isset($data['date_time']) ? $data['date_time'] : null;
+        $this->container['file_reference'] = isset($data['file_reference']) ? $data['file_reference'] : null;
         $this->container['result_document_format'] = isset($data['result_document_format']) ? $data['result_document_format'] : null;
     }
 
@@ -211,8 +217,12 @@ public function validate()
             $this->getCompareOptions()->validate();
         }
 
-        if (!isset($this->container['comparing_with_document'])) {
-            throw new \InvalidArgumentException('Property ComparingWithDocument in CompareData is required.');
+        if (!isset($this->container['file_reference'])) {
+            throw new \InvalidArgumentException('Property FileReference in CompareData is required.');
+        }
+
+        if (isset($this->container['file_reference'])) {
+            $this->getFileReference()->validate();
         }
 
     }
@@ -313,6 +323,30 @@ public function setDateTime($date_time)
     }
 
 
+    /*
+     * Gets file_reference
+     *
+     * @return \Aspose\Words\Model\FileReference
+     */
+    public function getFileReference()
+    {
+        return $this->container['file_reference'];
+    }
+
+    /*
+     * Sets file_reference
+     *
+     * @param \Aspose\Words\Model\FileReference $file_reference Gets or sets the file reference.
+     *
+     * @return $this
+     */
+    public function setFileReference($file_reference)
+    {
+        $this->container['file_reference'] = $file_reference;
+        return $this;
+    }
+
+
     /*
      * Gets result_document_format
      *
@@ -399,6 +433,11 @@ public function offsetUnset($offset)
      */
     public function collectFilesContent($resultFilesContent)
     {
+        if ($this->getFileReference() != null)
+        {
+            $resultFilesContent = $this->getFileReference()->collectFilesContent($resultFilesContent);
+        }
+
         return $resultFilesContent;
     }