Skip to content

Commit 8332ed8

Browse files
henderkeshenderkes
authored
Merge branch 'main' into frankenphp/mbed
2 parents ed4978b + 7402fbf commit 8332ed8

37 files changed

+1252
-131
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
key: php-dependencies-${{ matrix.os }}
176176

177177
- name: "Install Dependencies"
178-
run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
178+
run: composer update -vvv --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-plugins
179179

180180
- name: "Run Build Tests (doctor)"
181181
run: php src/globals/test-extensions.php doctor_cmd ${{ matrix.os }} ${{ matrix.php }}

‎config/env.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
6565
; upx executable path
6666
UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
6767
; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
68-
SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static
68+
SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static,win32_api
6969

7070
[linux]
7171
; Linux can use different build toolchains.

‎config/ext.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,18 @@
756756
"apcu"
757757
]
758758
},
759+
"snmp": {
760+
"support": {
761+
"Windows": "wip",
762+
"BSD": "wip"
763+
},
764+
"type": "builtin",
765+
"arg-type-unix": "with",
766+
"arg-type-windows": "with",
767+
"lib-depends": [
768+
"net-snmp"
769+
]
770+
},
759771
"soap": {
760772
"support": {
761773
"BSD": "wip"
@@ -988,6 +1000,14 @@
9881000
"type": "builtin",
9891001
"build-with-php": true
9901002
},
1003+
"trader": {
1004+
"support": {
1005+
"BSD": "wip",
1006+
"Windows": "wip"
1007+
},
1008+
"type": "external",
1009+
"source": "ext-trader"
1010+
},
9911011
"uuid": {
9921012
"support": {
9931013
"Windows": "wip",

‎config/lib.json‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,13 +507,16 @@
507507
},
508508
"librdkafka": {
509509
"source": "librdkafka",
510-
"static-libs-unix": [
511-
"librdkafka.a",
512-
"librdkafka++.a",
513-
"librdkafka-static.a"
510+
"pkg-configs": [
511+
"rdkafka++-static",
512+
"rdkafka-static"
514513
],
515514
"cpp-library": true,
516515
"lib-suggests": [
516+
"curl",
517+
"liblz4",
518+
"openssl",
519+
"zlib",
517520
"zstd"
518521
]
519522
},
@@ -608,8 +611,8 @@
608611
},
609612
"libxml2": {
610613
"source": "libxml2",
611-
"static-libs-unix": [
612-
"libxml2.a"
614+
"pkg-configs": [
615+
"libxml-2.0"
613616
],
614617
"static-libs-windows": [
615618
"libxml2s.lib",
@@ -698,6 +701,17 @@
698701
"libncurses.a"
699702
]
700703
},
704+
"net-snmp": {
705+
"source": "net-snmp",
706+
"pkg-configs": [
707+
"netsnmp",
708+
"netsnmp-agent"
709+
],
710+
"lib-depends": [
711+
"openssl",
712+
"zlib"
713+
]
714+
},
701715
"nghttp2": {
702716
"source": "nghttp2",
703717
"static-libs-unix": [

‎config/source.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,16 @@
233233
"path": "LICENSE"
234234
}
235235
},
236+
"ext-trader": {
237+
"type": "url",
238+
"url": "https://pecl.php.net/get/trader",
239+
"path": "php-src/ext/trader",
240+
"filename": "trader.tgz",
241+
"license": {
242+
"type": "file",
243+
"path": "LICENSE"
244+
}
245+
},
236246
"ext-uuid": {
237247
"type": "url",
238248
"url": "https://pecl.php.net/get/uuid",
@@ -772,7 +782,7 @@
772782
"micro": {
773783
"type": "git",
774784
"path": "php-src/sapi/micro",
775-
"rev": "php-85-win",
785+
"rev": "master",
776786
"url": "https://github.com/static-php/phpmicro",
777787
"license": {
778788
"type": "file",
@@ -820,6 +830,14 @@
820830
"path": "COPYING"
821831
}
822832
},
833+
"net-snmp": {
834+
"type": "ghtagtar",
835+
"repo": "net-snmp/net-snmp",
836+
"license": {
837+
"type": "file",
838+
"path": "COPYING"
839+
}
840+
},
823841
"nghttp2": {
824842
"type": "ghrel",
825843
"repo": "nghttp2/nghttp2",

‎docs/.vitepress/components/CliGenerator.vue‎

Lines changed: 166 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -744,10 +744,26 @@ h2 {
744744
}
745745
746746
select {
747-
border-radius: 4px;
747+
border-radius: 8px;
748748
border: 1px solid var(--vp-c-divider);
749-
padding: 0 4px;
749+
padding: 8px 12px;
750750
width: 300px;
751+
background-color: var(--vp-c-bg-soft);
752+
color: var(--vp-c-text-1);
753+
font-size: 14px;
754+
transition: all 0.2s ease;
755+
cursor: pointer;
756+
outline: none;
757+
}
758+
759+
select:hover {
760+
border-color: var(--vp-c-brand-1);
761+
background-color: var(--vp-c-bg);
762+
}
763+
764+
select:focus {
765+
border-color: var(--vp-c-brand-1);
766+
box-shadow: 0 0 0 3px var(--vp-c-brand-soft);
751767
}
752768
753769
.my-btn {
@@ -781,17 +797,160 @@ select {
781797
782798
.textarea {
783799
border: 1px solid var(--vp-c-divider);
784-
border-radius: 4px;
785-
width: calc(100% - 12px);
786-
padding: 4px 8px;
800+
border-radius: 8px;
801+
width: calc(100% - 24px);
802+
padding: 12px;
803+
background-color: var(--vp-c-bg-soft);
804+
color: var(--vp-c-text-1);
805+
font-size: 14px;
806+
font-family: var(--vp-font-family-mono);
807+
line-height: 1.5;
808+
transition: all 0.2s ease;
809+
outline: none;
810+
resize: vertical;
811+
}
812+
813+
.textarea:hover {
814+
border-color: var(--vp-c-brand-1);
815+
background-color: var(--vp-c-bg);
816+
}
817+
818+
.textarea:focus {
819+
border-color: var(--vp-c-brand-1);
820+
box-shadow: 0 0 0 3px var(--vp-c-brand-soft);
787821
}
788822
789823
.input {
790824
display: block;
791825
border: 1px solid var(--vp-c-divider);
792-
border-radius: 4px;
826+
border-radius: 8px;
793827
width: 100%;
794-
padding: 4px 8px;
828+
padding: 10px 12px;
829+
background-color: var(--vp-c-bg-soft);
830+
color: var(--vp-c-text-1);
831+
font-size: 14px;
832+
transition: all 0.2s ease;
833+
outline: none;
834+
box-sizing: border-box;
835+
}
836+
837+
.input:hover {
838+
border-color: var(--vp-c-brand-1);
839+
background-color: var(--vp-c-bg);
840+
}
841+
842+
.input:focus {
843+
border-color: var(--vp-c-brand-1);
844+
box-shadow: 0 0 0 3px var(--vp-c-brand-soft);
845+
}
846+
847+
/* Radio button styles */
848+
input[type="radio"] {
849+
appearance: none;
850+
width: 18px;
851+
height: 18px;
852+
border: 2px solid var(--vp-c-border);
853+
border-radius: 50%;
854+
background-color: var(--vp-c-bg);
855+
cursor: pointer;
856+
position: relative;
857+
vertical-align: middle;
858+
margin-right: 6px;
859+
transition: all 0.2s ease;
860+
}
861+
862+
input[type="radio"]:hover {
863+
border-color: var(--vp-c-brand-1);
864+
background-color: var(--vp-c-bg-soft);
865+
}
866+
867+
input[type="radio"]:checked {
868+
border-color: var(--vp-c-brand-1);
869+
background-color: var(--vp-c-brand-1);
870+
}
871+
872+
input[type="radio"]:checked::after {
873+
content: '';
874+
position: absolute;
875+
top: 50%;
876+
left: 50%;
877+
transform: translate(-50%, -50%);
878+
width: 8px;
879+
height: 8px;
880+
border-radius: 50%;
881+
background-color: var(--vp-c-bg);
882+
}
883+
884+
input[type="radio"]:disabled {
885+
opacity: 0.5;
886+
cursor: not-allowed;
887+
}
888+
889+
/* Checkbox styles */
890+
input[type="checkbox"] {
891+
appearance: none;
892+
width: 18px;
893+
height: 18px;
894+
border: 2px solid var(--vp-c-border);
895+
border-radius: 4px;
896+
background-color: var(--vp-c-bg);
897+
cursor: pointer;
898+
position: relative;
899+
vertical-align: middle;
900+
margin-right: 6px;
901+
transition: all 0.2s ease;
902+
}
903+
904+
input[type="checkbox"]:hover {
905+
border-color: var(--vp-c-brand-1);
906+
background-color: var(--vp-c-bg-soft);
907+
}
908+
909+
input[type="checkbox"]:checked {
910+
border-color: var(--vp-c-brand-1);
911+
background-color: var(--vp-c-brand-1);
912+
}
913+
914+
input[type="checkbox"]:checked::after {
915+
content: '';
916+
position: absolute;
917+
top: 2px;
918+
left: 5px;
919+
width: 4px;
920+
height: 8px;
921+
border: solid var(--vp-c-bg);
922+
border-width: 0 2px 2px 0;
923+
transform: rotate(45deg);
924+
}
925+
926+
input[type="checkbox"]:disabled {
927+
opacity: 0.5;
928+
cursor: not-allowed;
929+
}
930+
931+
/* Label styles */
932+
label {
933+
cursor: pointer;
934+
user-select: none;
935+
color: var(--vp-c-text-1);
936+
font-size: 14px;
937+
line-height: 1.5;
938+
transition: color 0.2s ease;
939+
}
940+
941+
label:hover {
942+
color: var(--vp-c-brand-1);
943+
}
944+
945+
input[type="radio"]:disabled + label,
946+
input[type="checkbox"]:disabled + label {
947+
opacity: 0.5;
948+
cursor: not-allowed;
949+
}
950+
951+
input[type="radio"]:disabled + label:hover,
952+
input[type="checkbox"]:disabled + label:hover {
953+
color: var(--vp-c-text-1);
795954
}
796955
797956
.command-container {

0 commit comments

Comments
 (0)