Skip to content

Commit 4aa7f77

Browse files
committed
PHP 8.4 Support: Add PHP 8.4 to the PhpVersion
- apache#8035 - https://wiki.php.net/rfc#php_84 - https://wiki.php.net/todo/php84 - Add PHP 8.4 - Fix the available periods
1 parent b9ac871 commit 4aa7f77

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

php/php.api.phpmodule/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Manifest-Version: 1.0
22
OpenIDE-Module: org.netbeans.modules.php.api.phpmodule
33
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/phpmodule/resources/Bundle.properties
4-
OpenIDE-Module-Specification-Version: 2.99
4+
OpenIDE-Module-Specification-Version: 2.100

php/php.api.phpmodule/nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
is.autoload=true
18-
javac.source=1.8
18+
javac.release=17
1919
javac.compilerargs=-Xlint -Xlint:-serial
2020

2121
test.config.stableBTD.includes=**/*Test.class

php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"PhpVersion.PHP_81=PHP 8.1",
4141
"PhpVersion.PHP_82=PHP 8.2",
4242
"PhpVersion.PHP_83=PHP 8.3",
43+
"PhpVersion.PHP_84=PHP 8.4",
4344
})
4445
public enum PhpVersion {
4546

@@ -109,6 +110,11 @@ public enum PhpVersion {
109110
* @since 2.93
110111
*/
111112
PHP_83(Bundle.PhpVersion_PHP_83()),
113+
/**
114+
* PHP 8.4.
115+
* @since 2.100
116+
*/
117+
PHP_84(Bundle.PhpVersion_PHP_84()),
112118
;
113119

114120
private final String displayName;
@@ -310,9 +316,10 @@ private enum Period {
310316
PHP_73(LocalDate.of(2018, 12, 6), LocalDate.of(2020, 12, 6), LocalDate.of(2021, 12, 6)),
311317
PHP_74(LocalDate.of(2019, 11, 28), LocalDate.of(2021, 11, 28), LocalDate.of(2022, 11, 28)),
312318
PHP_80(LocalDate.of(2020, 11, 26), LocalDate.of(2022, 11, 26), LocalDate.of(2023, 11, 26)),
313-
PHP_81(LocalDate.of(2021, 11, 25), LocalDate.of(2023, 11, 25), LocalDate.of(2024, 11, 25)),
314-
PHP_82(LocalDate.of(2022, 12, 8), LocalDate.of(2024, 12, 8), LocalDate.of(2025, 12, 8)),
315-
PHP_83(LocalDate.of(2023, 11, 23), LocalDate.of(2025, 11, 23), LocalDate.of(2026, 11, 23)),
319+
PHP_81(LocalDate.of(2021, 11, 25), LocalDate.of(2023, 11, 25), LocalDate.of(2025, 12, 31)),
320+
PHP_82(LocalDate.of(2022, 12, 8), LocalDate.of(2024, 12, 31), LocalDate.of(2026, 12, 31)),
321+
PHP_83(LocalDate.of(2023, 11, 23), LocalDate.of(2025, 12, 31), LocalDate.of(2027, 12, 31)),
322+
PHP_84(LocalDate.of(2024, 11, 21), LocalDate.of(2026, 12, 31), LocalDate.of(2028, 12, 31)),
316323
;
317324

318325
private final LocalDate initialRelease;

php/php.editor/nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ javac.source=1.8
1818
javac.compilerargs=-Xlint -Xlint:-serial
1919
nbjavac.ignore.missing.enclosing=**/CUP$ASTPHP5Parser$actions.class
2020
nbm.needs.restart=true
21-
spec.version.base=2.42.0
21+
spec.version.base=2.43.0
2222
release.external/predefined_vars-1.0.zip=docs/predefined_vars.zip
2323
sigtest.gen.fail.on.error=false
2424

php/php.editor/nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
<build-prerequisite/>
305305
<compile-dependency/>
306306
<run-dependency>
307-
<specification-version>2.95</specification-version>
307+
<specification-version>2.100</specification-version>
308308
</run-dependency>
309309
</dependency>
310310
<dependency>

php/php.project/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
AutoUpdate-Show-In-Client: false
3-
OpenIDE-Module-Specification-Version: 2.170
3+
OpenIDE-Module-Specification-Version: 2.171
44
OpenIDE-Module: org.netbeans.modules.php.project
55
OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
66
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties

php/php.project/nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
<build-prerequisite/>
285285
<compile-dependency/>
286286
<run-dependency>
287-
<specification-version>2.93</specification-version>
287+
<specification-version>2.100</specification-version>
288288
</run-dependency>
289289
</dependency>
290290
<dependency>

0 commit comments

Comments
 (0)