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
jhorvath · Jan 10, 2025 · 9088e99 · 9088e99
1 parent a0e2838
commit 9088e99
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/php/php.api.phpmodule/manifest.mf b/php/php.api.phpmodule/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.api.phpmodule
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/phpmodule/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.99
+OpenIDE-Module-Specification-Version: 2.100
diff --git a/php/php.api.phpmodule/nbproject/project.properties b/php/php.api.phpmodule/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 is.autoload=true
-javac.source=1.8
+javac.release=17
 javac.compilerargs=-Xlint -Xlint:-serial
 
 test.config.stableBTD.includes=**/*Test.class

diff --git a/php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java b/php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java
@@ -40,6 +40,7 @@
     "PhpVersion.PHP_81=PHP 8.1",
     "PhpVersion.PHP_82=PHP 8.2",
     "PhpVersion.PHP_83=PHP 8.3",
+    "PhpVersion.PHP_84=PHP 8.4",
 })
 public enum PhpVersion {
 
@@ -109,6 +110,11 @@ public enum PhpVersion {
      * @since 2.93
      */
     PHP_83(Bundle.PhpVersion_PHP_83()),
+    /**
+     * PHP 8.4.
+     * @since 2.100
+     */
+    PHP_84(Bundle.PhpVersion_PHP_84()),
     ;
 
     private final String displayName;
@@ -310,9 +316,10 @@ private enum Period {
         PHP_73(LocalDate.of(2018, 12, 6), LocalDate.of(2020, 12, 6), LocalDate.of(2021, 12, 6)),
         PHP_74(LocalDate.of(2019, 11, 28), LocalDate.of(2021, 11, 28), LocalDate.of(2022, 11, 28)),
         PHP_80(LocalDate.of(2020, 11, 26), LocalDate.of(2022, 11, 26), LocalDate.of(2023, 11, 26)),
-        PHP_81(LocalDate.of(2021, 11, 25), LocalDate.of(2023, 11, 25), LocalDate.of(2024, 11, 25)),
-        PHP_82(LocalDate.of(2022, 12, 8), LocalDate.of(2024, 12, 8), LocalDate.of(2025, 12, 8)),
-        PHP_83(LocalDate.of(2023, 11, 23), LocalDate.of(2025, 11, 23), LocalDate.of(2026, 11, 23)),
+        PHP_81(LocalDate.of(2021, 11, 25), LocalDate.of(2023, 11, 25), LocalDate.of(2025, 12, 31)),
+        PHP_82(LocalDate.of(2022, 12, 8), LocalDate.of(2024, 12, 31), LocalDate.of(2026, 12, 31)),
+        PHP_83(LocalDate.of(2023, 11, 23), LocalDate.of(2025, 12, 31), LocalDate.of(2027, 12, 31)),
+        PHP_84(LocalDate.of(2024, 11, 21), LocalDate.of(2026, 12, 31), LocalDate.of(2028, 12, 31)),
         ;
 
         private final LocalDate initialRelease;

diff --git a/php/php.editor/nbproject/project.properties b/php/php.editor/nbproject/project.properties
@@ -18,7 +18,7 @@ javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 nbjavac.ignore.missing.enclosing=**/CUP$ASTPHP5Parser$actions.class
 nbm.needs.restart=true
-spec.version.base=2.42.0
+spec.version.base=2.43.0
 release.external/predefined_vars-1.0.zip=docs/predefined_vars.zip
 sigtest.gen.fail.on.error=false
 

diff --git a/php/php.editor/nbproject/project.xml b/php/php.editor/nbproject/project.xml
@@ -304,7 +304,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>2.95</specification-version>
+                        <specification-version>2.100</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/php/php.project/manifest.mf b/php/php.project/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.170
+OpenIDE-Module-Specification-Version: 2.171
 OpenIDE-Module: org.netbeans.modules.php.project
 OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties
diff --git a/php/php.project/nbproject/project.xml b/php/php.project/nbproject/project.xml
@@ -284,7 +284,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>2.93</specification-version>
+                        <specification-version>2.100</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>