From 37437f6061df10668618ac77578111676daf9ccd Mon Sep 17 00:00:00 2001 From: jmjoy Date: Tue, 30 Aug 2022 20:00:34 +0800 Subject: [PATCH 1/5] Update versions. --- examples/hello/Cargo.toml | 6 +++--- examples/http-client/Cargo.toml | 4 ++-- examples/http-server/Cargo.toml | 4 ++-- examples/logging/Cargo.toml | 6 +++--- phper-alloc/Cargo.toml | 6 +++--- phper-build/Cargo.toml | 4 ++-- phper-macros/Cargo.toml | 2 +- phper-sys/Cargo.toml | 2 +- phper-test/Cargo.toml | 4 ++-- phper/Cargo.toml | 12 ++++++------ tests/integration/Cargo.toml | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/hello/Cargo.toml b/examples/hello/Cargo.toml index 6765c1bd..59807806 100644 --- a/examples/hello/Cargo.toml +++ b/examples/hello/Cargo.toml @@ -29,10 +29,10 @@ path = "src/_reexport.rs" crate-type = ["cdylib"] [dependencies] -phper = { version = "0.4.0", path = "../../phper" } +phper = { version = "0.5.0", path = "../../phper" } [dev-dependencies] -phper-test = { version = "0.4.0", path = "../../phper-test" } +phper-test = { version = "0.5.0", path = "../../phper-test" } [build-dependencies] -phper-build = { version = "0.4.0", path = "../../phper-build" } +phper-build = { version = "0.5.0", path = "../../phper-build" } diff --git a/examples/http-client/Cargo.toml b/examples/http-client/Cargo.toml index de5516f9..dabbf1f1 100644 --- a/examples/http-client/Cargo.toml +++ b/examples/http-client/Cargo.toml @@ -32,9 +32,9 @@ crate-type = ["cdylib"] anyhow = "1.0.58" bytes = "1.1.0" indexmap = "1.9.1" -phper = { version = "0.4.0", path = "../../phper" } +phper = { version = "0.5.0", path = "../../phper" } reqwest = { version = "0.11.11", features = ["blocking", "cookies"] } thiserror = "1.0.31" [dev-dependencies] -phper-test = { version = "0.4.0", path = "../../phper-test" } +phper-test = { version = "0.5.0", path = "../../phper-test" } diff --git a/examples/http-server/Cargo.toml b/examples/http-server/Cargo.toml index 5622ff8a..09b97496 100644 --- a/examples/http-server/Cargo.toml +++ b/examples/http-server/Cargo.toml @@ -30,10 +30,10 @@ crate-type = ["cdylib"] [dependencies] hyper = { version = "0.14.20", features = ["http1", "runtime", "server"] } -phper = { version = "0.4.0", path = "../../phper" } +phper = { version = "0.5.0", path = "../../phper" } thiserror = "1.0.31" tokio = { version = "1.19.2", features = ["full"] } [dev-dependencies] -phper-test = { version = "0.4.0", path = "../../phper-test" } +phper-test = { version = "0.5.0", path = "../../phper-test" } reqwest = "0.11.11" diff --git a/examples/logging/Cargo.toml b/examples/logging/Cargo.toml index dbb9ca40..022a8a13 100644 --- a/examples/logging/Cargo.toml +++ b/examples/logging/Cargo.toml @@ -30,10 +30,10 @@ crate-type = ["cdylib"] [dependencies] anyhow = "1.0.58" -phper = { version = "0.4.0", path = "../../phper" } +phper = { version = "0.5.0", path = "../../phper" } [dev-dependencies] -phper-test = { version = "0.4.0", path = "../../phper-test" } +phper-test = { version = "0.5.0", path = "../../phper-test" } [build-dependencies] -phper-build = { version = "0.4.0", path = "../../phper-build" } +phper-build = { version = "0.5.0", path = "../../phper-build" } diff --git a/phper-alloc/Cargo.toml b/phper-alloc/Cargo.toml index 9999f9ec..83f684cf 100644 --- a/phper-alloc/Cargo.toml +++ b/phper-alloc/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "phper-alloc" -version = "0.4.0" +version = "0.5.0" authors = ["jmjoy <918734043@qq.com>"] edition = "2021" rust-version = "1.56" @@ -22,7 +22,7 @@ keywords = ["php", "alloc"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -phper-sys = { version = "0.4.0", path = "../phper-sys" } +phper-sys = { version = "0.5.0", path = "../phper-sys" } [build-dependencies] -phper-build = { version = "0.4.0", path = "../phper-build" } +phper-build = { version = "0.5.0", path = "../phper-build" } diff --git a/phper-build/Cargo.toml b/phper-build/Cargo.toml index 3a39e7da..a1c541f0 100644 --- a/phper-build/Cargo.toml +++ b/phper-build/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "phper-build" -version = "0.4.0" +version = "0.5.0" authors = ["jmjoy <918734043@qq.com>"] edition = "2021" rust-version = "1.56" @@ -22,4 +22,4 @@ keywords = ["php", "binding"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -phper-sys = { version = "0.4.0", path = "../phper-sys" } +phper-sys = { version = "0.5.0", path = "../phper-sys" } diff --git a/phper-macros/Cargo.toml b/phper-macros/Cargo.toml index ea7731cf..221a436d 100644 --- a/phper-macros/Cargo.toml +++ b/phper-macros/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "phper-macros" -version = "0.4.0" +version = "0.5.0" authors = ["jmjoy <918734043@qq.com>"] edition = "2021" rust-version = "1.56" diff --git a/phper-sys/Cargo.toml b/phper-sys/Cargo.toml index 0e1e5cba..b5c6602d 100644 --- a/phper-sys/Cargo.toml +++ b/phper-sys/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "phper-sys" -version = "0.4.0" +version = "0.5.0" authors = ["jmjoy <918734043@qq.com>"] edition = "2021" rust-version = "1.56" diff --git a/phper-test/Cargo.toml b/phper-test/Cargo.toml index 7bb1c058..6601cf47 100644 --- a/phper-test/Cargo.toml +++ b/phper-test/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "phper-test" -version = "0.4.0" +version = "0.5.0" authors = ["jmjoy <918734043@qq.com>"] edition = "2021" rust-version = "1.56" @@ -28,7 +28,7 @@ fpm = ["fastcgi-client", "tokio/full"] fastcgi-client = { version = "0.7.0", optional = true } libc = "0.2.126" once_cell = "1.13.0" -phper-macros = { version = "0.4.0", path = "../phper-macros" } +phper-macros = { version = "0.5.0", path = "../phper-macros" } tempfile = "3.3.0" tokio = { version = "1.19.2", optional = true } diff --git a/phper/Cargo.toml b/phper/Cargo.toml index 58ad2b5a..faedc4e2 100644 --- a/phper/Cargo.toml +++ b/phper/Cargo.toml @@ -10,7 +10,7 @@ [package] name = "phper" -version = "0.4.1" +version = "0.5.0" authors = ["jmjoy <918734043@qq.com>"] edition = "2021" rust-version = "1.56" @@ -30,11 +30,11 @@ dashmap = "5.3.4" derive_more = "0.99.17" indexmap = "1.9.1" once_cell = "1.13.0" -phper-alloc = { version = "0.4.0", path = "../phper-alloc" } -phper-macros = { version = "0.4.0", path = "../phper-macros" } -phper-sys = { version = "0.4.0", path = "../phper-sys" } +phper-alloc = { version = "0.5.0", path = "../phper-alloc" } +phper-macros = { version = "0.5.0", path = "../phper-macros" } +phper-sys = { version = "0.5.0", path = "../phper-sys" } thiserror = "1.0.31" [build-dependencies] -phper-build = { version = "0.4.0", path = "../phper-build" } -phper-sys = { version = "0.4.0", path = "../phper-sys" } +phper-build = { version = "0.5.0", path = "../phper-build" } +phper-sys = { version = "0.5.0", path = "../phper-sys" } diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml index 7a75af64..945ec653 100644 --- a/tests/integration/Cargo.toml +++ b/tests/integration/Cargo.toml @@ -28,7 +28,7 @@ crate-type = ["cdylib"] [dependencies] indexmap = "1.9.1" -phper = { version = "0.4.0", path = "../../phper" } +phper = { version = "0.5.0", path = "../../phper" } [dev-dependencies] -phper-test = { version = "0.4.0", path = "../../phper-test", features = ["fpm"] } +phper-test = { version = "0.5.0", path = "../../phper-test", features = ["fpm"] } From 39ff510ab002d8b000c7eefeb1f1cd8a31086f94 Mon Sep 17 00:00:00 2001 From: jmjoy Date: Tue, 30 Aug 2022 20:06:39 +0800 Subject: [PATCH 2/5] Update authors. --- examples/hello/Cargo.toml | 2 +- examples/http-client/Cargo.toml | 2 +- examples/http-server/Cargo.toml | 2 +- examples/logging/Cargo.toml | 2 +- phper-alloc/Cargo.toml | 2 +- phper-build/Cargo.toml | 2 +- phper-macros/Cargo.toml | 2 +- phper-sys/Cargo.toml | 2 +- phper-test/Cargo.toml | 2 +- phper/Cargo.toml | 2 +- tests/integration/Cargo.toml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/hello/Cargo.toml b/examples/hello/Cargo.toml index 59807806..54e9c2d6 100644 --- a/examples/hello/Cargo.toml +++ b/examples/hello/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "hello" version = "0.0.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" publish = false diff --git a/examples/http-client/Cargo.toml b/examples/http-client/Cargo.toml index dabbf1f1..76d5bf88 100644 --- a/examples/http-client/Cargo.toml +++ b/examples/http-client/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "http-client" version = "0.0.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" publish = false diff --git a/examples/http-server/Cargo.toml b/examples/http-server/Cargo.toml index 09b97496..c2d14f47 100644 --- a/examples/http-server/Cargo.toml +++ b/examples/http-server/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "http-server" version = "0.0.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" publish = false diff --git a/examples/logging/Cargo.toml b/examples/logging/Cargo.toml index 022a8a13..c4a8030d 100644 --- a/examples/logging/Cargo.toml +++ b/examples/logging/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "logging" version = "0.0.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" publish = false diff --git a/phper-alloc/Cargo.toml b/phper-alloc/Cargo.toml index 83f684cf..6f31c279 100644 --- a/phper-alloc/Cargo.toml +++ b/phper-alloc/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "phper-alloc" version = "0.5.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" description = "Alloc related items for phper crate." diff --git a/phper-build/Cargo.toml b/phper-build/Cargo.toml index a1c541f0..e022ce0e 100644 --- a/phper-build/Cargo.toml +++ b/phper-build/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "phper-build" version = "0.5.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" description = "Generates stubs for project using phper." diff --git a/phper-macros/Cargo.toml b/phper-macros/Cargo.toml index 221a436d..81707322 100644 --- a/phper-macros/Cargo.toml +++ b/phper-macros/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "phper-macros" version = "0.5.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" description = "The proc-macros for phper crate." diff --git a/phper-sys/Cargo.toml b/phper-sys/Cargo.toml index b5c6602d..6b749b29 100644 --- a/phper-sys/Cargo.toml +++ b/phper-sys/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "phper-sys" version = "0.5.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" description = "Low level PHP binding for Rust." diff --git a/phper-test/Cargo.toml b/phper-test/Cargo.toml index 6601cf47..979fa720 100644 --- a/phper-test/Cargo.toml +++ b/phper-test/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "phper-test" version = "0.5.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" description = "PHPer testing utilities." diff --git a/phper/Cargo.toml b/phper/Cargo.toml index faedc4e2..62c5e824 100644 --- a/phper/Cargo.toml +++ b/phper/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "phper" version = "0.5.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" description = "The framework that allows us to write PHP extensions using pure and safe Rust whenever possible." diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml index 945ec653..1d79df98 100644 --- a/tests/integration/Cargo.toml +++ b/tests/integration/Cargo.toml @@ -11,7 +11,7 @@ [package] name = "integration" version = "0.0.0" -authors = ["jmjoy <918734043@qq.com>"] +authors = ["PHPER Framework Team", "jmjoy "] edition = "2021" rust-version = "1.56" publish = false From 45b1daa2081f436bcc122e608e65f4c9f1793949 Mon Sep 17 00:00:00 2001 From: jmjoy Date: Tue, 30 Aug 2022 20:10:59 +0800 Subject: [PATCH 3/5] Update license headers. --- .github/workflows/ci.yml | 2 +- .github/workflows/license.yml | 2 +- .github/workflows/publish.yml | 2 +- .licenserc.yaml | 4 ++-- .rustfmt.toml | 2 +- Cargo.toml | 2 +- examples/hello/Cargo.toml | 2 +- examples/hello/build.rs | 2 +- examples/hello/src/_reexport.rs | 2 +- examples/hello/src/lib.rs | 2 +- examples/hello/src/main.rs | 2 +- examples/hello/tests/integration.rs | 2 +- examples/hello/tests/php/test.php | 2 +- examples/http-client/Cargo.toml | 2 +- examples/http-client/src/_reexport.rs | 2 +- examples/http-client/src/client.rs | 2 +- examples/http-client/src/errors.rs | 2 +- examples/http-client/src/lib.rs | 2 +- examples/http-client/src/main.rs | 2 +- examples/http-client/src/request.rs | 2 +- examples/http-client/src/response.rs | 2 +- examples/http-client/src/utils.rs | 2 +- examples/http-client/tests/integration.rs | 2 +- examples/http-client/tests/php/test.php | 2 +- examples/http-server/Cargo.toml | 2 +- examples/http-server/src/_reexport.rs | 2 +- examples/http-server/src/errors.rs | 2 +- examples/http-server/src/lib.rs | 2 +- examples/http-server/src/main.rs | 2 +- examples/http-server/src/request.rs | 2 +- examples/http-server/src/response.rs | 2 +- examples/http-server/src/server.rs | 2 +- examples/http-server/src/utils.rs | 2 +- examples/http-server/tests/integration.rs | 2 +- examples/http-server/tests/php/test.php | 2 +- examples/logging/Cargo.toml | 2 +- examples/logging/src/_reexport.rs | 2 +- examples/logging/src/lib.rs | 2 +- examples/logging/src/main.rs | 2 +- examples/logging/tests/integration.rs | 2 +- examples/logging/tests/php/test_php_deprecated.php | 2 +- examples/logging/tests/php/test_php_error.php | 2 +- examples/logging/tests/php/test_php_notice.php | 2 +- examples/logging/tests/php/test_php_say.php | 2 +- examples/logging/tests/php/test_php_warning.php | 2 +- phper-alloc/Cargo.toml | 2 +- phper-alloc/build.rs | 2 +- phper-alloc/src/lib.rs | 2 +- phper-alloc/src/macros.rs | 2 +- phper-build/Cargo.toml | 2 +- phper-build/src/lib.rs | 2 +- phper-macros/Cargo.toml | 2 +- phper-macros/src/alloc.rs | 2 +- phper-macros/src/derives.rs | 2 +- phper-macros/src/globals.rs | 2 +- phper-macros/src/inner.rs | 2 +- phper-macros/src/lib.rs | 2 +- phper-macros/src/log.rs | 2 +- phper-macros/src/utils.rs | 2 +- phper-macros/tests/integration.rs | 2 +- phper-sys/Cargo.toml | 2 +- phper-sys/build.rs | 2 +- phper-sys/php_wrapper.c | 2 +- phper-sys/src/lib.rs | 2 +- phper-test/Cargo.toml | 2 +- phper-test/etc/php-fpm.conf | 2 +- phper-test/src/cli.rs | 2 +- phper-test/src/context.rs | 2 +- phper-test/src/fpm.rs | 2 +- phper-test/src/lib.rs | 2 +- phper-test/src/utils.rs | 2 +- phper/Cargo.toml | 2 +- phper/build.rs | 2 +- phper/src/arrays.rs | 2 +- phper/src/classes.rs | 2 +- phper/src/cmd.rs | 2 +- phper/src/constants.rs | 2 +- phper/src/errors.rs | 2 +- phper/src/exceptions.rs | 2 +- phper/src/functions.rs | 2 +- phper/src/ini.rs | 2 +- phper/src/lib.rs | 2 +- phper/src/macros.rs | 2 +- phper/src/modules.rs | 2 +- phper/src/objects.rs | 2 +- phper/src/output.rs | 2 +- phper/src/resources.rs | 2 +- phper/src/strings.rs | 2 +- phper/src/types.rs | 2 +- phper/src/utils.rs | 2 +- phper/src/values.rs | 2 +- tests/integration/Cargo.toml | 2 +- tests/integration/src/_reexport.rs | 2 +- tests/integration/src/arguments.rs | 2 +- tests/integration/src/arrays.rs | 2 +- tests/integration/src/classes.rs | 2 +- tests/integration/src/functions.rs | 2 +- tests/integration/src/lib.rs | 2 +- tests/integration/src/main.rs | 2 +- tests/integration/src/objects.rs | 2 +- tests/integration/src/strings.rs | 2 +- tests/integration/src/values.rs | 2 +- tests/integration/tests/integration.rs | 2 +- tests/integration/tests/php/_common.php | 2 +- tests/integration/tests/php/arguments.php | 2 +- tests/integration/tests/php/arrays.php | 2 +- tests/integration/tests/php/classes.php | 2 +- tests/integration/tests/php/functions.php | 2 +- tests/integration/tests/php/objects.php | 2 +- tests/integration/tests/php/strings.php | 2 +- tests/integration/tests/php/values.php | 2 +- 111 files changed, 112 insertions(+), 112 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eafe9750..714c9d2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index f0448bc7..c1db07d0 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 32f75183..f837efaf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/.licenserc.yaml b/.licenserc.yaml index 52721594..6a5a8b78 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: @@ -11,7 +11,7 @@ header: license: spdx-id: MulanPSL-2.0 - copyright-owner: jmjoy + copyright-owner: PHPER Framework Team software-name: PHPER paths-ignore: diff --git a/.rustfmt.toml b/.rustfmt.toml index 1c500095..9d147e0a 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/Cargo.toml b/Cargo.toml index 04d47860..99244c3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/Cargo.toml b/examples/hello/Cargo.toml index 54e9c2d6..c7e1c4ec 100644 --- a/examples/hello/Cargo.toml +++ b/examples/hello/Cargo.toml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 jmjoy +# Copyright (c) 2022 PHPER Framework Team # PHPER is licensed under Mulan PSL v2. # You can use this software according to the terms and conditions of the Mulan # PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/build.rs b/examples/hello/build.rs index aded4a65..190ba756 100644 --- a/examples/hello/build.rs +++ b/examples/hello/build.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2019 jmjoy +// Copyright (c) 2022 PHPER Framework Team // PHPER is licensed under Mulan PSL v2. // You can use this software according to the terms and conditions of the Mulan // PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/src/_reexport.rs b/examples/hello/src/_reexport.rs index 276448b0..6d4c58f1 100644 --- a/examples/hello/src/_reexport.rs +++ b/examples/hello/src/_reexport.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2019 jmjoy +// Copyright (c) 2022 PHPER Framework Team // PHPER is licensed under Mulan PSL v2. // You can use this software according to the terms and conditions of the Mulan // PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/src/lib.rs b/examples/hello/src/lib.rs index b96007bc..4d639ee3 100644 --- a/examples/hello/src/lib.rs +++ b/examples/hello/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2019 jmjoy +// Copyright (c) 2022 PHPER Framework Team // PHPER is licensed under Mulan PSL v2. // You can use this software according to the terms and conditions of the Mulan // PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/src/main.rs b/examples/hello/src/main.rs index 120c00cf..a50043a8 100644 --- a/examples/hello/src/main.rs +++ b/examples/hello/src/main.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2019 jmjoy +// Copyright (c) 2022 PHPER Framework Team // PHPER is licensed under Mulan PSL v2. // You can use this software according to the terms and conditions of the Mulan // PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/tests/integration.rs b/examples/hello/tests/integration.rs index 8fda9955..8c709270 100644 --- a/examples/hello/tests/integration.rs +++ b/examples/hello/tests/integration.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2019 jmjoy +// Copyright (c) 2022 PHPER Framework Team // PHPER is licensed under Mulan PSL v2. // You can use this software according to the terms and conditions of the Mulan // PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/examples/hello/tests/php/test.php b/examples/hello/tests/php/test.php index b60584e8..f6a9d065 100644 --- a/examples/hello/tests/php/test.php +++ b/examples/hello/tests/php/test.php @@ -1,6 +1,6 @@ Date: Tue, 30 Aug 2022 20:24:01 +0800 Subject: [PATCH 4/5] Update README. --- README.md | 10 +++++----- examples/hello/README.md | 2 +- examples/http-client/README.md | 2 +- examples/http-server/README.md | 2 +- examples/logging/README.md | 2 +- phper-alloc/README.md | 2 +- phper-build/README.md | 2 +- phper-macros/README.md | 2 +- phper-sys/README.md | 2 +- phper-test/README.md | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 534f1509..9651dd67 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # PHPER (PHP Enjoy Rust) -[![CI](https://github.com/jmjoy/phper/actions/workflows/ci.yml/badge.svg)](https://github.com/jmjoy/phper/actions/workflows/ci.yml) +[![CI](https://github.com/phper-framework/phper/actions/workflows/ci.yml/badge.svg)](https://github.com/phper-framework/phper/actions/workflows/ci.yml) [![Crates](https://img.shields.io/crates/v/phper)](https://crates.io/crates/phper) [![Docs](https://img.shields.io/docsrs/phper)](https://docs.rs/phper) -[![Lines](https://img.shields.io/tokei/lines/github/jmjoy/phper)](https://github.com/jmjoy/phper) -[![License](https://img.shields.io/crates/l/phper)](https://github.com/jmjoy/phper/blob/master/LICENSE) +[![Lines](https://img.shields.io/tokei/lines/github/phper-framework/phper)](https://github.com/phper-framework/phper) +[![License](https://img.shields.io/crates/l/phper)](https://github.com/phper-framework/phper/blob/master/LICENSE) ## Rust ❤️ PHP @@ -123,8 +123,8 @@ The framework that allows us to write PHP extensions using pure and safe Rust wh ## Examples -See [examples](https://github.com/jmjoy/phper/tree/master/examples). +See [examples](https://github.com/phper-framework/phper/tree/master/examples). ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/examples/hello/README.md b/examples/hello/README.md index 7440b7fd..6716a683 100644 --- a/examples/hello/README.md +++ b/examples/hello/README.md @@ -29,4 +29,4 @@ cargo run --release -- install ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/examples/http-client/README.md b/examples/http-client/README.md index 5c014e78..936e1934 100644 --- a/examples/http-client/README.md +++ b/examples/http-client/README.md @@ -31,4 +31,4 @@ cargo run --release -- install ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/examples/http-server/README.md b/examples/http-server/README.md index bac61dce..af54fab4 100644 --- a/examples/http-server/README.md +++ b/examples/http-server/README.md @@ -31,4 +31,4 @@ cargo run --release -- install ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/examples/logging/README.md b/examples/logging/README.md index 5119af2c..6fca5835 100644 --- a/examples/logging/README.md +++ b/examples/logging/README.md @@ -29,4 +29,4 @@ cargo run --release -- install ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/phper-alloc/README.md b/phper-alloc/README.md index a30c6af1..e557a296 100644 --- a/phper-alloc/README.md +++ b/phper-alloc/README.md @@ -4,4 +4,4 @@ Allocator related items for [phper](https://crates.io/crates/phper). ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/phper-build/README.md b/phper-build/README.md index 01dc18c3..4f565155 100644 --- a/phper-build/README.md +++ b/phper-build/README.md @@ -6,4 +6,4 @@ Add this crate in your `[build-dependencies]` and using in `build.rs`. ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/phper-macros/README.md b/phper-macros/README.md index c69c2ee6..74212b31 100644 --- a/phper-macros/README.md +++ b/phper-macros/README.md @@ -4,4 +4,4 @@ The proc-macros for [phper](https://crates.io/crates/phper). ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/phper-sys/README.md b/phper-sys/README.md index 936350e8..2f54978c 100644 --- a/phper-sys/README.md +++ b/phper-sys/README.md @@ -6,4 +6,4 @@ The php-config is needed. You can set environment `PHP_CONFIG` to specify the pa ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). diff --git a/phper-test/README.md b/phper-test/README.md index e45b8082..066a685a 100644 --- a/phper-test/README.md +++ b/phper-test/README.md @@ -10,8 +10,8 @@ The `php-config` is needed. You can set environment `PHP_CONFIG` to specify the Maybe, when the feature [artifact-dependencies](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies) becomes stable, or the [issue](https://github.com/rust-lang/cargo/issues/8628) be solved, you don't have to call `cargo build` in advance, but I think it will be a long long stage. -1. Or, define an `[[example]]` section, re-export all the symbols of your crate, and set `lto = true`. It's strange, but this is the only method to just run `cargo test` without running `cargo build` in advance. Please refer to [tests/integration/Cargo.toml](https://github.com/jmjoy/phper/blob/master/tests/integration/Cargo.toml). +1. Or, define an `[[example]]` section, re-export all the symbols of your crate, and set `lto = true`. It's strange, but this is the only method to just run `cargo test` without running `cargo build` in advance. Please refer to [tests/integration/Cargo.toml](https://github.com/phper-framework/phper/blob/master/tests/integration/Cargo.toml). ## License -[MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE). +[MulanPSL-2.0](https://github.com/phper-framework/phper/blob/master/LICENSE). From 9b4e64fe69baa6d3ca807303c127b653ba8fe98c Mon Sep 17 00:00:00 2001 From: jmjoy Date: Tue, 30 Aug 2022 22:44:26 +0800 Subject: [PATCH 5/5] Update document. --- .github/workflows/publish.yml | 6 ------ phper-test/src/cli.rs | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f837efaf..241a64a6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,12 +31,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Git config - shell: bash - run: | - git config --global user.email "918734043@qq.com" - git config --global user.name "jmjoy" - - name: Install libclang run: sudo apt-get install -y llvm-10-dev libclang-10-dev diff --git a/phper-test/src/cli.rs b/phper-test/src/cli.rs index da1c9f08..104841f1 100644 --- a/phper-test/src/cli.rs +++ b/phper-test/src/cli.rs @@ -27,7 +27,7 @@ use crate::{context::Context, utils}; /// /// - `scripts` is the path of your php test scripts. /// -/// See [example hello integration test](https://github.com/jmjoy/phper/blob/master/examples/hello/tests/integration.rs). +/// See [example hello integration test](https://github.com/phper-framework/phper/blob/master/examples/hello/tests/integration.rs). pub fn test_php_scripts(exe_path: impl AsRef, scripts: &[&dyn AsRef]) { let condition = |output: Output| output.status.success(); let scripts = scripts @@ -46,7 +46,7 @@ pub fn test_php_scripts(exe_path: impl AsRef, scripts: &[&dyn AsRef] /// /// - `scripts` is the path of your php test scripts. /// -/// See [example hello integration test](https://github.com/jmjoy/phper/blob/master/examples/hello/tests/integration.rs). +/// See [example hello integration test](https://github.com/phper-framework/phper/blob/master/examples/hello/tests/integration.rs). pub fn test_php_scripts_with_lib(lib_path: impl AsRef, scripts: &[&dyn AsRef]) { let condition = |output: Output| output.status.success(); let scripts = scripts @@ -69,7 +69,7 @@ pub type ScriptCondition<'a> = (&'a dyn AsRef, &'a dyn Fn(Output) -> bool) /// - `scripts` is the slice of the tuple, format is `(path of your php test /// script, checker function or closure)`. /// -/// See [example logging integration test](https://github.com/jmjoy/phper/blob/master/examples/logging/tests/integration.rs). +/// See [example logging integration test](https://github.com/phper-framework/phper/blob/master/examples/logging/tests/integration.rs). pub fn test_php_scripts_with_condition( exe_path: impl AsRef, scripts: &[ScriptCondition<'_>], ) {