From 7b238eede1be47d048acc6caa918e002215566ec Mon Sep 17 00:00:00 2001
From: Dirk Stolle <striezel-dev@web.de>
Date: Wed, 28 Sep 2022 21:05:56 +0200
Subject: [PATCH] attempt to fix errors related to `clap`

This should fix the errors from the build at
<https://github.com/davidcole1340/ext-php-rs/actions/runs/3145521955/jobs/5112909446>:

       Compiling clap v4.0.0
    error: Unknown `#[clap(long)]` attribute (`#[arg(long)] exists)
      --> crates/cli/src/lib.rs:92:12
       |
    92 |     #[clap(long)]
       |            ^^^^

    error: Unknown `#[clap(long)]` attribute (`#[arg(long)] exists)
       --> crates/cli/src/lib.rs:115:12
        |
    115 |     #[clap(long)]
        |            ^^^^

    error: Unknown `#[clap(short)]` attribute (`#[arg(short)] exists)
       --> crates/cli/src/lib.rs:134:12
        |
    134 |     #[clap(short, long)]
        |            ^^^^^

    error: could not compile `cargo-php` due to 3 previous errors
    warning: build failed, waiting for other jobs to finish...
    Error: Process completed with exit code 101.

These errors were probably caused by the release of `clap` 4.0.0
a few hours ago.
---
 crates/cli/src/lib.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
index dba7f0a2e0..639a7d995b 100644
--- a/crates/cli/src/lib.rs
+++ b/crates/cli/src/lib.rs
@@ -89,21 +89,21 @@ enum Args {
 struct Install {
     /// Changes the path that the extension is copied to. This will not
     /// activate the extension unless `ini_path` is also passed.
-    #[clap(long)]
+    #[arg(long)]
     install_dir: Option<PathBuf>,
     /// Path to the `php.ini` file to update with the new extension.
-    #[clap(long)]
+    #[arg(long)]
     ini_path: Option<PathBuf>,
     /// Installs the extension but doesn't enable the extension in the `php.ini`
     /// file.
-    #[clap(long)]
+    #[arg(long)]
     disable: bool,
     /// Whether to install the release version of the extension.
-    #[clap(long)]
+    #[arg(long)]
     release: bool,
     /// Path to the Cargo manifest of the extension. Defaults to the manifest in
     /// the directory the command is called.
-    #[clap(long)]
+    #[arg(long)]
     manifest: Option<PathBuf>,
 }
 
@@ -112,14 +112,14 @@ struct Remove {
     /// Changes the path that the extension will be removed from. This will not
     /// remove the extension from a configuration file unless `ini_path` is also
     /// passed.
-    #[clap(long)]
+    #[arg(long)]
     install_dir: Option<PathBuf>,
     /// Path to the `php.ini` file to remove the extension from.
-    #[clap(long)]
+    #[arg(long)]
     ini_path: Option<PathBuf>,
     /// Path to the Cargo manifest of the extension. Defaults to the manifest in
     /// the directory the command is called.
-    #[clap(long)]
+    #[arg(long)]
     manifest: Option<PathBuf>,
 }
 
@@ -131,18 +131,18 @@ struct Stubs {
     ext: Option<PathBuf>,
     /// Path used to store generated stub file. Defaults to writing to
     /// `<ext-name>.stubs.php` in the current directory.
-    #[clap(short, long)]
+    #[arg(short, long)]
     out: Option<PathBuf>,
     /// Print stubs to stdout rather than write to file. Cannot be used with
     /// `out`.
-    #[clap(long, conflicts_with = "out")]
+    #[arg(long, conflicts_with = "out")]
     stdout: bool,
     /// Path to the Cargo manifest of the extension. Defaults to the manifest in
     /// the directory the command is called.
     ///
     /// This cannot be provided alongside the `ext` option, as that option
     /// provides a direct path to the extension shared library.
-    #[clap(long, conflicts_with = "ext")]
+    #[arg(long, conflicts_with = "ext")]
     manifest: Option<PathBuf>,
 }