Update copyright notices, upgrade nixos to 24.05, add PHP 8.4

jbboehr · Sep 28, 2024 · f7defd3 · f7defd3
1 parent 29ab657
commit f7defd3
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
                     - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
         steps:
             -   uses: actions/checkout@v4
 
@@ -54,6 +55,7 @@ jobs:
                     - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
         steps:
             -   uses: actions/checkout@v4
 
@@ -124,9 +126,9 @@ jobs:
                     key: nix-store.nar-${{ runner.os }}-${{ hashFiles('flake.nix', 'flake.lock') }}
                     restore-keys: nix-store.nar-${{ runner.os }}-
 
-            -   uses: cachix/install-nix-action@v25
+            -   uses: cachix/install-nix-action@v27
                 with:
-                    nix_path: nixpkgs=channel:nixos-23.11
+                    nix_path: nixpkgs=channel:nixos-24.05
 
             -   name: Import Nix Store Cache
                 if: "steps.nix-cache.outputs.cache-hit == 'true'"

diff --git a/config.m4 b/config.m4
@@ -1,3 +1,17 @@
+# Copyright (c) anno Domini nostri Jesu Christi MMXXIV John Boehr & contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_include(m4/ax_require_defined.m4)
 m4_include(m4/ax_prepend_flag.m4)

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,23 @@
+# Copyright (c) anno Domini nostri Jesu Christi MMXXIV John Boehr & contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 {
   description = "php-vyrtue";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils = {
       url = "github:numtide/flake-utils";
     };
@@ -26,6 +41,7 @@
   outputs = {
     self,
     nixpkgs,
+    nixpkgs-unstable,
     flake-utils,
     gitignore,
     pre-commit-hooks,
@@ -34,6 +50,7 @@
     flake-utils.lib.eachDefaultSystem (
       system: let
         pkgs = nixpkgs.legacyPackages.${system};
+        pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
         lib = pkgs.lib;
 
         src' = gitignore.lib.gitignoreSource ./.;
@@ -93,9 +110,10 @@
             actionlint.enable = true;
             alejandra.enable = true;
             alejandra.excludes = ["\/vendor\/"];
-            clang-format.enable = true;
-            clang-format.types_or = ["c" "c++"];
-            clang-format.files = "\\.(c|h)$";
+            # I hate formatters
+            #clang-format.enable = true;
+            #clang-format.types_or = ["c" "c++"];
+            #clang-format.files = "\\.(c|h)$";
             markdownlint.enable = true;
             markdownlint.excludes = ["LICENSE\.md"];
             shellcheck.enable = true;
@@ -106,6 +124,7 @@
           php81 = makePackage {php = pkgs.php81;};
           php82 = makePackage {php = pkgs.php82;};
           php83 = makePackage {php = pkgs.php83;};
+          php84 = makePackage {php = pkgs-unstable.php84;};
           php81-debug = makePackage {
             php = pkgs.php81;
             debugSupport = true;
@@ -118,6 +137,10 @@
             php = pkgs.php83;
             debugSupport = true;
           };
+          php84-debug = makePackage {
+            php = pkgs-unstable.php84;
+            debugSupport = true;
+          };
           default = php81;
         };
 
@@ -155,6 +178,8 @@
           php82-debug = makeCheck packages.php82-debug;
           php83 = makeCheck packages.php83;
           php83-debug = makeCheck packages.php83-debug;
+          php84 = makeCheck packages.php84;
+          php84-debug = makeCheck packages.php84-debug;
         };
 
         formatter = pkgs.alejandra;

diff --git a/php_vyrtue.h b/php_vyrtue.h
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/context.c b/src/context.c
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/context.h b/src/context.h
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/debug.c b/src/debug.c
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/extension.c b/src/extension.c
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -96,6 +94,9 @@ static PHP_MSHUTDOWN_FUNCTION(vyrtue)
     return SUCCESS;
 }
 
+const char *PHP_VYRTUE_MOTD =
+    "Think not that I am come to send peace on earth: I came not to send peace, but a sword. Matthew 10:34";
+
 static PHP_MINFO_FUNCTION(vyrtue)
 {
     php_info_print_table_start();
@@ -139,6 +140,10 @@ static PHP_MINFO_FUNCTION(vyrtue)
     ZEND_HASH_FOREACH_END();
 
     php_info_print_table_end();
+
+    php_info_print_box_start(0);
+    PUTS(PHP_VYRTUE_MOTD);
+    php_info_print_box_end();
 }
 
 static PHP_GINIT_FUNCTION(vyrtue)

diff --git a/src/private.h b/src/private.h
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/process.c b/src/process.c
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/visitor.c b/src/visitor.c
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

diff --git a/src/visitor.h b/src/visitor.h
@@ -1,7 +1,5 @@
 /**
- * Copyright (C) 2024 John Boehr & contributors
- *
- * This file is part of php-vyrtue.
+ * Copyright (c) anno Domini nostri Jesu Christi MMXVI-MMXXIV John Boehr & contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by