refactored @:enum to enum

AlexHaxe · May 15, 2023 · 93d01cc · 93d01cc
1 parent 83c3a68
commit 93d01cc
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## dev branch / next version (0.x.x)
 
+## version 0.3.1 (2023-05-15)
+
+- Refactored @:enum abstract to enum abstract
+- Dropped Haxe 3 support
+
 ## version 0.3.0 (2019-05-12)
 
 - Added Xls and Xlsx readers for spreadsheet

diff --git a/haxelib.json b/haxelib.json
@@ -14,8 +14,8 @@
 		"externs"
 	],
 	"description": "Haxe externs for PHPOffice",
-	"version": "0.3.0",
-	"releasenote": "added Xls and Xlsx readers - see CHANGELOG",
+	"version": "0.3.1",
+	"releasenote": "refactored @:enum to enum - see CHANGELOG",
 	"contributors": [
 		"AlexHaxe"
 	],

diff --git a/src/php/phpoffice/phpspreadsheet/Spreadsheet.hx b/src/php/phpoffice/phpspreadsheet/Spreadsheet.hx
@@ -665,7 +665,7 @@ extern class Spreadsheet {
 	public function setTabRatio(tabRatio:Int):Void;
 }
 
-@:enum abstract Visibility(String) to String {
+enum abstract Visibility(String) to String {
 	// // Allowable values for workbook window visilbity
 	var VISIBILITY_VISIBLE = 'visible';
 	var VISIBILITY_HIDDEN = 'hidden';

diff --git a/src/php/phpoffice/phpspreadsheet/document/Properties.hx b/src/php/phpoffice/phpspreadsheet/document/Properties.hx
@@ -236,7 +236,7 @@ extern class Properties {
 	public function setCustomProperty(propertyName:String, propertyValue:Any, propertyType:Null<PropertyType> = null):Properties;
 }
 
-@:enum abstract PropertyType(String) to String {
+enum abstract PropertyType(String) to String {
 	var PROPERTY_TYPE_BOOLEAN = "b";
 	var PROPERTY_TYPE_INTEGER = "i";
 	var PROPERTY_TYPE_FLOAT = "f";

diff --git a/src/php/phpoffice/phpspreadsheet/style/NumberFormat.hx b/src/php/phpoffice/phpspreadsheet/style/NumberFormat.hx
@@ -122,7 +122,7 @@ extern class NumberFormat {
 }
 
 // Pre-defined formats
-@:enum abstract NumberFormatType(String) from String to String {
+enum abstract NumberFormatType(String) from String to String {
 	var General = "General";
 	var Text = "@";
 	var Number = "0";

diff --git a/src/php/phpoffice/phpspreadsheet/worksheet/PageSetup.hx b/src/php/phpoffice/phpspreadsheet/worksheet/PageSetup.hx
@@ -434,7 +434,7 @@ extern class PageSetup {
 	public function resetFirstPageNumber():PageSetup;
 }
 
-@:enum abstract PaperSize(Int) to Int {
+enum abstract PaperSize(Int) to Int {
 	// Paper size
 	var LETTER = 1;
 	var LETTER_SMALL = 2;
@@ -505,14 +505,14 @@ extern class PageSetup {
 }
 
 // Page orientation
-@:enum abstract Orientation(String) to String {
+enum abstract Orientation(String) to String {
 	var DEFAULT = 'default';
 	var LANDSCAPE = 'landscape';
 	var PORTRAIT = 'portrait';
 }
 
 // Print Range Set Method
-@:enum abstract SetPrintRange(String) to String {
+enum abstract SetPrintRange(String) to String {
 	var OVERWRITE = 'O';
 	var INSERT = 'I';
 }
diff --git a/src/php/phpoffice/phpspreadsheet/worksheet/Worksheet.hx b/src/php/phpoffice/phpspreadsheet/worksheet/Worksheet.hx
@@ -1308,7 +1308,7 @@ extern class Worksheet {
 	public function hasCodeName():Bool;
 }
 
-@:enum abstract Breaktype(Int) to Int {
+enum abstract Breaktype(Int) to Int {
 	var BREAK_NONE = 0;
 	var BREAK_ROW = 1;
 	var BREAK_COLUMN = 2;

diff --git a/src/php/phpoffice/phpword/IOFactory.hx b/src/php/phpoffice/phpword/IOFactory.hx
@@ -38,15 +38,15 @@ extern class IOFactory {
 	public static function load(filename:String, readerName:ReaderTypes = Word2007):PhpWord;
 }
 
-@:enum abstract ReaderTypes(String) to String {
+enum abstract ReaderTypes(String) to String {
 	var OdText = "ODText";
 	var Rtf = "RTF";
 	var Word2007 = "Word2007";
 	var Html = "HTML";
 	var Pdf = "PDF";
 }
 
-@:enum abstract WriterTypes(String) to String {
+enum abstract WriterTypes(String) to String {
 	var OdText = "ODText";
 	var Rtf = "RTF";
 	var Word2007 = "Word2007";

diff --git a/src/php/phpoffice/phpword/style/Font.hx b/src/php/phpoffice/phpword/style/Font.hx
@@ -424,7 +424,7 @@ extern class Font extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract Underline(String) from String to String {
+enum abstract Underline(String) from String to String {
 	var None = "none";
 	var Dash = "dash";
 	var DashHeavy = "dashHeavy";
@@ -450,7 +450,7 @@ extern class Font extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract ForegroundColor(String) from String to String {
+enum abstract ForegroundColor(String) from String to String {
 	var Yellow = "yellow";
 	var LigthGreen = "green";
 	var Cyan = "cyan";

diff --git a/src/php/phpoffice/phpword/style/Frame.hx b/src/php/phpoffice/phpword/style/Frame.hx
@@ -303,7 +303,7 @@ extern class Frame extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract PosType(String) from String to String {
+enum abstract PosType(String) from String to String {
 	var Absolute = "absolute";
 	var Relative = "relative";
 }
@@ -313,7 +313,7 @@ extern class Frame extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract HPosType(String) from String to String {
+enum abstract HPosType(String) from String to String {
 	var Absolute = "absolute";
 	var Left = "left";
 	var Center = "center";
@@ -327,7 +327,7 @@ extern class Frame extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract VPosType(String) from String to String {
+enum abstract VPosType(String) from String to String {
 	var Absolute = "absolute";
 	var Top = "top";
 	var Center = "center";
@@ -341,7 +341,7 @@ extern class Frame extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract HPosRelType(String) from String to String {
+enum abstract HPosRelType(String) from String to String {
 	var Margin = "margin";
 	var Page = "page";
 	var Column = "column";
@@ -357,7 +357,7 @@ extern class Frame extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract VPosRelType(String) from String to String {
+enum abstract VPosRelType(String) from String to String {
 	var Margin = "margin";
 	var Page = "page";
 	var Text = "text";
@@ -373,7 +373,7 @@ extern class Frame extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract WrapType(String) from String to String {
+enum abstract WrapType(String) from String to String {
 	var Inline = "inline";
 	var Square = "square";
 	var Tight = "tight";

diff --git a/src/php/phpoffice/phpword/style/Paragraph.hx b/src/php/phpoffice/phpword/style/Paragraph.hx
@@ -405,7 +405,7 @@ extern class Paragraph extends Border {
 	public function setSuppressAutoHyphens(suppressAutoHyphens:Bool):Void;
 }
 
-@:enum abstract TextAlignment(String) from String to String {
+enum abstract TextAlignment(String) from String to String {
 	// Align Text at Top
 	var Top = "top";
 	// Align Text at Center

diff --git a/src/php/phpoffice/phpword/style/Section.hx b/src/php/phpoffice/phpword/style/Section.hx
@@ -300,7 +300,7 @@ extern class Section extends Border {
  *
  * @const string
  */
-@:enum abstract Orientation(String) from String to String {
+enum abstract Orientation(String) from String to String {
 	var Portrait = "portrait";
 	var Landscape = "landscape";
 }
diff --git a/src/php/phpoffice/phpword/style/Tab.hx b/src/php/phpoffice/phpword/style/Tab.hx
@@ -67,7 +67,7 @@ extern class Tab extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract TabStopType(String) from String to String {
+enum abstract TabStopType(String) from String to String {
 	var Clear = "clear";
 	var Left = "left";
 	var Center = "center";
@@ -82,7 +82,7 @@ extern class Tab extends AbstractStyle {
  *
  * @const string
  */
-@:enum abstract TabLeaderType(String) from String to String {
+enum abstract TabLeaderType(String) from String to String {
 	var None = "none";
 	var Dot = "dot";
 	var Hyphen = "hyphen";