Skip to content

Commit 8a727b9

Browse files
YaroslawEkimovYaroslawEkimov
committed
Merge branch 'master' into release
2 parents 59a3e72 + 5cad767 commit 8a727b9

File tree

10 files changed

+1407
-17
lines changed

10 files changed

+1407
-17
lines changed

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ This repository contains Aspose.Words Cloud SDK for PHP source code. This SDK al
1313
* Watermarks and protection
1414
* Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
1515

16+
## Enhancements in Version 24.4
17+
18+
- Added the 'MergeWithNext' method to merge a section with the next one.
19+
- Added the 'LockAspectRatio' propperty for DrawingObjectInsert and DrawingObjectUpdate methods.
20+
21+
1622
## Enhancements in Version 24.3
1723

1824
- Added support for 'RemoveEmptyCells' option for the 'Cleanup' parameter in the insert 'MailMerge' API method.

‎src/Aspose/Words/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class Configuration
134134
* Version of Aspose.Words Cloud API
135135
*
136136
*/
137-
protected $clientVersion = '24.3';
137+
protected $clientVersion = '24.4';
138138

139139
/*
140140
* Stores timeout in seconds
@@ -539,7 +539,7 @@ public static function toDebugReport()
539539
$report = 'PHP SDK (Aspose\Words) Debug Report:' . PHP_EOL;
540540
$report .= ' OS: ' . php_uname() . PHP_EOL;
541541
$report .= ' PHP Version: ' . PHP_VERSION . PHP_EOL;
542-
$report .= ' OpenAPI Spec Version: 24.3' . PHP_EOL;
542+
$report .= ' OpenAPI Spec Version: 24.4' . PHP_EOL;
543543
$report .= ' Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
544544

545545
return $report;

‎src/Aspose/Words/Model/DrawingObjectInsert.php

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ class DrawingObjectInsert implements ArrayAccess
5959
'top' => 'double',
6060
'width' => 'double',
6161
'height' => 'double',
62-
'wrap_type' => 'string'
62+
'wrap_type' => 'string',
63+
'aspect_ratio_locked' => 'bool'
6364
];
6465

6566
/*
@@ -75,7 +76,8 @@ class DrawingObjectInsert implements ArrayAccess
7576
'top' => 'null',
7677
'width' => 'null',
7778
'height' => 'null',
78-
'wrap_type' => 'null'
79+
'wrap_type' => 'null',
80+
'aspect_ratio_locked' => 'null'
7981
];
8082

8183
/*
@@ -112,7 +114,8 @@ public static function swaggerFormats()
112114
'top' => 'Top',
113115
'width' => 'Width',
114116
'height' => 'Height',
115-
'wrap_type' => 'WrapType'
117+
'wrap_type' => 'WrapType',
118+
'aspect_ratio_locked' => 'AspectRatioLocked'
116119
];
117120

118121
/*
@@ -128,7 +131,8 @@ public static function swaggerFormats()
128131
'top' => 'setTop',
129132
'width' => 'setWidth',
130133
'height' => 'setHeight',
131-
'wrap_type' => 'setWrapType'
134+
'wrap_type' => 'setWrapType',
135+
'aspect_ratio_locked' => 'setAspectRatioLocked'
132136
];
133137

134138
/*
@@ -144,7 +148,8 @@ public static function swaggerFormats()
144148
'top' => 'getTop',
145149
'width' => 'getWidth',
146150
'height' => 'getHeight',
147-
'wrap_type' => 'getWrapType'
151+
'wrap_type' => 'getWrapType',
152+
'aspect_ratio_locked' => 'getAspectRatioLocked'
148153
];
149154

150155
/*
@@ -293,6 +298,7 @@ public function __construct(array $data = null)
293298
$this->container['width'] = isset($data['width']) ? $data['width'] : null;
294299
$this->container['height'] = isset($data['height']) ? $data['height'] : null;
295300
$this->container['wrap_type'] = isset($data['wrap_type']) ? $data['wrap_type'] : null;
301+
$this->container['aspect_ratio_locked'] = isset($data['aspect_ratio_locked']) ? $data['aspect_ratio_locked'] : null;
296302
}
297303

298304
/*
@@ -557,6 +563,30 @@ public function setWrapType($wrap_type)
557563
}
558564

559565

566+
/*
567+
* Gets aspect_ratio_locked
568+
*
569+
* @return bool
570+
*/
571+
public function getAspectRatioLocked()
572+
{
573+
return $this->container['aspect_ratio_locked'];
574+
}
575+
576+
/*
577+
* Sets aspect_ratio_locked
578+
*
579+
* @param bool $aspect_ratio_locked Gets or sets a value indicating whether AspectRatioLocked option on or off.
580+
*
581+
* @return $this
582+
*/
583+
public function setAspectRatioLocked($aspect_ratio_locked)
584+
{
585+
$this->container['aspect_ratio_locked'] = $aspect_ratio_locked;
586+
return $this;
587+
}
588+
589+
560590
/*
561591
* Returns true if offset exists. False otherwise.
562592
*

‎src/Aspose/Words/Model/DrawingObjectUpdate.php

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ class DrawingObjectUpdate implements ArrayAccess
5858
'top' => 'double',
5959
'width' => 'double',
6060
'height' => 'double',
61-
'wrap_type' => 'string'
61+
'wrap_type' => 'string',
62+
'aspect_ratio_locked' => 'bool'
6263
];
6364

6465
/*
@@ -73,7 +74,8 @@ class DrawingObjectUpdate implements ArrayAccess
7374
'top' => 'null',
7475
'width' => 'null',
7576
'height' => 'null',
76-
'wrap_type' => 'null'
77+
'wrap_type' => 'null',
78+
'aspect_ratio_locked' => 'null'
7779
];
7880

7981
/*
@@ -109,7 +111,8 @@ public static function swaggerFormats()
109111
'top' => 'Top',
110112
'width' => 'Width',
111113
'height' => 'Height',
112-
'wrap_type' => 'WrapType'
114+
'wrap_type' => 'WrapType',
115+
'aspect_ratio_locked' => 'AspectRatioLocked'
113116
];
114117

115118
/*
@@ -124,7 +127,8 @@ public static function swaggerFormats()
124127
'top' => 'setTop',
125128
'width' => 'setWidth',
126129
'height' => 'setHeight',
127-
'wrap_type' => 'setWrapType'
130+
'wrap_type' => 'setWrapType',
131+
'aspect_ratio_locked' => 'setAspectRatioLocked'
128132
];
129133

130134
/*
@@ -139,7 +143,8 @@ public static function swaggerFormats()
139143
'top' => 'getTop',
140144
'width' => 'getWidth',
141145
'height' => 'getHeight',
142-
'wrap_type' => 'getWrapType'
146+
'wrap_type' => 'getWrapType',
147+
'aspect_ratio_locked' => 'getAspectRatioLocked'
143148
];
144149

145150
/*
@@ -287,6 +292,7 @@ public function __construct(array $data = null)
287292
$this->container['width'] = isset($data['width']) ? $data['width'] : null;
288293
$this->container['height'] = isset($data['height']) ? $data['height'] : null;
289294
$this->container['wrap_type'] = isset($data['wrap_type']) ? $data['wrap_type'] : null;
295+
$this->container['aspect_ratio_locked'] = isset($data['aspect_ratio_locked']) ? $data['aspect_ratio_locked'] : null;
290296
}
291297

292298
/*
@@ -497,6 +503,30 @@ public function setWrapType($wrap_type)
497503
}
498504

499505

506+
/*
507+
* Gets aspect_ratio_locked
508+
*
509+
* @return bool
510+
*/
511+
public function getAspectRatioLocked()
512+
{
513+
return $this->container['aspect_ratio_locked'];
514+
}
515+
516+
/*
517+
* Sets aspect_ratio_locked
518+
*
519+
* @param bool $aspect_ratio_locked Gets or sets a value indicating whether AspectRatioLocked option on or off.
520+
*
521+
* @return $this
522+
*/
523+
public function setAspectRatioLocked($aspect_ratio_locked)
524+
{
525+
$this->container['aspect_ratio_locked'] = $aspect_ratio_locked;
526+
return $this;
527+
}
528+
529+
500530
/*
501531
* Returns true if offset exists. False otherwise.
502532
*

0 commit comments

Comments
 (0)