Merge branch 'master' into 4.X

tohenk · tohenk · commit 4e326571371a · 2025-09-04T08:15:37.000+07:00
# Conflicts:
#	composer.json

Signed-off-by: Toha &lt;tohenk@yahoo.com&gt;
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -17,8 +17,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This is an exporter to convert [MySQL Workbench](http://www.mysql.com/products/w
 
 ## Prerequisites
 
-  * PHP 7.2+
+  * PHP 7.4+
   * Composer to install the dependencies
 
 ## Installation
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 		}
 	],
 	"require" : {
-		"php" : ">=7.2",
+		"php" : ">=7.4",
 		"mysql-workbench-schema-exporter/mysql-workbench-schema-exporter": "^4.1",
 		"ntlab/php-obj": "^1.0"
 	},
diff --git a/lib/Annotation/Configuration/AnnotationPrefix.php b/lib/Annotation/Configuration/AnnotationPrefix.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/BehavioralExtension.php b/lib/Annotation/Configuration/BehavioralExtension.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/ClassExtend.php b/lib/Annotation/Configuration/ClassExtend.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/EntityExtend.php b/lib/Annotation/Configuration/EntityExtend.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/EntityExtendDiscriminator.php b/lib/Annotation/Configuration/EntityExtendDiscriminator.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/EntitySerialize.php b/lib/Annotation/Configuration/EntitySerialize.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/GetterSetterSkip.php b/lib/Annotation/Configuration/GetterSetterSkip.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/IdentifierQuotingStrategy.php b/lib/Annotation/Configuration/IdentifierQuotingStrategy.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/Typehint.php b/lib/Annotation/Configuration/Typehint.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/TypehintArgument.php b/lib/Annotation/Configuration/TypehintArgument.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/TypehintReturnValue.php b/lib/Annotation/Configuration/TypehintReturnValue.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Configuration/TypehintSkip.php b/lib/Annotation/Configuration/TypehintSkip.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/DatatypeConverter.php b/lib/Annotation/DatatypeConverter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Formatter.php b/lib/Annotation/Formatter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Model/Column.php b/lib/Annotation/Model/Column.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Annotation/Model/Table.php b/lib/Annotation/Model/Table.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/AutomaticRepository.php b/lib/Configuration/AutomaticRepository.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/BundleNamespace.php b/lib/Configuration/BundleNamespace.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/Cascade.php b/lib/Configuration/Cascade.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/ColumnWithRelationSkip.php b/lib/Configuration/ColumnWithRelationSkip.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/EntityNamespace.php b/lib/Configuration/EntityNamespace.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/GeneratedValueStrategy.php b/lib/Configuration/GeneratedValueStrategy.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/NullableAttribute.php b/lib/Configuration/NullableAttribute.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/RelatedVarName.php b/lib/Configuration/RelatedVarName.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/RepositoryNamespace.php b/lib/Configuration/RepositoryNamespace.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Configuration/TableNamePrefix.php b/lib/Configuration/TableNamePrefix.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/DatatypeConverter.php b/lib/DatatypeConverter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Formatter.php b/lib/Formatter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Column.php b/lib/Model/Column.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Table.php b/lib/Model/Table.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Yaml/Configuration/TableNameExtend.php b/lib/Yaml/Configuration/TableNameExtend.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Yaml/DatatypeConverter.php b/lib/Yaml/DatatypeConverter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Yaml/Formatter.php b/lib/Yaml/Formatter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Yaml/Model/Column.php b/lib/Yaml/Model/Column.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Yaml/Model/Table.php b/lib/Yaml/Model/Table.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/ZF2InputFilterAnnotation/Configuration/EntityArrayCopy.php b/lib/ZF2InputFilterAnnotation/Configuration/EntityArrayCopy.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/ZF2InputFilterAnnotation/Configuration/EntityPopulate.php b/lib/ZF2InputFilterAnnotation/Configuration/EntityPopulate.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2023-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2023-2025 Toha <tohenk@yahoo.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/ZF2InputFilterAnnotation/DatatypeConverter.php b/lib/ZF2InputFilterAnnotation/DatatypeConverter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  * Copyright (c) 2013 WitteStier <development@wittestier.nl>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/lib/ZF2InputFilterAnnotation/Formatter.php b/lib/ZF2InputFilterAnnotation/Formatter.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  * Copyright (c) 2013 WitteStier <development@wittestier.nl>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/lib/ZF2InputFilterAnnotation/Model/Table.php b/lib/ZF2InputFilterAnnotation/Model/Table.php
@@ -4,7 +4,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Johannes Mueller <circus2(at)web.de>
- * Copyright (c) 2012-2024 Toha <tohenk@yahoo.com>
+ * Copyright (c) 2012-2025 Toha <tohenk@yahoo.com>
  * Copyright (c) 2013 WitteStier <development@wittestier.nl>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`}`
`27`	`27`	`],`
`28`	`28`	`"require" : {`
`29`		`- "php" : ">=7.2",`
	`29`	`+ "php" : ">=7.4",`
`30`	`30`	`"mysql-workbench-schema-exporter/mysql-workbench-schema-exporter": "^4.1",`
`31`	`31`	`"ntlab/php-obj": "^1.0"`
`32`	`32`	`},`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/*`
`4`	`4`	`* The MIT License`
`5`	`5`	`*`
`6`		`- * Copyright (c) 2023-2024 Toha <[email protected]>`
	`6`	`+ * Copyright (c) 2023-2025 Toha <[email protected]>`
`7`	`7`	`*`
`8`	`8`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`9`	`9`	`* of this software and associated documentation files (the "Software"), to deal`