From 6b4607e4f9b7b28abdffc8f902b7efc398c224ac Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 11 Dec 2025 19:58:17 +0000 Subject: [PATCH 01/26] Small mobile layout tweaks --- public/assets/css/app.css | 2 +- public/assets/css/app.css.br | Bin 1196 -> 1202 bytes public/assets/css/app.css.map | 2 +- public/assets/css/app.css.zst | Bin 1446 -> 1450 bytes resources/css/layout.css | 6 +++- resources/css/notes.css | 58 +++++++++++++++---------------- resources/views/master.blade.php | 4 +-- 7 files changed, 37 insertions(+), 35 deletions(-) diff --git a/public/assets/css/app.css b/public/assets/css/app.css index 2f656e08..18f1f58d 100644 --- a/public/assets/css/app.css +++ b/public/assets/css/app.css @@ -1,2 +1,2 @@ -@layer reset{*,:before,:after{box-sizing:border-box}html{-webkit-text-size-adjust:none;-moz-text-size-adjust:none;text-size-adjust:none}body,h1,h2,h3,h4,p,figure,blockquote,dl,dd{margin-block-end:0}ul[role=list],ol[role=list]{list-style:none}body{line-height:1.5}h1,h2,h3,h4,button,input,label{line-height:1.1}h1,h2,h3,h4{text-wrap:balance}a:not([class]){text-decoration-skip-ink:auto;color:currentColor}img,picture{max-width:100%;display:block}input,button,textarea,select{font-family:inherit;font-size:inherit}textarea:not([rows]){min-height:10em}:target{scroll-margin-block:5ex}@media (prefers-reduced-motion){::view-transition-group(*),::view-transition-old(*),::view-transition-new(*){animation:none!important}}}@layer base{:root{color-scheme:light dark;--primary-hue:307;--clr-text:light-dark(oklch(5% .1 var(--primary-hue)),oklch(100% .1 var(--primary-hue)));--clr-background:light-dark(oklch(100% .1 var(--primary-hue)),oklch(15% .15 var(--primary-hue)));--clr-border:light-dark(oklch(90% .2 var(--primary-hue)),oklch(25% .1 var(--primary-hue)));--clr-snow-fall:light-dark(oklch(25% .15 var(--primary-hue)),oklch(85% .2 var(--primary-hue)))}body{background-color:var(--clr-background);color:var(--clr-text)}:root{--border-radius:8px}html{font-size:125%}body{grid-template-rows:min-content 1fr min-content;grid-template-columns:1fr min(80ch,95vw) 1fr;padding-inline:4vw;display:grid;&>header{grid-column:1/-1}&>main{grid-column:2/3}&>footer{grid-column:1/-1;margin-block-start:2ex;& search form{flex-direction:row;align-items:center;gap:1ex;display:flex}}}.h-feed{flex-direction:column;gap:2ex;display:flex}}@layer components{body>header{grid-template-rows:auto auto;grid-template-columns:auto 1fr auto;align-items:baseline;gap:1rem;display:grid;& a{text-decoration:none}& h1{text-wrap:nowrap;margin:0}& nav{flex-direction:row;gap:.5rem;display:flex;@media screen and (width<=1100px){flex-wrap:wrap;grid-area:2/1/auto/span 3}}}.h-feed{& .note{border:1px solid var(--clr-border);border-radius:var(--border-radius);flex-direction:column;padding:1ex 2ex;display:flex;& .e-content>p:first-child{margin-block-start:0}& .syndication-links{flex-direction:row;gap:1ex;display:flex;& svg{border-radius:4px;width:auto;height:1lh}}}& .reply-to{border:1px solid var(--clr-border);border-top-left-radius:var(--border-radius);border-top-right-radius:var(--border-radius);border-bottom:none;margin-inline:2ex;padding-inline:1ex;font-size:85%}}.pagination{flex-direction:row;justify-content:center;align-items:center;display:flex;& div{flex-direction:row;gap:1ex;display:flex}}#theme-selector{& button{appearance:none;background:0 0;border:none;&:hover{cursor:pointer}}& #theme-selector-dropdown{position-area:block-end span-inline-start;border:2px solid var(--clr-border);background-color:var(--clr-background);color:var(--clr-text);margin:0;position:absolute;& fieldset{border:0;flex-direction:row;gap:1ch;display:flex;& input{display:none}}}@media (prefers-reduced-motion:no-preference){& #theme-selector-dropdown{&:popover-open{opacity:1;transform:translateY(0)scale(1);@starting-style{opacity:0;transform:translateY(30px)scale(0)}}opacity:0;transition:transform,opacity,display allow-discrete,overlay allow-discrete;transform-origin:100% 0;transition-duration:.5s;transform:translateY(0)scale(0)}}}::view-transition-group(changing-theme){animation-duration:1.25s}::view-transition-new(changing-theme),::view-transition-old(changing-theme){mix-blend-mode:normal}::view-transition-new(changing-theme){animation-name:reveal}::view-transition-old(changing-theme){animation:none}@keyframes reveal{0%{clip-path:polygon(-30% 0,-30% 0,-15% 100%,-10% 115%)}to{clip-path:polygon(-30% 0,130% 0,115% 100%,-10% 115%)}}} +@layer reset{*,:before,:after{box-sizing:border-box}html{-webkit-text-size-adjust:none;-moz-text-size-adjust:none;text-size-adjust:none}body,h1,h2,h3,h4,p,figure,blockquote,dl,dd{margin-block-end:0}ul[role=list],ol[role=list]{list-style:none}body{line-height:1.5}h1,h2,h3,h4,button,input,label{line-height:1.1}h1,h2,h3,h4{text-wrap:balance}a:not([class]){text-decoration-skip-ink:auto;color:currentColor}img,picture{max-width:100%;display:block}input,button,textarea,select{font-family:inherit;font-size:inherit}textarea:not([rows]){min-height:10em}:target{scroll-margin-block:5ex}@media (prefers-reduced-motion){::view-transition-group(*),::view-transition-old(*),::view-transition-new(*){animation:none!important}}}@layer base{:root{color-scheme:light dark;--primary-hue:307;--clr-text:light-dark(oklch(5% .1 var(--primary-hue)),oklch(100% .1 var(--primary-hue)));--clr-background:light-dark(oklch(100% .1 var(--primary-hue)),oklch(15% .15 var(--primary-hue)));--clr-border:light-dark(oklch(90% .2 var(--primary-hue)),oklch(25% .1 var(--primary-hue)));--clr-snow-fall:light-dark(oklch(25% .15 var(--primary-hue)),oklch(85% .2 var(--primary-hue)))}body{background-color:var(--clr-background);color:var(--clr-text)}:root{--border-radius:8px}html{font-size:125%}body{grid-template-rows:min-content 1fr min-content;grid-template-columns:1fr min(80ch,80vw) 1fr;padding-inline:4vw;display:grid;&>header{grid-column:1/-1}&>main{grid-column:2/3}&>footer{grid-column:1/-1;margin-block-start:2ex;& search form{flex-direction:row;align-items:center;gap:1ex;display:flex;& input{min-width:0}}}}.h-feed{flex-direction:column;gap:2ex;display:flex}}@layer components{body>header{grid-template-rows:auto auto;grid-template-columns:auto 1fr auto;align-items:baseline;gap:1rem;display:grid;& a{text-decoration:none}& h1{text-wrap:nowrap;margin:0}& nav{flex-direction:row;gap:.5rem;display:flex;@media screen and (width<=1100px){flex-wrap:wrap;grid-area:2/1/auto/span 3}}}.note{border:1px solid var(--clr-border);border-radius:var(--border-radius);flex-direction:column;padding:1ex 2ex;display:flex;& .e-content>p:first-child{margin-block-start:0}& .syndication-links{flex-direction:row;gap:1ex;display:flex;& svg{border-radius:4px;width:auto;height:1lh}}}.reply-to{border:1px solid var(--clr-border);border-top-left-radius:var(--border-radius);border-top-right-radius:var(--border-radius);border-bottom:none;margin-inline:2ex;padding-inline:1ex;font-size:85%}.pagination{flex-direction:row;justify-content:center;align-items:center;display:flex;& div{flex-direction:row;gap:1ex;display:flex}}#theme-selector{& button{appearance:none;background:0 0;border:none;&:hover{cursor:pointer}}& #theme-selector-dropdown{position-area:block-end span-inline-start;border:2px solid var(--clr-border);background-color:var(--clr-background);color:var(--clr-text);margin:0;position:absolute;& fieldset{border:0;flex-direction:row;gap:1ch;display:flex;& input{display:none}}}@media (prefers-reduced-motion:no-preference){& #theme-selector-dropdown{&:popover-open{opacity:1;transform:translateY(0)scale(1);@starting-style{opacity:0;transform:translateY(30px)scale(0)}}opacity:0;transition:transform,opacity,display allow-discrete,overlay allow-discrete;transform-origin:100% 0;transition-duration:.5s;transform:translateY(0)scale(0)}}}::view-transition-group(changing-theme){animation-duration:1.25s}::view-transition-new(changing-theme),::view-transition-old(changing-theme){mix-blend-mode:normal}::view-transition-new(changing-theme){animation-name:reveal}::view-transition-old(changing-theme){animation:none}@keyframes reveal{0%{clip-path:polygon(-30% 0,-30% 0,-15% 100%,-10% 115%)}to{clip-path:polygon(-30% 0,130% 0,115% 100%,-10% 115%)}}} /*# sourceMappingURL=/assets/css/app.css.map */ diff --git a/public/assets/css/app.css.br b/public/assets/css/app.css.br index 285d0f59050f05a157f555631a9cd020ee341c04..74dedb608c0fbcc8d358975837e331b87128e37d 100644 GIT binary patch literal 1202 zcmX?DP|EPYV?*+Uw+geY%bc!g7vRZ3qwy#<{H!vfP>2`%b-*Sz2@yn&ocrMh{ zDaziu!f}(7gwcARt+TI9lQ_8HG_&276+gH9JTLb3TMlP?$e;d2#YcQrZ}m0#=B}o_ zvviTIHq)j>JJ)-#9yVDv^Yp%`3E{pmYpeQR{#UQI2%2;|bb&*#L7SwiKxM{+&Wh%B zl5*Sk3ib4FS-Wn*jdga0<-y+~x#or)+R^!Aww>hM;^#si;}5I4Zg&iwl$l`NCg`8t zAJ}Gc@|;@2AswCCe+!T1CxU+ev#33zb76tx*_K=9ToQS|HD7$%IPaS!1M6>g9`*j#x*~?NY5N!MIr`y$ z<{b006Qy!KJ2lHPY6w#Vc)mkhlWNUIa?oU2hZt-ESEO=9a@&(qrb*rOM0Ag)je?+UY;H4(vzH*Tz4qj(J0FH zKu9Tm$`ji{i|-~g+Dv~rPxF3$Wsl^G<_SO7J&?$}QryGM)u%pfuKdSKtI}Ik16Q>C z@JME8`Few0W?$-}SM$_=U2$yiaGce-!)=qZMuErjy&-!im)U$?(Ed~U#?=PpqC)?Z zwt?mXeM=l~`MsSecI#oyTo(Q4i>zn-4b>O5RyAz-+T!ZTA5^jYh+9B!i;vm14qq-^0V5Q%l;0;n=zA!kqBs^F$sl#IC10nHK+73U~ ziYRYpGF#xBN%(x9uI-?h#P-Y<%vs;;Xw_*iU8vma$bV literal 1196 zcmX?TP|A?7*JM00hv?cRGjv^YKJs!4(utz&z*w?*osdY1ofXRbuuKAK$rbW>22`>n}}3X-#K zcd1xBGSrRvcGYFiDetYha+m+>e=As)wq1LHL-CEA>PZgAoLzlV%3nlHIJ?8B>Eq<% zuegqyeeGN_J8{1A!pUwD<%ac(#TOgP#T@#-dWp(=vlU(&BqYsm3!cAiz;$v$%FUas zYHJo6#XP+{caGn3@g)Hh>Ns^fOocfg^PNz1RJiY%eoMt(f$wcrg0!Aw9Vhz__2iZR zD&{B(3T9mBVVb;6I5^@^oxo0;3zrr7HEzg9%x60Lb~5{{#Qn$j*#4-O`n@o6`BVO> zmZj^yW!{{2O^tuU@#iZ_p3b^vIqQJdpZ+!C?0U;rEbe1Fa$4!`qU|5z8jcHXDC*M< zE4WZ}|MQ$(4y7eA;*2-fwpg#NwR#@r$-P`u!=Xar%AuDI=O-_`BGJ>Zl~qOo%-x59wukxS+QL+YL0#scj?xePw&(> zDn~qIE3%xU@?Pz(&ua0XHH`Ppgl25t-g4&De>c}1zg#T$+;@xPd&pH{xUXOQ{c+AX zw?Kn{=+MiHq}JVSowV9TCHk;+r1qh{4NWJx*R{@y7V;^#D^mZ-XnR;cFDY40LH~3* zAA^akMz8aZYVCS71^r>W~cACcre}O0OzJVyVssO(!9(s^{J4NR{sBz2hJ!y@>%-p?T9Z@L%=L<<^ZPzIcPiO!IUz6W4u>F`R!c^i})GHSTKusN5G+p0<9? zCb|2kRWfdNua97xcQfh)!>Kfh=0!m+8~j$-s!N}Wym7;kJ1u{zv^@3X3H{*z&M7R(=FUml%M=@XTB`Q zWAo2^tJS1PpSj=W7jiy&yrM)(tSNL~?dhzELLOUIY%q$PB5Apsd71;y-VOZ66Py&I zCtcg&V&KZs*OS(EVcwaa%9}nJ_`G=8$WqhxP@!>);yM%Ql{?o&yw~@*64uH;VXOI; z#5*y8{E4SuhDmFveYV?a&8awlQMj(nmMyugXNy1GY>!rnwpy_&X`B5IDZWOD&BDHg zJJvojJ38l| p:first-child {\n margin-block-start: 0;\n }\n\n .syndication-links {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n\n svg {\n border-radius: 4px;\n width: auto;\n height: 1lh;\n }\n }\n }\n\n .reply-to {\n font-size: 85%;\n margin-inline: 2ex;\n padding-inline: 1ex;\n border: 1px solid var(--clr-border);\n border-bottom: none;\n border-top-left-radius: var(--border-radius);\n border-top-right-radius: var(--border-radius);\n }\n }\n}\n","@layer base {\n :root {\n color-scheme: light dark;\n\n --primary-hue: 307;\n --clr-text: light-dark(\n oklch(5% 0.1 var(--primary-hue)),\n oklch(100% 0.1 var(--primary-hue))\n );\n --clr-background: light-dark(\n oklch(100% 0.1 var(--primary-hue)),\n oklch(15% 0.15 var(--primary-hue))\n );\n --clr-border: light-dark(\n oklch(90% 0.2 var(--primary-hue)),\n oklch(25% 0.1 var(--primary-hue))\n );\n\n /* Adding snow fall colour whilst we are using it */\n --clr-snow-fall: light-dark(\n oklch(25% 0.15 var(--primary-hue)),\n oklch(85% 0.2 var(--primary-hue))\n );\n }\n\n body {\n background-color: var(--clr-background);\n color: var(--clr-text);\n }\n}\n","@layer components {\n .pagination {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n div {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n }\n }\n}\n","@layer components {\n body > header {\n display: grid;\n grid-template-columns: auto 1fr auto;\n grid-template-rows: auto auto;\n align-items: baseline;\n gap: 1rem;\n\n a {\n text-decoration: none;\n }\n\n h1 {\n margin: 0;\n text-wrap: nowrap;\n }\n\n nav {\n display: flex;\n flex-direction: row;\n gap: .5rem;\n\n @media screen and (width <= 1100px) {\n grid-row: 2;\n grid-column: 1 / span 3;\n flex-wrap: wrap;\n }\n }\n }\n}\n","@layer components {\n #theme-selector {\n button {\n appearance: none;\n border: none;\n background: none;\n\n &:hover {\n cursor: pointer;\n }\n }\n\n /* This is the element with the [popover] attribute */\n #theme-selector-dropdown {\n position: absolute;\n position-area: block-end span-inline-start;\n margin: 0;\n border: 2px solid var(--clr-border);\n background-color: var(--clr-background);\n color: var(--clr-text);\n\n fieldset {\n border: 0;\n display: flex;\n flex-direction: row;\n gap: 1ch;\n\n input {\n display: none;\n }\n }\n }\n\n /*\n * This is the element with the [popover] attribute\n * Here we are styling the open and closing animations\n */\n @media (prefers-reduced-motion: no-preference) {\n #theme-selector-dropdown {\n &:popover-open {\n transform: translateY(0) scale(1);\n opacity: 1;\n\n /*\n * Start styles for the opening transition.\n * Added to :popover-open, but after the opened styles.\n */\n @starting-style {\n transform: translateY(30px) scale(0);\n opacity: 0;\n }\n }\n\n /*\n * End styles for the closing transition.\n */\n transform: translateY(0) scale(0);\n opacity: 0;\n\n /*\n * Enumerate transitioning properties, including display and overlay.\n */\n transition: transform, opacity, display allow-discrete, overlay allow-discrete;\n transition-duration: 0.5s;\n transform-origin: top right;\n }\n }\n }\n\n ::view-transition-group(changing-theme) {\n animation-duration: 1.25s;\n }\n\n ::view-transition-new(changing-theme),\n ::view-transition-old(changing-theme) {\n mix-blend-mode: normal;\n }\n\n ::view-transition-new(changing-theme) {\n animation-name: reveal;\n }\n\n ::view-transition-old(changing-theme) {\n animation: none;\n }\n\n @keyframes reveal {\n from {\n clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);\n }\n\n to {\n clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);\n }\n }\n}\n","@layer reset {\n /* Sourced from https://piccalil.li/blog/a-more-modern-css-reset/ */\n\n /* Box sizing rules */\n *,\n *::before,\n *::after {\n box-sizing: border-box;\n }\n\n /* Prevent font size inflation */\n html {\n /* stylelint-disable property-no-vendor-prefix */\n -moz-text-size-adjust: none;\n -webkit-text-size-adjust: none;\n /* stylelint-enable property-no-vendor-prefix */\n text-size-adjust: none;\n }\n\n /* Remove default margin in favour of better control in authored CSS */\n body, h1, h2, h3, h4, p,\n figure, blockquote, dl, dd {\n margin-block-end: 0;\n }\n\n /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */\n ul[role='list'],\n ol[role='list'] {\n list-style: none;\n }\n\n /* Set core body defaults */\n body {\n line-height: 1.5;\n }\n\n /* Set shorter line heights on headings and interactive elements */\n h1, h2, h3, h4,\n button, input, label {\n line-height: 1.1;\n }\n\n /* Balance text wrapping on headings */\n h1, h2,\n h3, h4 {\n text-wrap: balance;\n }\n\n /* A elements that don't have a class get default styles */\n a:not([class]) {\n text-decoration-skip-ink: auto;\n color: currentcolor;\n }\n\n /* Make images easier to work with */\n img,\n picture {\n max-width: 100%;\n display: block;\n }\n\n /* Inherit fonts for inputs and buttons */\n input, button,\n textarea, select {\n font-family: inherit;\n font-size: inherit;\n }\n\n /* Make sure textareas without a rows attribute are not tiny */\n textarea:not([rows]) {\n min-height: 10em;\n }\n\n /* Anything that has been anchored to should have extra scroll margin */\n :target {\n scroll-margin-block: 5ex;\n }\n\n /* Disable view transition animations for users who don’t want them */\n @media (prefers-reduced-motion) {\n ::view-transition-group(*),\n ::view-transition-old(*),\n ::view-transition-new(*) {\n animation: none !important;\n }\n }\n}\n","@layer base {\n :root {\n --border-radius: 8px;\n }\n\n html {\n font-size: 125%;\n }\n\n body {\n display: grid;\n grid-template-columns: 1fr min(80ch, 95vw) 1fr;\n grid-template-rows: min-content 1fr min-content;\n padding-inline: 4vw;\n\n > header {\n grid-column: 1/-1;\n }\n\n > main {\n grid-column: 2/3;\n }\n\n > footer {\n grid-column: 1/-1;\n margin-block-start: 2ex;\n\n search form {\n display: flex;\n flex-direction: row;\n align-items: center;\n gap: 1ex;\n }\n }\n }\n\n .h-feed {\n display: flex;\n flex-direction: column;\n gap: 2ex;\n }\n}\n"],"names":[]} \ No newline at end of file +{"version":3,"mappings":"AACA,aIGE,uCAOA,oFASA,8DAMA,4CAMA,qBAKA,+CAMA,8BAMA,gEAMA,yCAOA,mEAOA,qCAKA,gCAKA,gCACE,wGJ/EJ,YMAE,oaAwBA,kECxBA,0BAIA,oBAIA,iIAME,0BAIA,uBAIA,iDAIE,yEAME,uBAON,oDPvCF,kBCAE,wHAOE,yBAIA,+BAKA,gDAKE,kCAAqC,2CCrBzC,+HAOE,gDAIA,6DAKE,gDAQJ,4MCxBA,sFAME,+CENF,gBACE,oDAKE,wBAMF,gMAQE,4DAME,uBAUJ,8CACE,2BACE,yDAQE,gBAAiB,8CAST,uKAahB,iEAIA,kGAKA,4DAIA,qDAIA","sources":["resources/css/app.css","resources/css/notes.css","resources/css/header.css","resources/css/pagination.css","resources/css/reset.css","resources/css/colours.css","resources/css/theme-selector.css","resources/css/layout.css"],"sourcesContent":["/* First thing we need to do is declare our cascade layers */\n@layer reset, base, components;\n\n@import url('reset.css');\n@import url('colours.css');\n@import url('layout.css');\n@import url('header.css');\n@import url('notes.css');\n@import url('pagination.css');\n@import url('theme-selector.css');\n","@layer components {\n .note {\n display: flex;\n flex-direction: column;\n border: 1px solid var(--clr-border);\n border-radius: var(--border-radius);\n padding: 1ex 2ex;\n\n .e-content > p:first-child {\n margin-block-start: 0;\n }\n\n .syndication-links {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n\n svg {\n border-radius: 4px;\n width: auto;\n height: 1lh;\n }\n }\n }\n\n .reply-to {\n font-size: 85%;\n margin-inline: 2ex;\n padding-inline: 1ex;\n border: 1px solid var(--clr-border);\n border-bottom: none;\n border-top-left-radius: var(--border-radius);\n border-top-right-radius: var(--border-radius);\n }\n}\n","@layer components {\n body > header {\n display: grid;\n grid-template-columns: auto 1fr auto;\n grid-template-rows: auto auto;\n align-items: baseline;\n gap: 1rem;\n\n a {\n text-decoration: none;\n }\n\n h1 {\n margin: 0;\n text-wrap: nowrap;\n }\n\n nav {\n display: flex;\n flex-direction: row;\n gap: .5rem;\n\n @media screen and (width <= 1100px) {\n grid-row: 2;\n grid-column: 1 / span 3;\n flex-wrap: wrap;\n }\n }\n }\n}\n","@layer components {\n .pagination {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n div {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n }\n }\n}\n","@layer reset {\n /* Sourced from https://piccalil.li/blog/a-more-modern-css-reset/ */\n\n /* Box sizing rules */\n *,\n *::before,\n *::after {\n box-sizing: border-box;\n }\n\n /* Prevent font size inflation */\n html {\n /* stylelint-disable property-no-vendor-prefix */\n -moz-text-size-adjust: none;\n -webkit-text-size-adjust: none;\n /* stylelint-enable property-no-vendor-prefix */\n text-size-adjust: none;\n }\n\n /* Remove default margin in favour of better control in authored CSS */\n body, h1, h2, h3, h4, p,\n figure, blockquote, dl, dd {\n margin-block-end: 0;\n }\n\n /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */\n ul[role='list'],\n ol[role='list'] {\n list-style: none;\n }\n\n /* Set core body defaults */\n body {\n line-height: 1.5;\n }\n\n /* Set shorter line heights on headings and interactive elements */\n h1, h2, h3, h4,\n button, input, label {\n line-height: 1.1;\n }\n\n /* Balance text wrapping on headings */\n h1, h2,\n h3, h4 {\n text-wrap: balance;\n }\n\n /* A elements that don't have a class get default styles */\n a:not([class]) {\n text-decoration-skip-ink: auto;\n color: currentcolor;\n }\n\n /* Make images easier to work with */\n img,\n picture {\n max-width: 100%;\n display: block;\n }\n\n /* Inherit fonts for inputs and buttons */\n input, button,\n textarea, select {\n font-family: inherit;\n font-size: inherit;\n }\n\n /* Make sure textareas without a rows attribute are not tiny */\n textarea:not([rows]) {\n min-height: 10em;\n }\n\n /* Anything that has been anchored to should have extra scroll margin */\n :target {\n scroll-margin-block: 5ex;\n }\n\n /* Disable view transition animations for users who don’t want them */\n @media (prefers-reduced-motion) {\n ::view-transition-group(*),\n ::view-transition-old(*),\n ::view-transition-new(*) {\n animation: none !important;\n }\n }\n}\n","@layer base {\n :root {\n color-scheme: light dark;\n\n --primary-hue: 307;\n --clr-text: light-dark(\n oklch(5% 0.1 var(--primary-hue)),\n oklch(100% 0.1 var(--primary-hue))\n );\n --clr-background: light-dark(\n oklch(100% 0.1 var(--primary-hue)),\n oklch(15% 0.15 var(--primary-hue))\n );\n --clr-border: light-dark(\n oklch(90% 0.2 var(--primary-hue)),\n oklch(25% 0.1 var(--primary-hue))\n );\n\n /* Adding snow fall colour whilst we are using it */\n --clr-snow-fall: light-dark(\n oklch(25% 0.15 var(--primary-hue)),\n oklch(85% 0.2 var(--primary-hue))\n );\n }\n\n body {\n background-color: var(--clr-background);\n color: var(--clr-text);\n }\n}\n","@layer components {\n #theme-selector {\n button {\n appearance: none;\n border: none;\n background: none;\n\n &:hover {\n cursor: pointer;\n }\n }\n\n /* This is the element with the [popover] attribute */\n #theme-selector-dropdown {\n position: absolute;\n position-area: block-end span-inline-start;\n margin: 0;\n border: 2px solid var(--clr-border);\n background-color: var(--clr-background);\n color: var(--clr-text);\n\n fieldset {\n border: 0;\n display: flex;\n flex-direction: row;\n gap: 1ch;\n\n input {\n display: none;\n }\n }\n }\n\n /*\n * This is the element with the [popover] attribute\n * Here we are styling the open and closing animations\n */\n @media (prefers-reduced-motion: no-preference) {\n #theme-selector-dropdown {\n &:popover-open {\n transform: translateY(0) scale(1);\n opacity: 1;\n\n /*\n * Start styles for the opening transition.\n * Added to :popover-open, but after the opened styles.\n */\n @starting-style {\n transform: translateY(30px) scale(0);\n opacity: 0;\n }\n }\n\n /*\n * End styles for the closing transition.\n */\n transform: translateY(0) scale(0);\n opacity: 0;\n\n /*\n * Enumerate transitioning properties, including display and overlay.\n */\n transition: transform, opacity, display allow-discrete, overlay allow-discrete;\n transition-duration: 0.5s;\n transform-origin: top right;\n }\n }\n }\n\n ::view-transition-group(changing-theme) {\n animation-duration: 1.25s;\n }\n\n ::view-transition-new(changing-theme),\n ::view-transition-old(changing-theme) {\n mix-blend-mode: normal;\n }\n\n ::view-transition-new(changing-theme) {\n animation-name: reveal;\n }\n\n ::view-transition-old(changing-theme) {\n animation: none;\n }\n\n @keyframes reveal {\n from {\n clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);\n }\n\n to {\n clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);\n }\n }\n}\n","@layer base {\n :root {\n --border-radius: 8px;\n }\n\n html {\n font-size: 125%;\n }\n\n body {\n display: grid;\n grid-template-columns: 1fr min(80ch, 80vw) 1fr;\n grid-template-rows: min-content 1fr min-content;\n padding-inline: 4vw;\n\n > header {\n grid-column: 1/-1;\n }\n\n > main {\n grid-column: 2/3;\n }\n\n > footer {\n grid-column: 1/-1;\n margin-block-start: 2ex;\n\n search form {\n display: flex;\n flex-direction: row;\n align-items: center;\n gap: 1ex;\n\n input {\n min-width: 0;\n }\n }\n }\n }\n\n .h-feed {\n display: flex;\n flex-direction: column;\n gap: 2ex;\n }\n}\n"],"names":[]} \ No newline at end of file diff --git a/public/assets/css/app.css.zst b/public/assets/css/app.css.zst index d6c155b813daa070abfc1ffbec68b3492043d74f..5adb7c02d39790cbf69121da35d830d40bede8b1 100644 GIT binary patch literal 1450 zcmdPcs{c1-J?~Q;1}^72-0BLxbJ#a9{g^Gb?IG9p-dT6gX>K{jAiVQbN?i%B@q;q1 zYGD=*K_}OZ3>z4>F!<^5y?E8s|3+@()4#JU|6W|@UgEXuc*w@P>&+i8^O#XA-`((I z?U_gWa&>mfEj;`9*uJOAl6QrE+h>KiEsEr~lyUA--ha~HwR+-*%eE|kZYl3sVYJ#c zOv|cWf5}?i^}2s#11mPv^|sm;?MR=<&6ttcFpYJK$pxd#yDLPcwAz!8e>I+UA?%~~ zkE^@go0YrleguS`JG*tfR!&}d|uq(g4TKSyEb-UX6gSA(V*S#>V zvzeZHf7g?evyul4&Nl7a*)eH@`+27SAA&dSkN2II(mqdlBFhS9qvy>##ng=*Zx;&$ z+uybIR(o(n$+By)$@eO?&K!+;_coDmzt%;8Dw`Y&7$!#D5t%vH*Nth@#7N#Le6tm* z7kySfK5fIzMTYiVULkIW&Q5w=Fvs2~`tr&he97g$oMbCH;AiXqWT5)unkjxy8mIGaWmW#4;mo9cu@Hxz6xQuaQTFb=Ae=;w*r+I&T zKY0Tyg9x{$o{x%1vC+|*dBvg}5*8H-Pt6jZ1)f()aAaKYay{2(0}Yp)<4?B6Tv#7+ z$<~eCz{I!h_4yWgE{Q|?B=Tyw_qtBAh)_?Sm?2ZB7^bc)X!>-|)kE)Rb$zLxJ#A?i zn_J^z6OOvm%MK|h=q!(%T%MD9`NXEFHUX`ntv5dB^xr)!Z(3&AePz-y5A&P%LP~X~ zfB(`EnC{{H`hZGXWK8_DqD-rR{I5(|tvk#r@0@aJ{rjG=QDsHp+9VH`loShh*! zy-4|26C%iTD|*WA_4`F8#fJwiKIRoZ)3>E_5lfU5ry=u1Egz+~-chC z{h3>EY{q1dOG-;Lf_xtbWwxO3ccmM=2HRE21W&OJgRaJSL+>~)x0k>)!3Hj&YC`# zIH6X_V!u%9sgowVJp8F%JE7mTxlu&kKENauUYFHEiutn;)B44mrCBT&U5Z7*a|W|h!+bD&Df*%c1G6npF6rI zuD|YZ>h(iIK0Bd)jo=a@O*lc51?WfjzU;W&i zs9R{xbhBZOvVq!3Sw3U6D`(n2O5OHTizxR<^gQvY@m^v9kCPnpjy)@@?Ai`@hnjrX zQZ!rapRz$Csqnh^DqpbLQ^zZ!3N*RmriT`S`{{w&~klO+K7*KAe3f&HC$7#w_>uot@&78fv)wG^7~h zPus4qIR9DJ^~~B^tB!8eWmwIr=e$NrVp-pU$V-<_Kbds$spgxbbquDRVyV{)mLZ-u+lyq~o?JjGl8C`WduS#_V@ T$^9(%{=*uL;AmFwf;H*@sn46T literal 1446 zcmdPcs{c1-Iqy*&1}^72+^P!wcP4yvm^RIQli8jr5$m>?KB;3ncyiBA-bcL>6$j-O z2{1XZ@NZz)$gquJqSX}9&297F)Y(4Q{q6eq`mU2by~jLrH$PtgJ^4n!m0h2FP3ny6 zil2J*tqV8s*tF%+&+ca4 z+L9Vw9w&FF_WkhnIW}y*6jz_9rVO^^VhQ}?WVb= zC*C)`S!?D0X3N2xmK?(rv1vQhQh%?$Vf^&B-sT@OFRt2>e$oATmRtG6i?>$(eZ%?t z_@vdF-^{j*Qtn}!$6j>xa73oqx7YDo_V15XNj<;G%S|k*A#e)U)sx)?ajTe{jl$N~ zezmaNbwE(qG?01mn^O@QEg!#^81!%$Prr7YIZH<*$Rop`K+kyQ->V*v7QCsE2{G(R z)hT0JZC`1&^_Qc<=PO$6t%~l`yXMq?DmLA=^I~%UhR6uN8Bc8uuYP`d%0P+R`OfdU z-eo74jUGpF_wZ!#pRhdqG^3#&3yfTCn)dE1~UOm0)NZ~=Ty|WL?C$8Qy z<+O$0G*`K{6^&9l->*K)^w_~sG`&ARGkJ2R`Kbd^d6Hp!pL3}m@BBaMnybJvO*3uY zOzWJDD?hKRvpqBO($r*|Gl%on=?CwcQC{81p&uNR^>zRMBb!(oRaP`^403ZxNm23S znsm&Oqw%4GrsW=HrJE+_gSZ6KIE)=np6F>>5p*+x*}7wmn#9Sp?b9x7%vgP-lOfh) zn&_&wucr07t11{}MO3~`u6JBwvDT$iYj;W2!hH_cW*XeI2;AzK7xU8TbV~i)iT;x` z*O`iU6^G3JBV(z*gjY_~*Q7ei%dFCw>y(YtWUh~mD$JM8O?VwC`>bEodZ&}OXxNl* ztqJAK{*U&!na)%ddgFWjR!H_Wmy;8IZs5(53O9_2S=Cv7vh%46&ufd*xlDfyeJ>q} zn_^nK72jc{_(@QuWTxp8v-pqK(>xQvJ&QiV|E2Hb!8K$>;d#z$R zERtDu%2~hg%?yJ>aqOH`m(9=g&UP;RAlT>_&BQh1bKUcBF(;ps%MGnA))}7t-h3&Q z!+O)DzExuW^EP&8>=nB|eV+f+x9X2`e*b^zekXSQmAwx*qxN`gy#969fgQYTZzlXs zI=i-2V43Qr!(4adUy7c+yUDic@q$lv|DLVA zA;;yg^a;c4m)_Zv{szx6PJfZ;!G8VYJ??wlE>;&d9M(&7;obG|Da%oJ=W0(K7A8&( z2K7UX`t8hNA8igxyC0P{I+iti?SfF&=_+B`5@CG{G%u-4Z^>V}Gq{-Fs^Ue-<@o^z zA4_B>|4m?;IFb802T1XH~;_u diff --git a/resources/css/layout.css b/resources/css/layout.css index beb30eff..488d0f95 100644 --- a/resources/css/layout.css +++ b/resources/css/layout.css @@ -9,7 +9,7 @@ body { display: grid; - grid-template-columns: 1fr min(80ch, 95vw) 1fr; + grid-template-columns: 1fr min(80ch, 80vw) 1fr; grid-template-rows: min-content 1fr min-content; padding-inline: 4vw; @@ -30,6 +30,10 @@ flex-direction: row; align-items: center; gap: 1ex; + + input { + min-width: 0; + } } } } diff --git a/resources/css/notes.css b/resources/css/notes.css index 005b89d3..ea85f2d2 100644 --- a/resources/css/notes.css +++ b/resources/css/notes.css @@ -1,37 +1,35 @@ @layer components { - .h-feed { - .note { - display: flex; - flex-direction: column; - border: 1px solid var(--clr-border); - border-radius: var(--border-radius); - padding: 1ex 2ex; + .note { + display: flex; + flex-direction: column; + border: 1px solid var(--clr-border); + border-radius: var(--border-radius); + padding: 1ex 2ex; - .e-content > p:first-child { - margin-block-start: 0; - } - - .syndication-links { - display: flex; - flex-direction: row; - gap: 1ex; - - svg { - border-radius: 4px; - width: auto; - height: 1lh; - } - } + .e-content > p:first-child { + margin-block-start: 0; } - .reply-to { - font-size: 85%; - margin-inline: 2ex; - padding-inline: 1ex; - border: 1px solid var(--clr-border); - border-bottom: none; - border-top-left-radius: var(--border-radius); - border-top-right-radius: var(--border-radius); + .syndication-links { + display: flex; + flex-direction: row; + gap: 1ex; + + svg { + border-radius: 4px; + width: auto; + height: 1lh; + } } } + + .reply-to { + font-size: 85%; + margin-inline: 2ex; + padding-inline: 1ex; + border: 1px solid var(--clr-border); + border-bottom: none; + border-top-left-radius: var(--border-radius); + border-top-right-radius: var(--border-radius); + } } diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 235c6b15..dfb7a5a1 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -88,8 +88,8 @@
- - + +
@auth() From d3d6913474a459a9ec19302a11b30ee0ce06ffbc Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 13 Dec 2025 15:53:00 +0000 Subject: [PATCH 02/26] Switch local setup to PHP8.5 Also pull in config changes from upstream laravel/laravel --- app/Http/Controllers/NotesController.php | 3 +-- config/app.php | 2 +- config/auth.php | 2 +- config/cache.php | 15 ++++++++++++--- config/database.php | 15 ++++++++++++--- config/logging.php | 7 +++---- config/mail.php | 19 +++++++++++++++++-- config/queue.php | 19 ++++++++++++++++++- config/services.php | 6 +++++- config/session.php | 11 +++++------ docker-compose.yml | 4 ++-- 11 files changed, 77 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index d5c9bc90..e20b67a1 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace App\Http\Controllers; use App\Models\Note; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Response; @@ -53,7 +52,7 @@ class NotesController extends Controller ->withCount(['webmentions AS reposts' => function ($query) { $query->where('type', 'repost-of'); }])->firstOrFail(); - } catch (ModelNotFoundException $exception) { + } catch (\Exception) { abort(404); } diff --git a/config/app.php b/config/app.php index 324b513a..423eed59 100644 --- a/config/app.php +++ b/config/app.php @@ -101,7 +101,7 @@ return [ 'previous_keys' => [ ...array_filter( - explode(',', env('APP_PREVIOUS_KEYS', '')) + explode(',', (string) env('APP_PREVIOUS_KEYS', '')) ), ], diff --git a/config/auth.php b/config/auth.php index 0ba5d5d8..7d1eb0de 100644 --- a/config/auth.php +++ b/config/auth.php @@ -104,7 +104,7 @@ return [ | Password Confirmation Timeout |-------------------------------------------------------------------------- | - | Here you may define the amount of seconds before a password confirmation + | Here you may define the number of seconds before a password confirmation | window expires and users are asked to re-enter their password via the | confirmation screen. By default, the timeout lasts for three hours. | diff --git a/config/cache.php b/config/cache.php index 38680919..461aacbe 100644 --- a/config/cache.php +++ b/config/cache.php @@ -26,8 +26,9 @@ return [ | well as their drivers. You may even define multiple stores for the | same cache driver to group types of items stored in your caches. | - | Supported drivers: "apc", "array", "database", "file", "memcached", - | "redis", "dynamodb", "octane", "null" + | Supported drivers: "array", "database", "file", "memcached", + | "redis", "dynamodb", "octane", + | "failover", "null" | */ @@ -89,6 +90,14 @@ return [ 'driver' => 'octane', ], + 'failover' => [ + 'driver' => 'failover', + 'stores' => [ + 'database', + 'array', + ], + ], + ], /* @@ -102,6 +111,6 @@ return [ | */ - 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'), + 'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'_cache_'), ]; diff --git a/config/database.php b/config/database.php index 8910562d..630407ef 100644 --- a/config/database.php +++ b/config/database.php @@ -40,6 +40,7 @@ return [ 'busy_timeout' => null, 'journal_mode' => null, 'synchronous' => null, + 'transaction_mode' => 'DEFERRED', ], 'mysql' => [ @@ -58,7 +59,7 @@ return [ 'strict' => true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], @@ -78,7 +79,7 @@ return [ 'strict' => true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], @@ -147,7 +148,7 @@ return [ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'redis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), + 'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'_database_'), 'persistent' => env('REDIS_PERSISTENT', false), ], @@ -158,6 +159,10 @@ return [ 'password' => env('REDIS_PASSWORD'), 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_DB', '0'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), ], 'cache' => [ @@ -167,6 +172,10 @@ return [ 'password' => env('REDIS_PASSWORD'), 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_CACHE_DB', '1'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), ], ], diff --git a/config/logging.php b/config/logging.php index 06297cd6..96d344bb 100644 --- a/config/logging.php +++ b/config/logging.php @@ -54,7 +54,7 @@ return [ 'stack' => [ 'driver' => 'stack', - 'channels' => explode(',', env('LOG_STACK', 'single')), + 'channels' => explode(',', (string) env('LOG_STACK', 'single')), 'ignore_exceptions' => false, ], @@ -97,11 +97,10 @@ return [ 'stderr' => [ 'driver' => 'monolog', 'level' => env('LOG_LEVEL', 'debug'), - 'handler' => StreamHandler::class, - 'formatter' => env('LOG_STDERR_FORMATTER'), - 'with' => [ + 'handler_with' => [ 'stream' => 'php://stderr', ], + 'formatter' => env('LOG_STDERR_FORMATTER'), 'processors' => [PsrLogMessageProcessor::class], ], diff --git a/config/mail.php b/config/mail.php index 7132144d..522b284b 100644 --- a/config/mail.php +++ b/config/mail.php @@ -30,7 +30,8 @@ return [ | your mailers below. You may also add additional mailers if needed. | | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", - | "postmark", "log", "array", "failover", "roundrobin" + | "postmark", "resend", "log", "array", + | "failover", "roundrobin" | */ @@ -45,7 +46,7 @@ return [ 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), 'timeout' => null, - 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)), + 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)), ], 'ses' => [ @@ -60,6 +61,10 @@ return [ // ], ], + 'resend' => [ + 'transport' => 'resend', + ], + 'sendmail' => [ 'transport' => 'sendmail', 'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'), @@ -80,6 +85,16 @@ return [ 'smtp', 'log', ], + 'retry_after' => 60, + ], + + 'roundrobin' => [ + 'transport' => 'roundrobin', + 'mailers' => [ + 'ses', + 'postmark', + ], + 'retry_after' => 60, ], ], diff --git a/config/queue.php b/config/queue.php index 116bd8d0..79c2c0a2 100644 --- a/config/queue.php +++ b/config/queue.php @@ -24,7 +24,8 @@ return [ | used by your application. An example configuration is provided for | each backend supported by Laravel. You're also free to add more. | - | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null" + | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", + | "deferred", "background", "failover", "null" | */ @@ -72,6 +73,22 @@ return [ 'after_commit' => false, ], + 'deferred' => [ + 'driver' => 'deferred', + ], + + 'background' => [ + 'driver' => 'background', + ], + + 'failover' => [ + 'driver' => 'failover', + 'connections' => [ + 'database', + 'deferred', + ], + ], + ], /* diff --git a/config/services.php b/config/services.php index b3d02f78..b784e544 100644 --- a/config/services.php +++ b/config/services.php @@ -15,7 +15,11 @@ return [ */ 'postmark' => [ - 'token' => env('POSTMARK_TOKEN'), + 'key' => env('POSTMARK_API_KEY'), + ], + + 'resend' => [ + 'key' => env('RESEND_API_KEY'), ], 'ses' => [ diff --git a/config/session.php b/config/session.php index 6ff263bd..5b541b75 100644 --- a/config/session.php +++ b/config/session.php @@ -13,8 +13,8 @@ return [ | incoming requests. Laravel supports a variety of storage options to | persist session data. Database storage is a great default choice. | - | Supported: "file", "cookie", "database", "apc", - | "memcached", "redis", "dynamodb", "array" + | Supported: "file", "cookie", "database", "memcached", + | "redis", "dynamodb", "array" | */ @@ -97,7 +97,7 @@ return [ | define the cache store which should be used to store the session data | between requests. This must match one of your defined cache stores. | - | Affects: "apc", "dynamodb", "memcached", "redis" + | Affects: "dynamodb", "memcached", "redis" | */ @@ -125,12 +125,11 @@ return [ | the framework. Typically, you should not need to change this value | since doing so does not grant a meaningful security improvement. | - | */ 'cookie' => env( 'SESSION_COOKIE', - Str::slug(env('APP_NAME', 'laravel'), '_').'_session' + Str::slug((string) env('APP_NAME', 'laravel')).'-session' ), /* @@ -153,7 +152,7 @@ return [ | | This value determines the domain and subdomains the session cookie is | available to. By default, the cookie will be available to the root - | domain and all subdomains. Typically, this shouldn't be changed. + | domain without subdomains. Typically, this shouldn't be changed. | */ diff --git a/docker-compose.yml b/docker-compose.yml index 74f97af5..aa3dec15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,11 @@ services: laravel.test: build: - context: ./vendor/laravel/sail/runtimes/8.4 + context: ./vendor/laravel/sail/runtimes/8.5 dockerfile: Dockerfile args: WWWGROUP: '${WWWGROUP}' - image: sail-8.4/app + image: sail-8.5/app extra_hosts: - 'host.docker.internal:host-gateway' ports: From 76db869af5fd4bf24674a910876de3bc4f58e371 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 27 Dec 2025 17:55:29 +0000 Subject: [PATCH 03/26] Allow files to be added to notes This is specifically when a Micropub client is using the JSON syntax and initially uploads the photo via the media endpoint --- app/Http/Requests/MicropubRequest.php | 3 +++ app/Jobs/ProcessMedia.php | 12 ++++++------ app/Services/NoteService.php | 20 ++++++++++---------- config/filesystems.php | 2 +- config/logging.php | 1 - public/assets/css/app.css | 2 +- public/assets/css/app.css.br | Bin 1202 -> 1217 bytes public/assets/css/app.css.map | 2 +- public/assets/css/app.css.zst | Bin 1450 -> 1463 bytes resources/css/notes.css | 11 +++++++++-- tests/Unit/Jobs/ProcessMediaJobTest.php | 3 ++- 11 files changed, 33 insertions(+), 23 deletions(-) diff --git a/app/Http/Requests/MicropubRequest.php b/app/Http/Requests/MicropubRequest.php index 41c70280..cc22dd3e 100644 --- a/app/Http/Requests/MicropubRequest.php +++ b/app/Http/Requests/MicropubRequest.php @@ -80,6 +80,9 @@ class MicropubRequest extends FormRequest // Add checkin value $this->micropubData['checkin'] = Arr::get($data, 'checkin'); $this->micropubData['syndication'] = Arr::get($data, 'properties.syndication.0'); + + // Add photos + $this->micropubData['photos'] = Arr::get($data, 'properties.photo'); } private function normalizeMicropubForm(): void diff --git a/app/Jobs/ProcessMedia.php b/app/Jobs/ProcessMedia.php index b7f36648..a693a821 100644 --- a/app/Jobs/ProcessMedia.php +++ b/app/Jobs/ProcessMedia.php @@ -33,20 +33,20 @@ class ProcessMedia implements ShouldQueue public function handle(ImageManager $manager): void { // Load file - $file = Storage::disk('local')->get('media/' . $this->filename); + $file = Storage::disk('local')->get($this->filename); // Open file try { $image = $manager->read($file); } catch (DecoderException) { // not an image; delete file and end job - Storage::disk('local')->delete('media/' . $this->filename); + Storage::disk('local')->delete($this->filename); return; } // Save the file publicly - Storage::disk('public')->put('media/' . $this->filename, $file); + Storage::disk('public')->put($this->filename, $file); // Create smaller versions if necessary if ($image->width() > 1000) { @@ -57,13 +57,13 @@ class ProcessMedia implements ShouldQueue $basename = trim(implode('.', $filenameParts), '.'); $medium = $image->resize(width: 1000); - Storage::disk('public')->put('media/' . $basename . '-medium.' . $extension, (string) $medium->encode()); + Storage::disk('public')->put($basename . '-medium.' . $extension, (string) $medium->encode()); $small = $image->resize(width: 500); - Storage::disk('public')->put('media/' . $basename . '-small.' . $extension, (string) $small->encode()); + Storage::disk('public')->put($basename . '-small.' . $extension, (string) $small->encode()); } // Now we can delete the locally saved image - Storage::disk('local')->delete('media/' . $this->filename); + Storage::disk('local')->delete($this->filename); } } diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php index d8c55507..c80a450c 100644 --- a/app/Services/NoteService.php +++ b/app/Services/NoteService.php @@ -48,12 +48,12 @@ class NoteService $note->place()->associate($this->getCheckin($data)); $note->swarm_url = $this->getSwarmUrl($data); } - // - // $note->instagram_url = $this->getInstagramUrl($request); - // - // foreach ($this->getMedia($request) as $media) { - // $note->media()->save($media); - // } + + // $note->instagram_url = $this->getInstagramUrl($request); + + foreach ($this->getMedia($data) as $media) { + $note->media()->save($media); + } $note->save(); @@ -188,16 +188,16 @@ class NoteService /** * Get the media URLs from the request to create a new note. */ - private function getMedia(array $request): array + private function getMedia(array $data): array { $media = []; - $photos = Arr::get($request, 'photo') ?? Arr::get($request, 'properties.photo'); + $photos = Arr::get($data, 'photos'); if (isset($photos)) { foreach ((array) $photos as $photo) { // check the media was uploaded to my endpoint, and use path - if (Str::startsWith($photo, config('filesystems.disks.s3.url'))) { - $path = substr($photo, strlen(config('filesystems.disks.s3.url'))); + if (Str::startsWith($photo, config('filesystems.disks.public.url'))) { + $path = substr($photo, strlen(config('filesystems.disks.public.url'))); $media[] = Media::where('path', ltrim($path, '/'))->firstOrFail(); } else { $newMedia = Media::firstOrNew(['path' => $photo]); diff --git a/config/filesystems.php b/config/filesystems.php index a17a9a47..cb80a5bf 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -41,7 +41,7 @@ return [ 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), - 'url' => env('APP_URL').'/storage', + 'url' => rtrim(env('APP_URL'), '/').'/storage', 'visibility' => 'public', 'throw' => false, 'report' => false, diff --git a/config/logging.php b/config/logging.php index 96d344bb..db7145bb 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,7 +1,6 @@ header{grid-column:1/-1}&>main{grid-column:2/3}&>footer{grid-column:1/-1;margin-block-start:2ex;& search form{flex-direction:row;align-items:center;gap:1ex;display:flex;& input{min-width:0}}}}.h-feed{flex-direction:column;gap:2ex;display:flex}}@layer components{body>header{grid-template-rows:auto auto;grid-template-columns:auto 1fr auto;align-items:baseline;gap:1rem;display:grid;& a{text-decoration:none}& h1{text-wrap:nowrap;margin:0}& nav{flex-direction:row;gap:.5rem;display:flex;@media screen and (width<=1100px){flex-wrap:wrap;grid-area:2/1/auto/span 3}}}.note{border:1px solid var(--clr-border);border-radius:var(--border-radius);flex-direction:column;padding:1ex 2ex;display:flex;& .e-content>p:first-child{margin-block-start:0}& .syndication-links{flex-direction:row;gap:1ex;display:flex;& svg{border-radius:4px;width:auto;height:1lh}}}.reply-to{border:1px solid var(--clr-border);border-top-left-radius:var(--border-radius);border-top-right-radius:var(--border-radius);border-bottom:none;margin-inline:2ex;padding-inline:1ex;font-size:85%}.pagination{flex-direction:row;justify-content:center;align-items:center;display:flex;& div{flex-direction:row;gap:1ex;display:flex}}#theme-selector{& button{appearance:none;background:0 0;border:none;&:hover{cursor:pointer}}& #theme-selector-dropdown{position-area:block-end span-inline-start;border:2px solid var(--clr-border);background-color:var(--clr-background);color:var(--clr-text);margin:0;position:absolute;& fieldset{border:0;flex-direction:row;gap:1ch;display:flex;& input{display:none}}}@media (prefers-reduced-motion:no-preference){& #theme-selector-dropdown{&:popover-open{opacity:1;transform:translateY(0)scale(1);@starting-style{opacity:0;transform:translateY(30px)scale(0)}}opacity:0;transition:transform,opacity,display allow-discrete,overlay allow-discrete;transform-origin:100% 0;transition-duration:.5s;transform:translateY(0)scale(0)}}}::view-transition-group(changing-theme){animation-duration:1.25s}::view-transition-new(changing-theme),::view-transition-old(changing-theme){mix-blend-mode:normal}::view-transition-new(changing-theme){animation-name:reveal}::view-transition-old(changing-theme){animation:none}@keyframes reveal{0%{clip-path:polygon(-30% 0,-30% 0,-15% 100%,-10% 115%)}to{clip-path:polygon(-30% 0,130% 0,115% 100%,-10% 115%)}}} +@layer reset{*,:before,:after{box-sizing:border-box}html{-webkit-text-size-adjust:none;-moz-text-size-adjust:none;text-size-adjust:none}body,h1,h2,h3,h4,p,figure,blockquote,dl,dd{margin-block-end:0}ul[role=list],ol[role=list]{list-style:none}body{line-height:1.5}h1,h2,h3,h4,button,input,label{line-height:1.1}h1,h2,h3,h4{text-wrap:balance}a:not([class]){text-decoration-skip-ink:auto;color:currentColor}img,picture{max-width:100%;display:block}input,button,textarea,select{font-family:inherit;font-size:inherit}textarea:not([rows]){min-height:10em}:target{scroll-margin-block:5ex}@media (prefers-reduced-motion){::view-transition-group(*),::view-transition-old(*),::view-transition-new(*){animation:none!important}}}@layer base{:root{color-scheme:light dark;--primary-hue:307;--clr-text:light-dark(oklch(5% .1 var(--primary-hue)),oklch(100% .1 var(--primary-hue)));--clr-background:light-dark(oklch(100% .1 var(--primary-hue)),oklch(15% .15 var(--primary-hue)));--clr-border:light-dark(oklch(90% .2 var(--primary-hue)),oklch(25% .1 var(--primary-hue)));--clr-snow-fall:light-dark(oklch(25% .15 var(--primary-hue)),oklch(85% .2 var(--primary-hue)))}body{background-color:var(--clr-background);color:var(--clr-text)}:root{--border-radius:8px}html{font-size:125%}body{grid-template-rows:min-content 1fr min-content;grid-template-columns:1fr min(80ch,80vw) 1fr;padding-inline:4vw;display:grid;&>header{grid-column:1/-1}&>main{grid-column:2/3}&>footer{grid-column:1/-1;margin-block-start:2ex;& search form{flex-direction:row;align-items:center;gap:1ex;display:flex;& input{min-width:0}}}}.h-feed{flex-direction:column;gap:2ex;display:flex}}@layer components{body>header{grid-template-rows:auto auto;grid-template-columns:auto 1fr auto;align-items:baseline;gap:1rem;display:grid;& a{text-decoration:none}& h1{text-wrap:nowrap;margin:0}& nav{flex-direction:row;gap:.5rem;display:flex;@media screen and (width<=1100px){flex-wrap:wrap;grid-area:2/1/auto/span 3}}}.note{border:1px solid var(--clr-border);border-radius:var(--border-radius);flex-direction:column;padding:1ex 2ex;display:flex;& .e-content{&>p:first-child{margin-block-start:0}& .u-photo{width:100%;height:auto}}& .syndication-links{flex-direction:row;gap:1ex;display:flex;& svg{border-radius:4px;width:auto;height:1lh}}}.reply-to{border:1px solid var(--clr-border);border-top-left-radius:var(--border-radius);border-top-right-radius:var(--border-radius);border-bottom:none;margin-inline:2ex;padding-inline:1ex;font-size:85%}.pagination{flex-direction:row;justify-content:center;align-items:center;display:flex;& div{flex-direction:row;gap:1ex;display:flex}}#theme-selector{& button{appearance:none;background:0 0;border:none;&:hover{cursor:pointer}}& #theme-selector-dropdown{position-area:block-end span-inline-start;border:2px solid var(--clr-border);background-color:var(--clr-background);color:var(--clr-text);margin:0;position:absolute;& fieldset{border:0;flex-direction:row;gap:1ch;display:flex;& input{display:none}}}@media (prefers-reduced-motion:no-preference){& #theme-selector-dropdown{&:popover-open{opacity:1;transform:translateY(0)scale(1);@starting-style{opacity:0;transform:translateY(30px)scale(0)}}opacity:0;transition:transform,opacity,display allow-discrete,overlay allow-discrete;transform-origin:100% 0;transition-duration:.5s;transform:translateY(0)scale(0)}}}::view-transition-group(changing-theme){animation-duration:1.25s}::view-transition-new(changing-theme),::view-transition-old(changing-theme){mix-blend-mode:normal}::view-transition-new(changing-theme){animation-name:reveal}::view-transition-old(changing-theme){animation:none}@keyframes reveal{0%{clip-path:polygon(-30% 0,-30% 0,-15% 100%,-10% 115%)}to{clip-path:polygon(-30% 0,130% 0,115% 100%,-10% 115%)}}} /*# sourceMappingURL=/assets/css/app.css.map */ diff --git a/public/assets/css/app.css.br b/public/assets/css/app.css.br index 74dedb608c0fbcc8d358975837e331b87128e37d..b15a799d91f73ebf2b740d7c4be274c8a4a98436 100644 GIT binary patch literal 1217 zcmX>&qm1E!$A;tyZxv=)mpRqF-12_?${(GMa<&sviW5s$X4b9aV45SqSD3zZ_yXdX_9({bN6$dh3NiN)Qy4he`%9AZW&x`&1mcz+j@~8hv@e!ZZTX}81v76~H zEnT$t5=+ReXZw^y*E}-xjsJGlWlz?WtgE$W{@LF=ys+!;x)vtiB+GT4OcUGNW^|ap zm^JO`w(CtF=WV|#+V%F;7psK2bfxcFVnp?}#+R9>5{@G|GSeQ_7Pueefh(w zlU5h*R8`w_WuLv@`VJ103^(D)+q9Q$X!{%R==MYpk;tXgw;w(fxM%{S}KF*`AyZi4A|W zNc}^EP?+9^MO@pW^Sb7*E?d&qcv?we_w)kxss8DAvH}lfGIMF%;m!J0vf%m2fSY{F zk59F~#qvLdJy=8W>!fEoD!cM`*M8dXTO;`FDDTrV(`{#`T{!=&Ca|@)-AC$P?i8`- z-PfFAZS88mPre}-_Rwe(>zXC+)$aPfE;(AmlrN^WWkdPSfn{xQwwJAqVT{yJBRzZ2onU0Pp%rVopm%Wm`7BZGox{@(EP;8f3}>(-}P&F8r`Yx4E=pI4}# zEP5I-SCh+k>+`2Q!V@H2rFmEO^xb?td+UwhmA_Wl&UqYhQ7nDkhNBl!1P`9Dyve92 zajo!oUiG$B37-^CX)`@7{9n)WH1c@jWpOi~IR;yvIx4GK*3RcJ*HDF!U? zf=t`p`bAnN>@{!R;x~6$+>qyF(kFD@o$vWP_n7?+9TzzAH=NF6Q&L*DPgh1+ad&@V z)2WXlTR$tWi2B&Wpzb9%*)Y$r;g_8<)8XxJW>n03v6z!li8b?Bll(d3Wlt54eh>N@ zcI)X(_Pa{=1vawXIC0c=d3kv3@r222nbrH))eP+WSeeT>?g z-d&8Tn-W8mEuZw}UjJBiHpV|oX4?mesO9CKa=G0*t*3oFV(VsnBUW8QD}wXLF85@Y zBLy)>UFLXXb_qXKJ=7r9_b}Q%^1t1oHPw9lf6w+*-9D@w_Vc_#+kuj(T~cgH(c7xd zXiOAx*|KHB#mF8x%X?AYN)P7UXivUS%cl~_-h0AZa8l8%m#)=DpUqF4K5VdX`E8*k zr;^=SFBJ*AGW#_3Y;5Ig7vRZ3qwy#<{H!vfP>2`%b-*Sz2@yn&ocrMh{ zDaziu!f}(7gwcARt+TI9lQ_8HG_&276+gH9JTLb3TMlP?$e;d2#YcQrZ}m0#=B}o_ zvviTIHq)j>JJ)-#9yVDv^Yp%`3E{pmYpeQR{#UQI2%2;|bb&*#L7SwiKxM{+&Wh%B zl5*Sk3ib4FS-Wn*jdga0<-y+~x#or)+R^!Aww>hM;^#si;}5I4Zg&iwl$l`NCg`8t zAJ}Gc@|;@2AswCCe+!T1CxU+ev#33zb76tx*_K=9ToQS|HD7$%IPaS!1M6>g9`*j#x*~?NY5N!MIr`y$ z<{b006Qy!KJ2lHPY6w#Vc)mkhlWNUIa?oU2hZt-ESEO=9a@&(qrb*rOM0Ag)je?+UY;H4(vzH*Tz4qj(J0FH zKu9Tm$`ji{i|-~g+Dv~rPxF3$Wsl^G<_SO7J&?$}QryGM)u%pfuKdSKtI}Ik16Q>C z@JME8`Few0W?$-}SM$_=U2$yiaGce-!)=qZMuErjy&-!im)U$?(Ed~U#?=PpqC)?Z zwt?mXeM=l~`MsSecI#oyTo(Q4i>zn-4b>O5RyAz-+T!ZTA5^jYh+9B!i;vm14qq-^0V5Q%l;0;n=zA!kqBs^F$sl#IC10nHK+73U~ ziYRYpGF#xBN%(x9uI-?h#P-Y<%vs;;Xw_*iU8vma$bV diff --git a/public/assets/css/app.css.map b/public/assets/css/app.css.map index f6a39007..6002b431 100644 --- a/public/assets/css/app.css.map +++ b/public/assets/css/app.css.map @@ -1 +1 @@ -{"version":3,"mappings":"AACA,aIGE,uCAOA,oFASA,8DAMA,4CAMA,qBAKA,+CAMA,8BAMA,gEAMA,yCAOA,mEAOA,qCAKA,gCAKA,gCACE,wGJ/EJ,YMAE,oaAwBA,kECxBA,0BAIA,oBAIA,iIAME,0BAIA,uBAIA,iDAIE,yEAME,uBAON,oDPvCF,kBCAE,wHAOE,yBAIA,+BAKA,gDAKE,kCAAqC,2CCrBzC,+HAOE,gDAIA,6DAKE,gDAQJ,4MCxBA,sFAME,+CENF,gBACE,oDAKE,wBAMF,gMAQE,4DAME,uBAUJ,8CACE,2BACE,yDAQE,gBAAiB,8CAST,uKAahB,iEAIA,kGAKA,4DAIA,qDAIA","sources":["resources/css/app.css","resources/css/notes.css","resources/css/header.css","resources/css/pagination.css","resources/css/reset.css","resources/css/colours.css","resources/css/theme-selector.css","resources/css/layout.css"],"sourcesContent":["/* First thing we need to do is declare our cascade layers */\n@layer reset, base, components;\n\n@import url('reset.css');\n@import url('colours.css');\n@import url('layout.css');\n@import url('header.css');\n@import url('notes.css');\n@import url('pagination.css');\n@import url('theme-selector.css');\n","@layer components {\n .note {\n display: flex;\n flex-direction: column;\n border: 1px solid var(--clr-border);\n border-radius: var(--border-radius);\n padding: 1ex 2ex;\n\n .e-content > p:first-child {\n margin-block-start: 0;\n }\n\n .syndication-links {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n\n svg {\n border-radius: 4px;\n width: auto;\n height: 1lh;\n }\n }\n }\n\n .reply-to {\n font-size: 85%;\n margin-inline: 2ex;\n padding-inline: 1ex;\n border: 1px solid var(--clr-border);\n border-bottom: none;\n border-top-left-radius: var(--border-radius);\n border-top-right-radius: var(--border-radius);\n }\n}\n","@layer components {\n body > header {\n display: grid;\n grid-template-columns: auto 1fr auto;\n grid-template-rows: auto auto;\n align-items: baseline;\n gap: 1rem;\n\n a {\n text-decoration: none;\n }\n\n h1 {\n margin: 0;\n text-wrap: nowrap;\n }\n\n nav {\n display: flex;\n flex-direction: row;\n gap: .5rem;\n\n @media screen and (width <= 1100px) {\n grid-row: 2;\n grid-column: 1 / span 3;\n flex-wrap: wrap;\n }\n }\n }\n}\n","@layer components {\n .pagination {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n div {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n }\n }\n}\n","@layer reset {\n /* Sourced from https://piccalil.li/blog/a-more-modern-css-reset/ */\n\n /* Box sizing rules */\n *,\n *::before,\n *::after {\n box-sizing: border-box;\n }\n\n /* Prevent font size inflation */\n html {\n /* stylelint-disable property-no-vendor-prefix */\n -moz-text-size-adjust: none;\n -webkit-text-size-adjust: none;\n /* stylelint-enable property-no-vendor-prefix */\n text-size-adjust: none;\n }\n\n /* Remove default margin in favour of better control in authored CSS */\n body, h1, h2, h3, h4, p,\n figure, blockquote, dl, dd {\n margin-block-end: 0;\n }\n\n /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */\n ul[role='list'],\n ol[role='list'] {\n list-style: none;\n }\n\n /* Set core body defaults */\n body {\n line-height: 1.5;\n }\n\n /* Set shorter line heights on headings and interactive elements */\n h1, h2, h3, h4,\n button, input, label {\n line-height: 1.1;\n }\n\n /* Balance text wrapping on headings */\n h1, h2,\n h3, h4 {\n text-wrap: balance;\n }\n\n /* A elements that don't have a class get default styles */\n a:not([class]) {\n text-decoration-skip-ink: auto;\n color: currentcolor;\n }\n\n /* Make images easier to work with */\n img,\n picture {\n max-width: 100%;\n display: block;\n }\n\n /* Inherit fonts for inputs and buttons */\n input, button,\n textarea, select {\n font-family: inherit;\n font-size: inherit;\n }\n\n /* Make sure textareas without a rows attribute are not tiny */\n textarea:not([rows]) {\n min-height: 10em;\n }\n\n /* Anything that has been anchored to should have extra scroll margin */\n :target {\n scroll-margin-block: 5ex;\n }\n\n /* Disable view transition animations for users who don’t want them */\n @media (prefers-reduced-motion) {\n ::view-transition-group(*),\n ::view-transition-old(*),\n ::view-transition-new(*) {\n animation: none !important;\n }\n }\n}\n","@layer base {\n :root {\n color-scheme: light dark;\n\n --primary-hue: 307;\n --clr-text: light-dark(\n oklch(5% 0.1 var(--primary-hue)),\n oklch(100% 0.1 var(--primary-hue))\n );\n --clr-background: light-dark(\n oklch(100% 0.1 var(--primary-hue)),\n oklch(15% 0.15 var(--primary-hue))\n );\n --clr-border: light-dark(\n oklch(90% 0.2 var(--primary-hue)),\n oklch(25% 0.1 var(--primary-hue))\n );\n\n /* Adding snow fall colour whilst we are using it */\n --clr-snow-fall: light-dark(\n oklch(25% 0.15 var(--primary-hue)),\n oklch(85% 0.2 var(--primary-hue))\n );\n }\n\n body {\n background-color: var(--clr-background);\n color: var(--clr-text);\n }\n}\n","@layer components {\n #theme-selector {\n button {\n appearance: none;\n border: none;\n background: none;\n\n &:hover {\n cursor: pointer;\n }\n }\n\n /* This is the element with the [popover] attribute */\n #theme-selector-dropdown {\n position: absolute;\n position-area: block-end span-inline-start;\n margin: 0;\n border: 2px solid var(--clr-border);\n background-color: var(--clr-background);\n color: var(--clr-text);\n\n fieldset {\n border: 0;\n display: flex;\n flex-direction: row;\n gap: 1ch;\n\n input {\n display: none;\n }\n }\n }\n\n /*\n * This is the element with the [popover] attribute\n * Here we are styling the open and closing animations\n */\n @media (prefers-reduced-motion: no-preference) {\n #theme-selector-dropdown {\n &:popover-open {\n transform: translateY(0) scale(1);\n opacity: 1;\n\n /*\n * Start styles for the opening transition.\n * Added to :popover-open, but after the opened styles.\n */\n @starting-style {\n transform: translateY(30px) scale(0);\n opacity: 0;\n }\n }\n\n /*\n * End styles for the closing transition.\n */\n transform: translateY(0) scale(0);\n opacity: 0;\n\n /*\n * Enumerate transitioning properties, including display and overlay.\n */\n transition: transform, opacity, display allow-discrete, overlay allow-discrete;\n transition-duration: 0.5s;\n transform-origin: top right;\n }\n }\n }\n\n ::view-transition-group(changing-theme) {\n animation-duration: 1.25s;\n }\n\n ::view-transition-new(changing-theme),\n ::view-transition-old(changing-theme) {\n mix-blend-mode: normal;\n }\n\n ::view-transition-new(changing-theme) {\n animation-name: reveal;\n }\n\n ::view-transition-old(changing-theme) {\n animation: none;\n }\n\n @keyframes reveal {\n from {\n clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);\n }\n\n to {\n clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);\n }\n }\n}\n","@layer base {\n :root {\n --border-radius: 8px;\n }\n\n html {\n font-size: 125%;\n }\n\n body {\n display: grid;\n grid-template-columns: 1fr min(80ch, 80vw) 1fr;\n grid-template-rows: min-content 1fr min-content;\n padding-inline: 4vw;\n\n > header {\n grid-column: 1/-1;\n }\n\n > main {\n grid-column: 2/3;\n }\n\n > footer {\n grid-column: 1/-1;\n margin-block-start: 2ex;\n\n search form {\n display: flex;\n flex-direction: row;\n align-items: center;\n gap: 1ex;\n\n input {\n min-width: 0;\n }\n }\n }\n }\n\n .h-feed {\n display: flex;\n flex-direction: column;\n gap: 2ex;\n }\n}\n"],"names":[]} \ No newline at end of file +{"version":3,"mappings":"AACA,aIGE,uCAOA,oFASA,8DAMA,4CAMA,qBAKA,+CAMA,8BAMA,gEAMA,yCAOA,mEAOA,qCAKA,gCAKA,gCACE,wGJ/EJ,YGAE,oaAwBA,kEGxBA,0BAIA,oBAIA,iIAME,0BAIA,uBAIA,iDAIE,yEAME,uBAON,oDNvCF,kBEAE,wHAOE,yBAIA,+BAKA,gDAKE,kCAAqC,2CDrBzC,+HAOE,aACE,qCAIA,mCAMF,6DAKE,gDAQJ,4MM/BA,sFAME,+CFNF,gBACE,oDAKE,wBAMF,gMAQE,4DAME,uBAUJ,8CACE,2BACE,yDAQE,gBAAiB,8CAST,uKAahB,iEAIA,kGAKA,4DAIA,qDAIA","sources":["resources/css/app.css","resources/css/colours.css","resources/css/notes.css","resources/css/header.css","resources/css/layout.css","resources/css/pagination.css","resources/css/theme-selector.css","resources/css/reset.css"],"sourcesContent":["/* First thing we need to do is declare our cascade layers */\n@layer reset, base, components;\n\n@import url('reset.css');\n@import url('colours.css');\n@import url('layout.css');\n@import url('header.css');\n@import url('notes.css');\n@import url('pagination.css');\n@import url('theme-selector.css');\n","@layer base {\n :root {\n color-scheme: light dark;\n\n --primary-hue: 307;\n --clr-text: light-dark(\n oklch(5% 0.1 var(--primary-hue)),\n oklch(100% 0.1 var(--primary-hue))\n );\n --clr-background: light-dark(\n oklch(100% 0.1 var(--primary-hue)),\n oklch(15% 0.15 var(--primary-hue))\n );\n --clr-border: light-dark(\n oklch(90% 0.2 var(--primary-hue)),\n oklch(25% 0.1 var(--primary-hue))\n );\n\n /* Adding snow fall colour whilst we are using it */\n --clr-snow-fall: light-dark(\n oklch(25% 0.15 var(--primary-hue)),\n oklch(85% 0.2 var(--primary-hue))\n );\n }\n\n body {\n background-color: var(--clr-background);\n color: var(--clr-text);\n }\n}\n","@layer components {\n .note {\n display: flex;\n flex-direction: column;\n border: 1px solid var(--clr-border);\n border-radius: var(--border-radius);\n padding: 1ex 2ex;\n\n .e-content {\n > p:first-child {\n margin-block-start: 0;\n }\n\n .u-photo {\n width: 100%;\n height: auto;\n }\n }\n\n .syndication-links {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n\n svg {\n border-radius: 4px;\n width: auto;\n height: 1lh;\n }\n }\n }\n\n .reply-to {\n font-size: 85%;\n margin-inline: 2ex;\n padding-inline: 1ex;\n border: 1px solid var(--clr-border);\n border-bottom: none;\n border-top-left-radius: var(--border-radius);\n border-top-right-radius: var(--border-radius);\n }\n}\n","@layer components {\n body > header {\n display: grid;\n grid-template-columns: auto 1fr auto;\n grid-template-rows: auto auto;\n align-items: baseline;\n gap: 1rem;\n\n a {\n text-decoration: none;\n }\n\n h1 {\n margin: 0;\n text-wrap: nowrap;\n }\n\n nav {\n display: flex;\n flex-direction: row;\n gap: .5rem;\n\n @media screen and (width <= 1100px) {\n grid-row: 2;\n grid-column: 1 / span 3;\n flex-wrap: wrap;\n }\n }\n }\n}\n","@layer base {\n :root {\n --border-radius: 8px;\n }\n\n html {\n font-size: 125%;\n }\n\n body {\n display: grid;\n grid-template-columns: 1fr min(80ch, 80vw) 1fr;\n grid-template-rows: min-content 1fr min-content;\n padding-inline: 4vw;\n\n > header {\n grid-column: 1/-1;\n }\n\n > main {\n grid-column: 2/3;\n }\n\n > footer {\n grid-column: 1/-1;\n margin-block-start: 2ex;\n\n search form {\n display: flex;\n flex-direction: row;\n align-items: center;\n gap: 1ex;\n\n input {\n min-width: 0;\n }\n }\n }\n }\n\n .h-feed {\n display: flex;\n flex-direction: column;\n gap: 2ex;\n }\n}\n","@layer components {\n .pagination {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n div {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n }\n }\n}\n","@layer components {\n #theme-selector {\n button {\n appearance: none;\n border: none;\n background: none;\n\n &:hover {\n cursor: pointer;\n }\n }\n\n /* This is the element with the [popover] attribute */\n #theme-selector-dropdown {\n position: absolute;\n position-area: block-end span-inline-start;\n margin: 0;\n border: 2px solid var(--clr-border);\n background-color: var(--clr-background);\n color: var(--clr-text);\n\n fieldset {\n border: 0;\n display: flex;\n flex-direction: row;\n gap: 1ch;\n\n input {\n display: none;\n }\n }\n }\n\n /*\n * This is the element with the [popover] attribute\n * Here we are styling the open and closing animations\n */\n @media (prefers-reduced-motion: no-preference) {\n #theme-selector-dropdown {\n &:popover-open {\n transform: translateY(0) scale(1);\n opacity: 1;\n\n /*\n * Start styles for the opening transition.\n * Added to :popover-open, but after the opened styles.\n */\n @starting-style {\n transform: translateY(30px) scale(0);\n opacity: 0;\n }\n }\n\n /*\n * End styles for the closing transition.\n */\n transform: translateY(0) scale(0);\n opacity: 0;\n\n /*\n * Enumerate transitioning properties, including display and overlay.\n */\n transition: transform, opacity, display allow-discrete, overlay allow-discrete;\n transition-duration: 0.5s;\n transform-origin: top right;\n }\n }\n }\n\n ::view-transition-group(changing-theme) {\n animation-duration: 1.25s;\n }\n\n ::view-transition-new(changing-theme),\n ::view-transition-old(changing-theme) {\n mix-blend-mode: normal;\n }\n\n ::view-transition-new(changing-theme) {\n animation-name: reveal;\n }\n\n ::view-transition-old(changing-theme) {\n animation: none;\n }\n\n @keyframes reveal {\n from {\n clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);\n }\n\n to {\n clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);\n }\n }\n}\n","@layer reset {\n /* Sourced from https://piccalil.li/blog/a-more-modern-css-reset/ */\n\n /* Box sizing rules */\n *,\n *::before,\n *::after {\n box-sizing: border-box;\n }\n\n /* Prevent font size inflation */\n html {\n /* stylelint-disable property-no-vendor-prefix */\n -moz-text-size-adjust: none;\n -webkit-text-size-adjust: none;\n /* stylelint-enable property-no-vendor-prefix */\n text-size-adjust: none;\n }\n\n /* Remove default margin in favour of better control in authored CSS */\n body, h1, h2, h3, h4, p,\n figure, blockquote, dl, dd {\n margin-block-end: 0;\n }\n\n /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */\n ul[role='list'],\n ol[role='list'] {\n list-style: none;\n }\n\n /* Set core body defaults */\n body {\n line-height: 1.5;\n }\n\n /* Set shorter line heights on headings and interactive elements */\n h1, h2, h3, h4,\n button, input, label {\n line-height: 1.1;\n }\n\n /* Balance text wrapping on headings */\n h1, h2,\n h3, h4 {\n text-wrap: balance;\n }\n\n /* A elements that don't have a class get default styles */\n a:not([class]) {\n text-decoration-skip-ink: auto;\n color: currentcolor;\n }\n\n /* Make images easier to work with */\n img,\n picture {\n max-width: 100%;\n display: block;\n }\n\n /* Inherit fonts for inputs and buttons */\n input, button,\n textarea, select {\n font-family: inherit;\n font-size: inherit;\n }\n\n /* Make sure textareas without a rows attribute are not tiny */\n textarea:not([rows]) {\n min-height: 10em;\n }\n\n /* Anything that has been anchored to should have extra scroll margin */\n :target {\n scroll-margin-block: 5ex;\n }\n\n /* Disable view transition animations for users who don’t want them */\n @media (prefers-reduced-motion) {\n ::view-transition-group(*),\n ::view-transition-old(*),\n ::view-transition-new(*) {\n animation: none !important;\n }\n }\n}\n"],"names":[]} \ No newline at end of file diff --git a/public/assets/css/app.css.zst b/public/assets/css/app.css.zst index 5adb7c02d39790cbf69121da35d830d40bede8b1..962112506c2be8756dff8c812575f4d3d70d7b08 100644 GIT binary patch literal 1463 zcmdPcs{c3T3a_s&1D6W}j|M|-hnxZPh4~%#Kd|0d#J~N>pX(NFg))b&OgZurTi@L) zI4$?(|6IG4O$?hDwlmn(Ru>g|te5+7;$3j^y$!Q3+v`>z+5V*ZjOg#bRpw<~&6eWZ z*gEf@($%}ue)20vu7W-H^!X_@-f#ZDT*>Qt*sjQ?Pt3h-^8D^^j~+a4=Ht07ePE^0 z8P_;%yY}@ibE6kT|EO;Ikik2@wYJD6Ve*jzKK#AL>&y{#*ITPUpSSGl_kA!~ zEJ|K_(S3n$AU+vc1D3Y|I{I`QW1 z91R6&$!jiL8@-akOX{B72zqs_;LL?Ck*O044nMJydES5LMveBm%Qxmn3$+PM-J>XK z8b6Qgp~sAa_r5P@*42^txHg3$aQ4=W8JnZ~cogPvv@{;wF7wfH`=vl7fn|xEQkN$r z7<)}#ER%J`Jx_;0jLU1?k^r4&Io&^Pp6kg7XhbMHReSI(*k9Elk#WJx^<0~E*0|&x zXW5o=aed6EgKokStJJ(-Uuco%=SfW0$!*cz+08RwwK8ZfZ`-26BfU{`d5=E1_BoFG zf3fx@fpt;SqQqygyJrgVZ1-*TG)V9}toHxbsbv#W^*a}Et(V&R{H20@M}5^aOP;T3 z-crhMQ+7wMSN%NC&h!<}%ML|}qXpfsPY3CRa=h9b=dgCdbF~Z6D^~>luWnRdQMfkA z!zCp}#gl8&F-ML=33H~%-D4Db=)mL5CD_WL%-G4%%Q8_UMC-7Wut21bLBi)M1r^bv z*VAW~U7Pr2+ElNM6MrU#tYj~7+wi{cpOJ@H%*o!WQmb#2XmSyrpw-q7X z7ytPuuJT)1m%Z$oO_I-&B|A7Io9E9uHutCWl)W{7T|M=jgJmZ6&S2(yreNi;TkEo2 zK~uvunHb^qLCQ?(x~Y`{rY=fe_a+x53-<)*^v)|eaHnv(`_5CB9gh5b+A=Mco%^Qc zgXAwchpR5WIlHjttkdbW{4038Cp!c!ysLP`r26jM#-yj-#-D`hIi{vKUtBqRR`Xr0 zsR#FOw{b~l4^ZVYuHo~`of+(5mG&gw(dFKBA0C!t5fjq)@=55-%&le8(<Qd+BRBO&U6d#uO z7O29UKjG1?KRiE=hsD~lXEz?^(qYW+^YS@nrE#WWcUr}I(@xoE8~oZ1=_$TuUVHd~ z#2g#8g2>>hH92j<;TK)jv`C5QDzh)*JL1Z}kvUN(X5F`wR}GZwT|1YH?7Fkerg(12 zy@jvWTFsa-b=wJZe(424RtqkdZ2o$pPSS7U<7bJL$Hk6E3v1|$T|6KwC&is?wrI7! zKtPSjl6e)10wF_54;Ism6y^D7PB*R+3K_#{^}U|aPa0DGme8~^|S literal 1450 zcmdPcs{c1-J?~Q;1}^72-0BLxbJ#a9{g^Gb?IG9p-dT6gX>K{jAiVQbN?i%B@q;q1 zYGD=*K_}OZ3>z4>F!<^5y?E8s|3+@()4#JU|6W|@UgEXuc*w@P>&+i8^O#XA-`((I z?U_gWa&>mfEj;`9*uJOAl6QrE+h>KiEsEr~lyUA--ha~HwR+-*%eE|kZYl3sVYJ#c zOv|cWf5}?i^}2s#11mPv^|sm;?MR=<&6ttcFpYJK$pxd#yDLPcwAz!8e>I+UA?%~~ zkE^@go0YrleguS`JG*tfR!&}d|uq(g4TKSyEb-UX6gSA(V*S#>V zvzeZHf7g?evyul4&Nl7a*)eH@`+27SAA&dSkN2II(mqdlBFhS9qvy>##ng=*Zx;&$ z+uybIR(o(n$+By)$@eO?&K!+;_coDmzt%;8Dw`Y&7$!#D5t%vH*Nth@#7N#Le6tm* z7kySfK5fIzMTYiVULkIW&Q5w=Fvs2~`tr&he97g$oMbCH;AiXqWT5)unkjxy8mIGaWmW#4;mo9cu@Hxz6xQuaQTFb=Ae=;w*r+I&T zKY0Tyg9x{$o{x%1vC+|*dBvg}5*8H-Pt6jZ1)f()aAaKYay{2(0}Yp)<4?B6Tv#7+ z$<~eCz{I!h_4yWgE{Q|?B=Tyw_qtBAh)_?Sm?2ZB7^bc)X!>-|)kE)Rb$zLxJ#A?i zn_J^z6OOvm%MK|h=q!(%T%MD9`NXEFHUX`ntv5dB^xr)!Z(3&AePz-y5A&P%LP~X~ zfB(`EnC{{H`hZGXWK8_DqD-rR{I5(|tvk#r@0@aJ{rjG=QDsHp+9VH`loShh*! zy-4|26C%iTD|*WA_4`F8#fJwiKIRoZ)3>E_5lfU5ry=u1Egz+~-chC z{h3>EY{q1dOG-;Lf_xtbWwxO3ccmM=2HRE21W&OJgRaJSL+>~)x0k>)!3Hj&YC`# zIH6X_V!u%9sgowVJp8F%JE7mTxlu&kKENauUYFHEiutn;)B44mrCBT&U5Z7*a|W|h!+bD&Df*%c1G6npF6rI zuD|YZ>h(iIK0Bd)jo=a@O*lc51?WfjzU;W&i zs9R{xbhBZOvVq!3Sw3U6D`(n2O5OHTizxR<^gQvY@m^v9kCPnpjy)@@?Ai`@hnjrX zQZ!rapRz$Csqnh^DqpbLQ^zZ!3N*RmriT`S`{{w&~klO+K7*KAe3f&HC$7#w_>uot@&78fv)wG^7~h zPus4qIR9DJ^~~B^tB!8eWmwIr=e$NrVp-pU$V-<_Kbds$spgxbbquDRVyV{)mLZ-u+lyq~o?JjGl8C`WduS#_V@ T$^9(%{=*uL;AmFwf;H*@sn46T diff --git a/resources/css/notes.css b/resources/css/notes.css index ea85f2d2..8b4726c5 100644 --- a/resources/css/notes.css +++ b/resources/css/notes.css @@ -6,8 +6,15 @@ border-radius: var(--border-radius); padding: 1ex 2ex; - .e-content > p:first-child { - margin-block-start: 0; + .e-content { + > p:first-child { + margin-block-start: 0; + } + + .u-photo { + width: 100%; + height: auto; + } } .syndication-links { diff --git a/tests/Unit/Jobs/ProcessMediaJobTest.php b/tests/Unit/Jobs/ProcessMediaJobTest.php index e3fa2059..a405fde8 100644 --- a/tests/Unit/Jobs/ProcessMediaJobTest.php +++ b/tests/Unit/Jobs/ProcessMediaJobTest.php @@ -43,7 +43,8 @@ class ProcessMediaJobTest extends TestCase { $manager = app()->make(ImageManager::class); Storage::disk('local')->put('media/test-image.jpg', file_get_contents(__DIR__.'/../../test-image.jpg')); - $job = new ProcessMedia('test-image.jpg'); + ray(Storage::disk('local')->get('media/test-image.jpg')); + $job = new ProcessMedia('media/test-image.jpg'); $job->handle($manager); // These need to look in public disk From 9e788e0fe8db62d63e8ccf4feb962b4a2efbe79f Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 4 Jan 2026 10:07:25 +0000 Subject: [PATCH 04/26] Images can be uploaded with alt text This means associating images to notes via a pivot table, we also finish off the migration of medai from S3. --- app/Console/Commands/MigrateMedia.php | 92 +++++++++++++++++++ app/Models/Media.php | 8 +- app/Models/Note.php | 8 +- app/Services/NoteService.php | 38 ++++++-- ...1_110617_create_media_note_pivot_table.php | 33 +++++++ database/seeders/NotesTableSeeder.php | 8 +- resources/views/templates/note.blade.php | 2 +- tests/Unit/MediaTest.php | 13 ++- tests/Unit/NotesTest.php | 17 ++++ 9 files changed, 200 insertions(+), 19 deletions(-) create mode 100644 app/Console/Commands/MigrateMedia.php create mode 100644 database/migrations/2025_12_31_110617_create_media_note_pivot_table.php diff --git a/app/Console/Commands/MigrateMedia.php b/app/Console/Commands/MigrateMedia.php new file mode 100644 index 00000000..987da9af --- /dev/null +++ b/app/Console/Commands/MigrateMedia.php @@ -0,0 +1,92 @@ +hasTable('media_note')) { + $this->error('The table "media_note" does not exist.'); + + exit(1); + } + + // Load all media already saved in `media_endpoint` table + $this->line('Updating existing local media'); + $mediaEndpointMedia = Media::all(); + // Save relationship in new `media_note` table based on `media_endpoint.note_id` + $this->withProgressBar($mediaEndpointMedia, function (Media $mediaEndpointMediaItem) { + $note = Note::find($mediaEndpointMediaItem->note_id); + if ($note) { + $note->media()->attach($mediaEndpointMediaItem->id); + } + }); + + // Load all media records from `media` table + $this->line(''); + $this->line('Migrating old media from S3'); + $oldMedia = DB::table('media')->get(); + foreach ($oldMedia as $oldMediaItem) { + // We only want to process the S3 media + if ($oldMediaItem->disk !== 's3') { + $this->warn('Original media item never stored in S3'); + + continue; + } + + // Check media exists in S3 + if (! Storage::disk('s3')->exists($oldMediaItem->id.DIRECTORY_SEPARATOR.$oldMediaItem->file_name)) { + $this->warn('Original media item not found in S3'); + + continue; + } + // We want to just copy the file, check it does not already exist locally + if (Storage::disk('public')->exists('media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name)) { + $this->warn('File already exists locally with filename of original media item'); + + continue; + } + // Copy the file + Storage::disk('public')->writeStream('media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, Storage::disk('s3')->readStream($oldMediaItem->id.DIRECTORY_SEPARATOR.$oldMediaItem->file_name)); + + // Save relationship based on `media.model_id` + // I have already checked they are all notes + $note = $oldMediaItem->model_id; + $newMediaItem = Media::create([ + 'path' => 'media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, + 'type' => 'image', + ]); + $note->media()->attach($newMediaItem->id); + + $this->info('Media item migrated from S3'); + } + + $this->line(''); + $this->line('Migration finished'); + } +} diff --git a/app/Models/Media.php b/app/Models/Media.php index 3d923bed..b25e889a 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -7,7 +7,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Support\Str; class Media extends Model @@ -20,9 +20,11 @@ class Media extends Model /** @var array */ protected $fillable = ['token', 'path', 'type', 'image_widths']; - public function note(): BelongsTo + public function notes(): BelongsToMany { - return $this->belongsTo(Note::class); + return $this->belongsToMany(Note::class) + ->withPivot('alt_text', 'order') + ->withTimestamps(); } protected function url(): Attribute diff --git a/app/Models/Note.php b/app/Models/Note.php index 74533443..91f4b8a1 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -14,7 +14,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Cache; @@ -92,9 +91,12 @@ class Note extends Model return $this->belongsTo(Place::class); } - public function media(): HasMany + public function media(): BelongsToMany { - return $this->hasMany(Media::class); + return $this->BelongsToMany(Media::class) + ->withPivot('alt_text', 'order') + ->withTimestamps() + ->orderBy('order'); } /** diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php index c80a450c..096f7f25 100644 --- a/app/Services/NoteService.php +++ b/app/Services/NoteService.php @@ -51,8 +51,11 @@ class NoteService // $note->instagram_url = $this->getInstagramUrl($request); - foreach ($this->getMedia($data) as $media) { - $note->media()->save($media); + foreach ($this->getMedia($data) as $index => $media) { + $note->media()->attach($media['value']->id, [ + 'alt_text' => $media['alt_text'], + 'order' => $index, + ]); } $note->save(); @@ -195,16 +198,37 @@ class NoteService if (isset($photos)) { foreach ((array) $photos as $photo) { + // $photo can be a string of the URL opf the photo + // or it can be an object with a `value` and `alt` + $photoUrl = null; + $photoAlt = null; + if (is_string($photo)) { + $photoUrl = $photo; + } elseif (is_array($photo)) { + $photoUrl = $photo['value']; + $photoAlt = $photo['alt']; + } + + if (empty($photoUrl)) { + continue; + } + // check the media was uploaded to my endpoint, and use path - if (Str::startsWith($photo, config('filesystems.disks.public.url'))) { - $path = substr($photo, strlen(config('filesystems.disks.public.url'))); - $media[] = Media::where('path', ltrim($path, '/'))->firstOrFail(); + if (Str::startsWith($photoUrl, config('filesystems.disks.public.url'))) { + $path = substr($photoUrl, strlen(config('filesystems.disks.public.url'))); + $media[] = [ + 'value' => Media::where('path', ltrim($path, '/'))->firstOrFail(), + 'alt' => $photoAlt, + ]; } else { - $newMedia = Media::firstOrNew(['path' => $photo]); + $newMedia = Media::firstOrNew(['path' => $photoUrl]); // currently assuming this is a photo from Swarm or OwnYourGram $newMedia->type = 'image'; $newMedia->save(); - $media[] = $newMedia; + $media[] = [ + 'value' => $newMedia, + 'alt' => $photoAlt, + ]; } } } diff --git a/database/migrations/2025_12_31_110617_create_media_note_pivot_table.php b/database/migrations/2025_12_31_110617_create_media_note_pivot_table.php new file mode 100644 index 00000000..4017aefb --- /dev/null +++ b/database/migrations/2025_12_31_110617_create_media_note_pivot_table.php @@ -0,0 +1,33 @@ +id(); + $table->foreignId('note_id')->constrained()->onDelete('cascade'); + $table->foreignId('media_id')->constrained('media_endpoint')->onDelete('cascade'); + $table->text('alt_text')->nullable(); + $table->integer('order')->default(0); + $table->timestamps(); + + $table->unique(['note_id', 'media_id']); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('media_note'); + } +}; diff --git a/database/seeders/NotesTableSeeder.php b/database/seeders/NotesTableSeeder.php index 630cfda6..ea00c7d5 100644 --- a/database/seeders/NotesTableSeeder.php +++ b/database/seeders/NotesTableSeeder.php @@ -84,7 +84,9 @@ class NotesTableSeeder extends Seeder // copy aaron’s profile pic in place $spl = new SplFileInfo(public_path() . '/assets/profile-images/aaronparecki.com'); if ($spl->isDir() === false) { - mkdir(public_path() . '/assets/profile-images/aaronparecki.com', 0755); + if (! mkdir($concurrentDirectory = public_path() . '/assets/profile-images/aaronparecki.com', 0755) && ! is_dir($concurrentDirectory)) { + throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory)); + } copy(base_path() . '/tests/aaron.png', public_path() . '/assets/profile-images/aaronparecki.com/image'); } @@ -171,7 +173,9 @@ class NotesTableSeeder extends Seeder $noteWithOnlyImage->setCreatedAt($now); $noteWithOnlyImage->setUpdatedAt($now); $noteWithOnlyImage->save(); - $noteWithOnlyImage->media()->save($media); + $noteWithOnlyImage->media()->attach($media->id, [ + 'alt_text' => 'Test alt text', + ]); DB::table('notes') ->where('id', $noteWithOnlyImage->id) ->update(['updated_at' => $now->toDateTimeString()]); diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index 68c9d2f6..e8418184 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -12,7 +12,7 @@ @foreach($note->media as $media) @if($media->type === 'image') - image_widths !== null) srcset="{{ $media->url }} {{ $media->image_widths }}w, {{ $media->mediumurl }} 1000w, {{ $media->smallurl }} 500w" sizes="80vh"@endif> + {{ $media->pivot->alt_text }}image_widths !== null) srcset="{{ $media->url }} {{ $media->image_widths }}w, {{ $media->mediumurl }} 1000w, {{ $media->smallurl }} 500w" sizes="min(80ch,80vw)" @else src="{{ $media->url }}" @endif> @endif @if($media->type === 'audio') diff --git a/tests/Unit/MediaTest.php b/tests/Unit/MediaTest.php index 642d797f..675f761d 100644 --- a/tests/Unit/MediaTest.php +++ b/tests/Unit/MediaTest.php @@ -15,11 +15,18 @@ class MediaTest extends TestCase use RefreshDatabase; #[Test] - public function get_the_note_that_media_instance_belongs_to(): void + public function media_can_belong_to_multiple_notes(): void { - $media = Media::factory()->for(Note::factory())->create(); + $media = Media::factory()->create(); + $note1 = Note::factory()->create(); + $note2 = Note::factory()->create(); - $this->assertInstanceOf(Note::class, $media->note); + $note1->media()->attach($media->id, ['alt_text' => 'Alt text for note 1']); + $note2->media()->attach($media->id, ['alt_text' => 'Alt text for note 2']); + + $this->assertCount(2, $media->notes); + $this->assertTrue($media->notes->contains($note1)); + $this->assertTrue($media->notes->contains($note2)); } #[Test] diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php index e71f513a..330d93fe 100644 --- a/tests/Unit/NotesTest.php +++ b/tests/Unit/NotesTest.php @@ -434,4 +434,21 @@ class NotesTest extends TestCase $this->assertSame($expected, $note->note); } + + #[Test] + public function note_can_have_media_with_alt_text(): void + { + $note = Note::factory()->create(); + $media = Media::factory()->create(); + + $note->media()->attach($media->id, [ + 'alt_text' => 'Test alt text', + 'order' => 0, + ]); + + $note->refresh(); + + $this->assertCount(1, $note->media); + $this->assertEquals('Test alt text', $note->media->first()->pivot->alt_text); + } } From 51780523b4954d4cecbe1deb50ffabbe2c8b4a30 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 4 Jan 2026 10:22:32 +0000 Subject: [PATCH 05/26] Fix unit tests --- app/Services/NoteService.php | 2 +- tests/Feature/MicropubControllerTest.php | 7 ++++--- tests/Unit/Jobs/ProcessMediaJobTest.php | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php index 096f7f25..ff77ef7b 100644 --- a/app/Services/NoteService.php +++ b/app/Services/NoteService.php @@ -53,7 +53,7 @@ class NoteService foreach ($this->getMedia($data) as $index => $media) { $note->media()->attach($media['value']->id, [ - 'alt_text' => $media['alt_text'], + 'alt_text' => $media['alt'], 'order' => $index, ]); } diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php index 3d28f399..8d10fc63 100644 --- a/tests/Feature/MicropubControllerTest.php +++ b/tests/Feature/MicropubControllerTest.php @@ -236,11 +236,11 @@ class MicropubControllerTest extends TestCase * Test a valid micropub requests using JSON syntax creates a new note. */ #[Test] - public function micropub_client_api_request_creates_new_note(): void + public function micropub_client_api_request_creates_new_note_with_photo(): void { Queue::fake(); Media::create([ - 'path' => 'test-photo.jpg', + 'path' => 'media/test-photo.jpg', 'type' => 'image', ]); SyndicationTarget::factory()->create([ @@ -265,12 +265,13 @@ class MicropubControllerTest extends TestCase 'https://mastodon.social/@jonnybarnes', 'https://bsky.app/profile/jonnybarnes.uk', ], - 'photo' => [config('filesystems.disks.s3.url') . '/test-photo.jpg'], + 'photo' => [config('filesystems.disks.public.url') . '/media/test-photo.jpg'], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); $response + ->dump() ->assertStatus(201) ->assertJson(['response' => 'created']); Queue::assertPushed(SendWebMentions::class); diff --git a/tests/Unit/Jobs/ProcessMediaJobTest.php b/tests/Unit/Jobs/ProcessMediaJobTest.php index a405fde8..29eb780c 100644 --- a/tests/Unit/Jobs/ProcessMediaJobTest.php +++ b/tests/Unit/Jobs/ProcessMediaJobTest.php @@ -43,7 +43,6 @@ class ProcessMediaJobTest extends TestCase { $manager = app()->make(ImageManager::class); Storage::disk('local')->put('media/test-image.jpg', file_get_contents(__DIR__.'/../../test-image.jpg')); - ray(Storage::disk('local')->get('media/test-image.jpg')); $job = new ProcessMedia('media/test-image.jpg'); $job->handle($manager); From 4dd4977dd9902d6ad5aba225cef1f0564c80695d Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 8 Jan 2026 18:21:28 +0000 Subject: [PATCH 06/26] Fix issue with migrating old S3 media --- app/Console/Commands/MigrateMedia.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/MigrateMedia.php b/app/Console/Commands/MigrateMedia.php index 987da9af..008a263f 100644 --- a/app/Console/Commands/MigrateMedia.php +++ b/app/Console/Commands/MigrateMedia.php @@ -71,18 +71,27 @@ class MigrateMedia extends Command continue; } - // Copy the file - Storage::disk('public')->writeStream('media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, Storage::disk('s3')->readStream($oldMediaItem->id.DIRECTORY_SEPARATOR.$oldMediaItem->file_name)); // Save relationship based on `media.model_id` // I have already checked they are all notes - $note = $oldMediaItem->model_id; + $noteId = $oldMediaItem->model_id; + $note = Note::find($noteId); + if (! $note) { + $this->warn('Note no longer exists'); + + continue; + } + + // Create media entry in database and attach to note $newMediaItem = Media::create([ 'path' => 'media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, 'type' => 'image', ]); $note->media()->attach($newMediaItem->id); + // Copy the file + Storage::disk('public')->writeStream('media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, Storage::disk('s3')->readStream($oldMediaItem->id.DIRECTORY_SEPARATOR.$oldMediaItem->file_name)); + $this->info('Media item migrated from S3'); } From a5f146125b81a3b1d92eb10b0e82dcb35d7d3006 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 9 Jan 2026 14:21:37 +0000 Subject: [PATCH 07/26] Allow migrate media command to be re-run --- app/Console/Commands/MigrateMedia.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/MigrateMedia.php b/app/Console/Commands/MigrateMedia.php index 008a263f..9d81ed34 100644 --- a/app/Console/Commands/MigrateMedia.php +++ b/app/Console/Commands/MigrateMedia.php @@ -43,7 +43,7 @@ class MigrateMedia extends Command $this->withProgressBar($mediaEndpointMedia, function (Media $mediaEndpointMediaItem) { $note = Note::find($mediaEndpointMediaItem->note_id); if ($note) { - $note->media()->attach($mediaEndpointMediaItem->id); + $note->media()->syncWithoutDetaching($mediaEndpointMediaItem->id); } }); @@ -87,7 +87,7 @@ class MigrateMedia extends Command 'path' => 'media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, 'type' => 'image', ]); - $note->media()->attach($newMediaItem->id); + $note->media()->syncWithoutDetaching($newMediaItem->id); // Copy the file Storage::disk('public')->writeStream('media'.DIRECTORY_SEPARATOR.$oldMediaItem->file_name, Storage::disk('s3')->readStream($oldMediaItem->id.DIRECTORY_SEPARATOR.$oldMediaItem->file_name)); From a342b432d4b9f3f3af1322a26dd61a72ca8c797a Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 21 Feb 2026 17:06:37 +0000 Subject: [PATCH 08/26] Update dependencies --- composer.json | 39 +- composer.lock | 1617 ++++++++++------------ jbuk_dev_backup.dump | Bin 0 -> 71446 bytes package-lock.json | 1327 +++++++++--------- package.json | 10 +- public/assets/css/app.css | 2 +- public/assets/css/app.css.br | Bin 1217 -> 1211 bytes public/assets/css/app.css.map | 2 +- public/assets/css/app.css.zst | Bin 1463 -> 1466 bytes tests/Feature/MicropubControllerTest.php | 1 - 10 files changed, 1487 insertions(+), 1511 deletions(-) create mode 100644 jbuk_dev_backup.dump diff --git a/composer.json b/composer.json index 7727ddfa..df4106ba 100644 --- a/composer.json +++ b/composer.json @@ -37,18 +37,17 @@ "web-auth/webauthn-lib": "^5.0" }, "require-dev": { - "barryvdh/laravel-debugbar": "^3.0", + "barryvdh/laravel-debugbar": "^4.0.9", "barryvdh/laravel-ide-helper": "^3.0", - "fakerphp/faker": "^1.9.2", + "fakerphp/faker": "^1.23", "laravel/dusk": "^8.0", - "laravel/pail": "^1.2", - "laravel/pint": "^1.0", - "laravel/sail": "^1.18", + "laravel/pail": "^1.2.2", + "laravel/pint": "^1.24", + "laravel/sail": "^1.41", "mockery/mockery": "^1.4.4", - "nunomaduro/collision": "^8.1", - "openai-php/client": "^0.17.1", + "nunomaduro/collision": "^8.6", "phpunit/php-code-coverage": "^11.0", - "phpunit/phpunit": "^11.0", + "phpunit/phpunit": "^11.5.50", "spatie/laravel-ray": "^1.12", "spatie/x-ray": "^1.2" }, @@ -68,6 +67,22 @@ } }, "scripts": { + "setup": [ + "composer install", + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"", + "@php artisan key:generate", + "@php artisan migrate --force", + "npm install", + "npm run build" + ], + "dev": [ + "Composer\\Config::disableProcessTimeout", + "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1 --timeout=0\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others" + ], + "test": [ + "@php artisan config:clear --ansi", + "@php artisan test" + ], "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi" @@ -83,9 +98,8 @@ "@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"", "@php artisan migrate --graceful --ansi" ], - "dev": [ - "Composer\\Config::disableProcessTimeout", - "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite" + "pre-package-uninstall": [ + "Illuminate\\Foundation\\ComposerScripts::prePackageUninstall" ] }, "extra": { @@ -99,8 +113,7 @@ "sort-packages": true, "allow-plugins": { "pestphp/pest-plugin": true, - "php-http/discovery": true, - "composer/installers": true + "php-http/discovery": true } }, "minimum-stability": "stable", diff --git a/composer.lock b/composer.lock index 17106f7f..4852a4cc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0373f4b7b0c26e82da2f958456dbe431", + "content-hash": "a2000cad630226efe34be92840cdd67a", "packages": [ { "name": "aws/aws-crt-php", @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.367.0", + "version": "3.370.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "6ce549c3efe117e76f1f878ae8463d95b838ef9d" + "reference": "3cfb2c787c43efa546ba3b6b596956cbef5cdd53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6ce549c3efe117e76f1f878ae8463d95b838ef9d", - "reference": "6ce549c3efe117e76f1f878ae8463d95b838ef9d", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3cfb2c787c43efa546ba3b6b596956cbef5cdd53", + "reference": "3cfb2c787c43efa546ba3b6b596956cbef5cdd53", "shasum": "" }, "require": { @@ -85,7 +85,7 @@ "mtdowling/jmespath.php": "^2.8.0", "php": ">=8.1", "psr/http-message": "^1.0 || ^2.0", - "symfony/filesystem": "^v6.4.3 || ^v7.1.0 || ^v8.0.0" + "symfony/filesystem": "^v5.4.45 || ^v6.4.3 || ^v7.1.0 || ^v8.0.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", @@ -153,31 +153,31 @@ "support": { "forum": "https://github.com/aws/aws-sdk-php/discussions", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.367.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.370.0" }, - "time": "2025-12-10T19:12:49+00:00" + "time": "2026-02-20T19:09:33+00:00" }, { "name": "brick/math", - "version": "0.13.1", + "version": "0.14.8", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04" + "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04", - "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04", + "url": "https://api.github.com/repos/brick/math/zipball/63422359a44b7f06cae63c3b429b59e8efcc0629", + "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^8.2" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^10.1", - "vimeo/psalm": "6.8.8" + "phpstan/phpstan": "2.1.22", + "phpunit/phpunit": "^11.5" }, "type": "library", "autoload": { @@ -207,7 +207,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.13.1" + "source": "https://github.com/brick/math/tree/0.14.8" }, "funding": [ { @@ -215,7 +215,7 @@ "type": "github" } ], - "time": "2025-03-29T13:50:30+00:00" + "time": "2026-02-10T14:33:43+00:00" }, { "name": "carbonphp/carbon-doctrine-types", @@ -661,29 +661,29 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" + "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", - "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", + "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "conflict": { - "phpunit/phpunit": "<=7.5 || >=13" + "phpunit/phpunit": "<=7.5 || >=14" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12 || ^13", - "phpstan/phpstan": "1.4.10 || 2.1.11", + "doctrine/coding-standard": "^9 || ^12 || ^14", + "phpstan/phpstan": "1.4.10 || 2.1.30", "phpstan/phpstan-phpunit": "^1.0 || ^2", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12.4 || ^13.0", "psr/log": "^1 || ^2 || ^3" }, "suggest": { @@ -703,9 +703,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.5" + "source": "https://github.com/doctrine/deprecations/tree/1.1.6" }, - "time": "2025-04-07T20:06:18+00:00" + "time": "2026-02-07T07:09:04+00:00" }, { "name": "doctrine/inflector", @@ -1078,24 +1078,24 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.1.3", + "version": "v1.1.4", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "3ba905c11371512af9d9bdd27d99b782216b6945" + "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945", - "reference": "3ba905c11371512af9d9bdd27d99b782216b6945", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/e01f4a821471308ba86aa202fed6698b6b695e3b", + "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.3" + "phpoption/phpoption": "^1.9.5" }, "require-dev": { - "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" + "phpunit/phpunit": "^8.5.41 || ^9.6.22 || ^10.5.45 || ^11.5.7" }, "type": "library", "autoload": { @@ -1124,7 +1124,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.4" }, "funding": [ { @@ -1136,7 +1136,7 @@ "type": "tidelift" } ], - "time": "2024-07-20T21:45:45+00:00" + "time": "2025-12-27T19:43:20+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1702,16 +1702,16 @@ }, { "name": "intervention/gif", - "version": "4.2.2", + "version": "4.2.4", "source": { "type": "git", "url": "https://github.com/Intervention/gif.git", - "reference": "5999eac6a39aa760fb803bc809e8909ee67b451a" + "reference": "c3598a16ebe7690cd55640c44144a9df383ea73c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/gif/zipball/5999eac6a39aa760fb803bc809e8909ee67b451a", - "reference": "5999eac6a39aa760fb803bc809e8909ee67b451a", + "url": "https://api.github.com/repos/Intervention/gif/zipball/c3598a16ebe7690cd55640c44144a9df383ea73c", + "reference": "c3598a16ebe7690cd55640c44144a9df383ea73c", "shasum": "" }, "require": { @@ -1750,7 +1750,7 @@ ], "support": { "issues": "https://github.com/Intervention/gif/issues", - "source": "https://github.com/Intervention/gif/tree/4.2.2" + "source": "https://github.com/Intervention/gif/tree/4.2.4" }, "funding": [ { @@ -1766,20 +1766,20 @@ "type": "ko_fi" } ], - "time": "2025-03-29T07:46:21+00:00" + "time": "2026-01-04T09:27:23+00:00" }, { "name": "intervention/image", - "version": "3.11.5", + "version": "3.11.7", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "76e96d3809d53dd8d597005634a733d4b2f6c2c3" + "reference": "2159bcccff18f09d2a392679b81a82c5a003f9bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/76e96d3809d53dd8d597005634a733d4b2f6c2c3", - "reference": "76e96d3809d53dd8d597005634a733d4b2f6c2c3", + "url": "https://api.github.com/repos/Intervention/image/zipball/2159bcccff18f09d2a392679b81a82c5a003f9bb", + "reference": "2159bcccff18f09d2a392679b81a82c5a003f9bb", "shasum": "" }, "require": { @@ -1826,7 +1826,7 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/3.11.5" + "source": "https://github.com/Intervention/image/tree/3.11.7" }, "funding": [ { @@ -1842,7 +1842,7 @@ "type": "ko_fi" } ], - "time": "2025-11-29T11:18:34+00:00" + "time": "2026-02-19T13:11:17+00:00" }, { "name": "jonnybarnes/indieweb", @@ -2011,16 +2011,16 @@ }, { "name": "laravel/framework", - "version": "v12.42.0", + "version": "v12.52.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "509b33095564c5165366d81bbaa0afaac28abe75" + "reference": "d5511fa74f4608dbb99864198b1954042aa8d5a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/509b33095564c5165366d81bbaa0afaac28abe75", - "reference": "509b33095564c5165366d81bbaa0afaac28abe75", + "url": "https://api.github.com/repos/laravel/framework/zipball/d5511fa74f4608dbb99864198b1954042aa8d5a7", + "reference": "d5511fa74f4608dbb99864198b1954042aa8d5a7", "shasum": "" }, "require": { @@ -2133,7 +2133,7 @@ "league/flysystem-sftp-v3": "^3.25.1", "mockery/mockery": "^1.6.10", "opis/json-schema": "^2.4.1", - "orchestra/testbench-core": "^10.8.1", + "orchestra/testbench-core": "^10.9.0", "pda/pheanstalk": "^5.0.6|^7.0.0", "php-http/discovery": "^1.15", "phpstan/phpstan": "^2.0", @@ -2229,40 +2229,40 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-12-09T15:51:23+00:00" + "time": "2026-02-17T17:07:04+00:00" }, { "name": "laravel/horizon", - "version": "v5.40.2", + "version": "v5.44.0", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "005e5638478db9e25f7ae5cfb30c56846fbad793" + "reference": "00c21e4e768112cce3f4fe576d75956dfc423de2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/005e5638478db9e25f7ae5cfb30c56846fbad793", - "reference": "005e5638478db9e25f7ae5cfb30c56846fbad793", + "url": "https://api.github.com/repos/laravel/horizon/zipball/00c21e4e768112cce3f4fe576d75956dfc423de2", + "reference": "00c21e4e768112cce3f4fe576d75956dfc423de2", "shasum": "" }, "require": { "ext-json": "*", "ext-pcntl": "*", "ext-posix": "*", - "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0", - "illuminate/queue": "^9.21|^10.0|^11.0|^12.0", - "illuminate/support": "^9.21|^10.0|^11.0|^12.0", + "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0|^13.0", + "illuminate/queue": "^9.21|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^9.21|^10.0|^11.0|^12.0|^13.0", "nesbot/carbon": "^2.17|^3.0", "php": "^8.0", "ramsey/uuid": "^4.0", - "symfony/console": "^6.0|^7.0", - "symfony/error-handler": "^6.0|^7.0", + "symfony/console": "^6.0|^7.0|^8.0", + "symfony/error-handler": "^6.0|^7.0|^8.0", "symfony/polyfill-php83": "^1.28", - "symfony/process": "^6.0|^7.0" + "symfony/process": "^6.0|^7.0|^8.0" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^7.55|^8.36|^9.15|^10.8", + "orchestra/testbench": "^7.55|^8.36|^9.15|^10.8|^11.0", "phpstan/phpstan": "^1.10|^2.0", "predis/predis": "^1.1|^2.0|^3.0" }, @@ -2306,36 +2306,36 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.40.2" + "source": "https://github.com/laravel/horizon/tree/v5.44.0" }, - "time": "2025-11-28T20:12:12+00:00" + "time": "2026-02-10T18:18:08+00:00" }, { "name": "laravel/prompts", - "version": "v0.3.8", + "version": "v0.3.13", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "096748cdfb81988f60090bbb839ce3205ace0d35" + "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/096748cdfb81988f60090bbb839ce3205ace0d35", - "reference": "096748cdfb81988f60090bbb839ce3205ace0d35", + "url": "https://api.github.com/repos/laravel/prompts/zipball/ed8c466571b37e977532fb2fd3c272c784d7050d", + "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", "ext-mbstring": "*", "php": "^8.1", - "symfony/console": "^6.2|^7.0" + "symfony/console": "^6.2|^7.0|^8.0" }, "conflict": { "illuminate/console": ">=10.17.0 <10.25.0", "laravel/framework": ">=10.17.0 <10.25.0" }, "require-dev": { - "illuminate/collections": "^10.0|^11.0|^12.0", + "illuminate/collections": "^10.0|^11.0|^12.0|^13.0", "mockery/mockery": "^1.5", "pestphp/pest": "^2.3|^3.4|^4.0", "phpstan/phpstan": "^1.12.28", @@ -2365,36 +2365,36 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.3.8" + "source": "https://github.com/laravel/prompts/tree/v0.3.13" }, - "time": "2025-11-21T20:52:52+00:00" + "time": "2026-02-06T12:17:10+00:00" }, { "name": "laravel/sanctum", - "version": "v4.2.1", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "f5fb373be39a246c74a060f2cf2ae2c2145b3664" + "reference": "e3b85d6e36ad00e5db2d1dcc27c81ffdf15cbf76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/f5fb373be39a246c74a060f2cf2ae2c2145b3664", - "reference": "f5fb373be39a246c74a060f2cf2ae2c2145b3664", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/e3b85d6e36ad00e5db2d1dcc27c81ffdf15cbf76", + "reference": "e3b85d6e36ad00e5db2d1dcc27c81ffdf15cbf76", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/console": "^11.0|^12.0", - "illuminate/contracts": "^11.0|^12.0", - "illuminate/database": "^11.0|^12.0", - "illuminate/support": "^11.0|^12.0", + "illuminate/console": "^11.0|^12.0|^13.0", + "illuminate/contracts": "^11.0|^12.0|^13.0", + "illuminate/database": "^11.0|^12.0|^13.0", + "illuminate/support": "^11.0|^12.0|^13.0", "php": "^8.2", - "symfony/console": "^7.0" + "symfony/console": "^7.0|^8.0" }, "require-dev": { "mockery/mockery": "^1.6", - "orchestra/testbench": "^9.15|^10.8", + "orchestra/testbench": "^9.15|^10.8|^11.0", "phpstan/phpstan": "^1.10" }, "type": "library", @@ -2430,32 +2430,32 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2025-11-21T13:59:03+00:00" + "time": "2026-02-07T17:19:31+00:00" }, { "name": "laravel/scout", - "version": "v10.22.1", + "version": "v10.24.0", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "13ed8e0eeaddd894bf360b85cb873980de19dbaf" + "reference": "f9864d9a727a0c0d6b95e08ed92df8c301ae6d2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/13ed8e0eeaddd894bf360b85cb873980de19dbaf", - "reference": "13ed8e0eeaddd894bf360b85cb873980de19dbaf", + "url": "https://api.github.com/repos/laravel/scout/zipball/f9864d9a727a0c0d6b95e08ed92df8c301ae6d2c", + "reference": "f9864d9a727a0c0d6b95e08ed92df8c301ae6d2c", "shasum": "" }, "require": { - "illuminate/bus": "^9.0|^10.0|^11.0|^12.0", - "illuminate/contracts": "^9.0|^10.0|^11.0|^12.0", - "illuminate/database": "^9.0|^10.0|^11.0|^12.0", - "illuminate/http": "^9.0|^10.0|^11.0|^12.0", - "illuminate/pagination": "^9.0|^10.0|^11.0|^12.0", - "illuminate/queue": "^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^9.0|^10.0|^11.0|^12.0", + "illuminate/bus": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/contracts": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/database": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/http": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/pagination": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/queue": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0|^13.0", "php": "^8.0", - "symfony/console": "^6.0|^7.0" + "symfony/console": "^6.0|^7.0|^8.0" }, "conflict": { "algolia/algoliasearch-client-php": "<3.2.0|>=5.0.0" @@ -2464,7 +2464,7 @@ "algolia/algoliasearch-client-php": "^3.2|^4.0", "meilisearch/meilisearch-php": "^1.0", "mockery/mockery": "^1.0", - "orchestra/testbench": "^7.31|^8.36|^9.15|^10.8", + "orchestra/testbench": "^7.31|^8.36|^9.15|^10.8|^11.0", "php-http/guzzle7-adapter": "^1.0", "phpstan/phpstan": "^1.10", "typesense/typesense-php": "^4.9.3" @@ -2510,31 +2510,31 @@ "issues": "https://github.com/laravel/scout/issues", "source": "https://github.com/laravel/scout" }, - "time": "2025-11-25T15:19:35+00:00" + "time": "2026-02-10T18:44:39+00:00" }, { "name": "laravel/serializable-closure", - "version": "v2.0.7", + "version": "v2.0.9", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "cb291e4c998ac50637c7eeb58189c14f5de5b9dd" + "reference": "8f631589ab07b7b52fead814965f5a800459cb3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/cb291e4c998ac50637c7eeb58189c14f5de5b9dd", - "reference": "cb291e4c998ac50637c7eeb58189c14f5de5b9dd", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/8f631589ab07b7b52fead814965f5a800459cb3e", + "reference": "8f631589ab07b7b52fead814965f5a800459cb3e", "shasum": "" }, "require": { "php": "^8.1" }, "require-dev": { - "illuminate/support": "^10.0|^11.0|^12.0", + "illuminate/support": "^10.0|^11.0|^12.0|^13.0", "nesbot/carbon": "^2.67|^3.0", "pestphp/pest": "^2.36|^3.0|^4.0", "phpstan/phpstan": "^2.0", - "symfony/var-dumper": "^6.2.0|^7.0.0" + "symfony/var-dumper": "^6.2.0|^7.0.0|^8.0.0" }, "type": "library", "extra": { @@ -2571,20 +2571,20 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2025-11-21T20:52:36+00:00" + "time": "2026-02-03T06:55:34+00:00" }, { "name": "laravel/tinker", - "version": "v2.10.2", + "version": "v2.11.1", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "3bcb5f62d6f837e0f093a601e26badafb127bd4c" + "reference": "c9f80cc835649b5c1842898fb043f8cc098dd741" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/3bcb5f62d6f837e0f093a601e26badafb127bd4c", - "reference": "3bcb5f62d6f837e0f093a601e26badafb127bd4c", + "url": "https://api.github.com/repos/laravel/tinker/zipball/c9f80cc835649b5c1842898fb043f8cc098dd741", + "reference": "c9f80cc835649b5c1842898fb043f8cc098dd741", "shasum": "" }, "require": { @@ -2593,7 +2593,7 @@ "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "php": "^7.2.5|^8.0", "psy/psysh": "^0.11.1|^0.12.0", - "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0" + "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0|^8.0" }, "require-dev": { "mockery/mockery": "~1.3.3|^1.4.2", @@ -2635,9 +2635,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.10.2" + "source": "https://github.com/laravel/tinker/tree/v2.11.1" }, - "time": "2025-11-20T16:29:12+00:00" + "time": "2026-02-06T14:12:35+00:00" }, { "name": "lcobucci/jwt", @@ -2903,16 +2903,16 @@ }, { "name": "league/flysystem", - "version": "3.30.2", + "version": "3.31.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "5966a8ba23e62bdb518dd9e0e665c2dbd4b5b277" + "reference": "1717e0b3642b0df65ecb0cc89cdd99fa840672ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5966a8ba23e62bdb518dd9e0e665c2dbd4b5b277", - "reference": "5966a8ba23e62bdb518dd9e0e665c2dbd4b5b277", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1717e0b3642b0df65ecb0cc89cdd99fa840672ff", + "reference": "1717e0b3642b0df65ecb0cc89cdd99fa840672ff", "shasum": "" }, "require": { @@ -2980,22 +2980,22 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.30.2" + "source": "https://github.com/thephpleague/flysystem/tree/3.31.0" }, - "time": "2025-11-10T17:13:11+00:00" + "time": "2026-01-23T15:38:47+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.30.1", + "version": "3.31.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "d286e896083bed3190574b8b088b557b59eb66f5" + "reference": "e36a2bc60b06332c92e4435047797ded352b446f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d286e896083bed3190574b8b088b557b59eb66f5", - "reference": "d286e896083bed3190574b8b088b557b59eb66f5", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/e36a2bc60b06332c92e4435047797ded352b446f", + "reference": "e36a2bc60b06332c92e4435047797ded352b446f", "shasum": "" }, "require": { @@ -3035,22 +3035,22 @@ "storage" ], "support": { - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.30.1" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.31.0" }, - "time": "2025-10-20T15:27:33+00:00" + "time": "2026-01-23T15:30:45+00:00" }, { "name": "league/flysystem-local", - "version": "3.30.2", + "version": "3.31.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "ab4f9d0d672f601b102936aa728801dd1a11968d" + "reference": "2f669db18a4c20c755c2bb7d3a7b0b2340488079" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/ab4f9d0d672f601b102936aa728801dd1a11968d", - "reference": "ab4f9d0d672f601b102936aa728801dd1a11968d", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/2f669db18a4c20c755c2bb7d3a7b0b2340488079", + "reference": "2f669db18a4c20c755c2bb7d3a7b0b2340488079", "shasum": "" }, "require": { @@ -3084,9 +3084,9 @@ "local" ], "support": { - "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.2" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.31.0" }, - "time": "2025-11-10T11:23:37+00:00" + "time": "2026-01-23T15:30:45+00:00" }, { "name": "league/mime-type-detection", @@ -3146,20 +3146,20 @@ }, { "name": "league/uri", - "version": "7.7.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807" + "reference": "4436c6ec8d458e4244448b069cc572d088230b76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/8d587cddee53490f9b82bf203d3a9aa7ea4f9807", - "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/4436c6ec8d458e4244448b069cc572d088230b76", + "reference": "4436c6ec8d458e4244448b069cc572d088230b76", "shasum": "" }, "require": { - "league/uri-interfaces": "^7.7", + "league/uri-interfaces": "^7.8", "php": "^8.1", "psr/http-factory": "^1" }, @@ -3173,11 +3173,11 @@ "ext-gmp": "to improve IPV4 host parsing", "ext-intl": "to handle IDN host with the best performance", "ext-uri": "to use the PHP native URI class", - "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain", - "league/uri-components": "Needed to easily manipulate URI objects components", - "league/uri-polyfill": "Needed to backport the PHP URI extension for older versions of PHP", + "jeremykendall/php-domain-parser": "to further parse the URI host and resolve its Public Suffix and Top Level Domain", + "league/uri-components": "to provide additional tools to manipulate URI objects components", + "league/uri-polyfill": "to backport the PHP URI extension for older versions of PHP", "php-64bit": "to improve IPV4 host parsing", - "rowbot/url": "to handle WHATWG URL", + "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification", "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", @@ -3232,7 +3232,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri/tree/7.7.0" + "source": "https://github.com/thephpleague/uri/tree/7.8.0" }, "funding": [ { @@ -3240,20 +3240,20 @@ "type": "github" } ], - "time": "2025-12-07T16:02:06+00:00" + "time": "2026-01-14T17:24:56+00:00" }, { "name": "league/uri-interfaces", - "version": "7.7.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c" + "reference": "c5c5cd056110fc8afaba29fa6b72a43ced42acd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/62ccc1a0435e1c54e10ee6022df28d6c04c2946c", - "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/c5c5cd056110fc8afaba29fa6b72a43ced42acd4", + "reference": "c5c5cd056110fc8afaba29fa6b72a43ced42acd4", "shasum": "" }, "require": { @@ -3266,7 +3266,7 @@ "ext-gmp": "to improve IPV4 host parsing", "ext-intl": "to handle IDN host with the best performance", "php-64bit": "to improve IPV4 host parsing", - "rowbot/url": "to handle WHATWG URL", + "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification", "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", @@ -3316,7 +3316,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri-interfaces/tree/7.7.0" + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.8.0" }, "funding": [ { @@ -3324,7 +3324,7 @@ "type": "github" } ], - "time": "2025-12-07T16:03:21+00:00" + "time": "2026-01-15T06:54:53+00:00" }, { "name": "masterminds/html5", @@ -3457,16 +3457,16 @@ }, { "name": "monolog/monolog", - "version": "3.9.0", + "version": "3.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6" + "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6", - "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b321dd6749f0bf7189444158a3ce785cc16d69b0", + "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0", "shasum": "" }, "require": { @@ -3484,7 +3484,7 @@ "graylog2/gelf-php": "^1.4.2 || ^2.0", "guzzlehttp/guzzle": "^7.4.5", "guzzlehttp/psr7": "^2.2", - "mongodb/mongodb": "^1.8", + "mongodb/mongodb": "^1.8 || ^2.0", "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.8", "phpstan/phpstan": "^2", @@ -3544,7 +3544,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.9.0" + "source": "https://github.com/Seldaek/monolog/tree/3.10.0" }, "funding": [ { @@ -3556,7 +3556,7 @@ "type": "tidelift" } ], - "time": "2025-03-24T10:02:05+00:00" + "time": "2026-01-02T08:56:05+00:00" }, { "name": "mtdowling/jmespath.php", @@ -3626,16 +3626,16 @@ }, { "name": "nesbot/carbon", - "version": "3.11.0", + "version": "3.11.1", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "bdb375400dcd162624531666db4799b36b64e4a1" + "reference": "f438fcc98f92babee98381d399c65336f3a3827f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/bdb375400dcd162624531666db4799b36b64e4a1", - "reference": "bdb375400dcd162624531666db4799b36b64e4a1", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/f438fcc98f92babee98381d399c65336f3a3827f", + "reference": "f438fcc98f92babee98381d399c65336f3a3827f", "shasum": "" }, "require": { @@ -3659,7 +3659,7 @@ "phpstan/extension-installer": "^1.4.3", "phpstan/phpstan": "^2.1.22", "phpunit/phpunit": "^10.5.53", - "squizlabs/php_codesniffer": "^3.13.4" + "squizlabs/php_codesniffer": "^3.13.4 || ^4.0.0" }, "bin": [ "bin/carbon" @@ -3702,14 +3702,14 @@ } ], "description": "An API extension for DateTime that supports 281 different languages.", - "homepage": "https://carbon.nesbot.com", + "homepage": "https://carbonphp.github.io/carbon/", "keywords": [ "date", "datetime", "time" ], "support": { - "docs": "https://carbon.nesbot.com/docs", + "docs": "https://carbonphp.github.io/carbon/guide/getting-started/introduction.html", "issues": "https://github.com/CarbonPHP/carbon/issues", "source": "https://github.com/CarbonPHP/carbon" }, @@ -3727,20 +3727,20 @@ "type": "tidelift" } ], - "time": "2025-12-02T21:04:28+00:00" + "time": "2026-01-29T09:26:29+00:00" }, { "name": "nette/schema", - "version": "v1.3.3", + "version": "v1.3.4", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004" + "reference": "086497a2f34b82fede9b5a41cc8e131d087cd8f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004", - "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004", + "url": "https://api.github.com/repos/nette/schema/zipball/086497a2f34b82fede9b5a41cc8e131d087cd8f7", + "reference": "086497a2f34b82fede9b5a41cc8e131d087cd8f7", "shasum": "" }, "require": { @@ -3748,8 +3748,8 @@ "php": "8.1 - 8.5" }, "require-dev": { - "nette/tester": "^2.5.2", - "phpstan/phpstan-nette": "^2.0@stable", + "nette/tester": "^2.6", + "phpstan/phpstan": "^2.0@stable", "tracy/tracy": "^2.8" }, "type": "library", @@ -3790,22 +3790,22 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.3" + "source": "https://github.com/nette/schema/tree/v1.3.4" }, - "time": "2025-10-30T22:57:59+00:00" + "time": "2026-02-08T02:54:00+00:00" }, { "name": "nette/utils", - "version": "v4.1.0", + "version": "v4.1.3", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0" + "reference": "bb3ea637e3d131d72acc033cfc2746ee893349fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/fa1f0b8261ed150447979eb22e373b7b7ad5a8e0", - "reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0", + "url": "https://api.github.com/repos/nette/utils/zipball/bb3ea637e3d131d72acc033cfc2746ee893349fe", + "reference": "bb3ea637e3d131d72acc033cfc2746ee893349fe", "shasum": "" }, "require": { @@ -3817,8 +3817,10 @@ }, "require-dev": { "jetbrains/phpstorm-attributes": "^1.2", + "nette/phpstan-rules": "^1.0", "nette/tester": "^2.5", - "phpstan/phpstan-nette": "^2.0@stable", + "phpstan/extension-installer": "^1.4@stable", + "phpstan/phpstan": "^2.1@stable", "tracy/tracy": "^2.9" }, "suggest": { @@ -3879,9 +3881,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.1.0" + "source": "https://github.com/nette/utils/tree/v4.1.3" }, - "time": "2025-12-01T17:49:23+00:00" + "time": "2026-02-13T03:05:33+00:00" }, { "name": "nikic/php-parser", @@ -3943,31 +3945,31 @@ }, { "name": "nunomaduro/termwind", - "version": "v2.3.3", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "6fb2a640ff502caace8e05fd7be3b503a7e1c017" + "reference": "712a31b768f5daea284c2169a7d227031001b9a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/6fb2a640ff502caace8e05fd7be3b503a7e1c017", - "reference": "6fb2a640ff502caace8e05fd7be3b503a7e1c017", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/712a31b768f5daea284c2169a7d227031001b9a8", + "reference": "712a31b768f5daea284c2169a7d227031001b9a8", "shasum": "" }, "require": { "ext-mbstring": "*", "php": "^8.2", - "symfony/console": "^7.3.6" + "symfony/console": "^7.4.4 || ^8.0.4" }, "require-dev": { - "illuminate/console": "^11.46.1", - "laravel/pint": "^1.25.1", + "illuminate/console": "^11.47.0", + "laravel/pint": "^1.27.1", "mockery/mockery": "^1.6.12", - "pestphp/pest": "^2.36.0 || ^3.8.4 || ^4.1.3", + "pestphp/pest": "^2.36.0 || ^3.8.4 || ^4.3.2", "phpstan/phpstan": "^1.12.32", "phpstan/phpstan-strict-rules": "^1.6.2", - "symfony/var-dumper": "^7.3.5", + "symfony/var-dumper": "^7.3.5 || ^8.0.4", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "type": "library", @@ -3999,7 +4001,7 @@ "email": "enunomaduro@gmail.com" } ], - "description": "Its like Tailwind CSS, but for the console.", + "description": "It's like Tailwind CSS, but for the console.", "keywords": [ "cli", "console", @@ -4010,7 +4012,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v2.3.3" + "source": "https://github.com/nunomaduro/termwind/tree/v2.4.0" }, "funding": [ { @@ -4026,7 +4028,7 @@ "type": "github" } ], - "time": "2025-11-20T02:34:59+00:00" + "time": "2026-02-16T23:10:27+00:00" }, { "name": "p3k/http", @@ -4194,16 +4196,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.5", + "version": "5.6.6", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761" + "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761", - "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/5cee1d3dfc2d2aa6599834520911d246f656bcb8", + "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8", "shasum": "" }, "require": { @@ -4213,7 +4215,7 @@ "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", "phpstan/phpdoc-parser": "^1.7|^2.0", - "webmozart/assert": "^1.9.1" + "webmozart/assert": "^1.9.1 || ^2" }, "require-dev": { "mockery/mockery": "~1.3.5 || ~1.6.0", @@ -4252,9 +4254,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.6" }, - "time": "2025-11-27T19:50:05+00:00" + "time": "2025-12-22T21:13:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -4316,16 +4318,16 @@ }, { "name": "phpoption/phpoption", - "version": "1.9.4", + "version": "1.9.5", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d" + "reference": "75365b91986c2405cf5e1e012c5595cd487a98be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", - "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/75365b91986c2405cf5e1e012c5595cd487a98be", + "reference": "75365b91986c2405cf5e1e012c5595cd487a98be", "shasum": "" }, "require": { @@ -4375,7 +4377,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.4" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.5" }, "funding": [ { @@ -4387,20 +4389,20 @@ "type": "tidelift" } ], - "time": "2025-08-21T11:53:16+00:00" + "time": "2025-12-27T19:41:33+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "2.3.0", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" + "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", - "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a", + "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a", "shasum": "" }, "require": { @@ -4432,9 +4434,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2" }, - "time": "2025-08-30T15:50:23+00:00" + "time": "2026-01-25T14:56:51+00:00" }, { "name": "psr/clock", @@ -4850,16 +4852,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.16", + "version": "v0.12.20", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "ee6d5028be4774f56c6c2c85ec4e6bc9acfe6b67" + "reference": "19678eb6b952a03b8a1d96ecee9edba518bb0373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ee6d5028be4774f56c6c2c85ec4e6bc9acfe6b67", - "reference": "ee6d5028be4774f56c6c2c85ec4e6bc9acfe6b67", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/19678eb6b952a03b8a1d96ecee9edba518bb0373", + "reference": "19678eb6b952a03b8a1d96ecee9edba518bb0373", "shasum": "" }, "require": { @@ -4923,9 +4925,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.16" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.20" }, - "time": "2025-12-07T03:39:01+00:00" + "time": "2026-02-11T15:05:28+00:00" }, { "name": "ralouphie/getallheaders", @@ -5049,20 +5051,20 @@ }, { "name": "ramsey/uuid", - "version": "4.9.1", + "version": "4.9.2", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440" + "reference": "8429c78ca35a09f27565311b98101e2826affde0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440", - "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0", + "reference": "8429c78ca35a09f27565311b98101e2826affde0", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14", + "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" }, @@ -5121,9 +5123,9 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.9.1" + "source": "https://github.com/ramsey/uuid/tree/4.9.2" }, - "time": "2025-09-04T20:59:21+00:00" + "time": "2025-12-14T04:43:48+00:00" }, { "name": "scrivo/highlight.php", @@ -5395,16 +5397,16 @@ }, { "name": "spatie/flare-client-php", - "version": "2.7.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "bcab99ea8e3877e9aed2ab92d1de5b4211f64457" + "reference": "fbc91dd304edc65ba381404821ce38794d98af3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/bcab99ea8e3877e9aed2ab92d1de5b4211f64457", - "reference": "bcab99ea8e3877e9aed2ab92d1de5b4211f64457", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/fbc91dd304edc65ba381404821ce38794d98af3b", + "reference": "fbc91dd304edc65ba381404821ce38794d98af3b", "shasum": "" }, "require": { @@ -5452,7 +5454,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/2.7.0" + "source": "https://github.com/spatie/flare-client-php/tree/2.10.0" }, "funding": [ { @@ -5460,7 +5462,7 @@ "type": "github" } ], - "time": "2025-12-11T13:07:52+00:00" + "time": "2026-01-12T15:59:08+00:00" }, { "name": "spatie/laravel-error-share", @@ -5546,16 +5548,16 @@ }, { "name": "spatie/laravel-flare", - "version": "2.5.1", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-flare.git", - "reference": "62d0e38aa8d7435ceae68951a3858808262533b4" + "reference": "8131f917fe641cb331144a50097b634c4e70c4fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-flare/zipball/62d0e38aa8d7435ceae68951a3858808262533b4", - "reference": "62d0e38aa8d7435ceae68951a3858808262533b4", + "url": "https://api.github.com/repos/spatie/laravel-flare/zipball/8131f917fe641cb331144a50097b634c4e70c4fe", + "reference": "8131f917fe641cb331144a50097b634c4e70c4fe", "shasum": "" }, "require": { @@ -5565,19 +5567,19 @@ "illuminate/support": "^11.46|^12.0", "php": "^8.2", "spatie/error-solutions": "^2.0", - "spatie/flare-client-php": "^2.5", + "spatie/flare-client-php": "^2.9", "spatie/laravel-error-share": "^1.0.3", - "symfony/console": "^7.2.1", - "symfony/var-dumper": "^7.2.3" + "symfony/console": "^7.2.1|^8.0", + "symfony/var-dumper": "^7.2.3|^8.0" }, "require-dev": { "laravel/serializable-closure": "^2.0", - "livewire/livewire": "^3.6.0", + "livewire/livewire": "^3.6.0|^4.0", "mockery/mockery": "^1.6.12", "openai-php/client": "^0.8.5", - "orchestra/testbench": "^9.14|^10.0", - "pestphp/pest": "^2.34|^3.7.4|^4.0", - "pestphp/pest-plugin-laravel": "^2.4|^3.0", + "orchestra/testbench": "^9.14|^10.8", + "pestphp/pest": "^2.34|^3.7.4|^4.1", + "pestphp/pest-plugin-laravel": "^2.4|^3.0|^4.0", "phpstan/extension-installer": "^1.4.3", "phpstan/phpstan-deprecation-rules": "^1.1.1|^2.0.1", "phpstan/phpstan-phpunit": "^1.3.16|^2.0.4", @@ -5633,33 +5635,33 @@ "type": "github" } ], - "time": "2025-11-13T08:38:19+00:00" + "time": "2026-01-14T09:23:56+00:00" }, { "name": "spatie/laravel-package-tools", - "version": "1.92.7", + "version": "1.93.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-package-tools.git", - "reference": "f09a799850b1ed765103a4f0b4355006360c49a5" + "reference": "0d097bce95b2bf6802fb1d83e1e753b0f5a948e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/f09a799850b1ed765103a4f0b4355006360c49a5", - "reference": "f09a799850b1ed765103a4f0b4355006360c49a5", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/0d097bce95b2bf6802fb1d83e1e753b0f5a948e7", + "reference": "0d097bce95b2bf6802fb1d83e1e753b0f5a948e7", "shasum": "" }, "require": { - "illuminate/contracts": "^9.28|^10.0|^11.0|^12.0", - "php": "^8.0" + "illuminate/contracts": "^10.0|^11.0|^12.0|^13.0", + "php": "^8.1" }, "require-dev": { "mockery/mockery": "^1.5", - "orchestra/testbench": "^7.7|^8.0|^9.0|^10.0", - "pestphp/pest": "^1.23|^2.1|^3.1", - "phpunit/php-code-coverage": "^9.0|^10.0|^11.0", - "phpunit/phpunit": "^9.5.24|^10.5|^11.5", - "spatie/pest-plugin-test-time": "^1.1|^2.2" + "orchestra/testbench": "^8.0|^9.2|^10.0|^11.0", + "pestphp/pest": "^2.1|^3.1|^4.0", + "phpunit/php-code-coverage": "^10.0|^11.0|^12.0", + "phpunit/phpunit": "^10.5|^11.5|^12.5", + "spatie/pest-plugin-test-time": "^2.2|^3.0" }, "type": "library", "autoload": { @@ -5686,7 +5688,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-package-tools/issues", - "source": "https://github.com/spatie/laravel-package-tools/tree/1.92.7" + "source": "https://github.com/spatie/laravel-package-tools/tree/1.93.0" }, "funding": [ { @@ -5694,7 +5696,7 @@ "type": "github" } ], - "time": "2025-07-17T15:46:43+00:00" + "time": "2026-02-21T12:49:54+00:00" }, { "name": "spomky-labs/cbor-php", @@ -5769,16 +5771,16 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7" + "reference": "f0e9a548df4e3942886adc9b7830581a46334631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/bf6f55a9d9eb25b7781640221cb54f5c727850d7", - "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/f0e9a548df4e3942886adc9b7830581a46334631", + "reference": "f0e9a548df4e3942886adc9b7830581a46334631", "shasum": "" }, "require": { @@ -5862,7 +5864,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.0" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.1" }, "funding": [ { @@ -5874,7 +5876,7 @@ "type": "patreon" } ], - "time": "2025-10-22T08:24:34+00:00" + "time": "2025-12-20T12:57:40+00:00" }, { "name": "symfony/clock", @@ -5956,16 +5958,16 @@ }, { "name": "symfony/console", - "version": "v7.4.1", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e" + "reference": "41e38717ac1dd7a46b6bda7d6a82af2d98a78894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e", - "reference": "6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e", + "url": "https://api.github.com/repos/symfony/console/zipball/41e38717ac1dd7a46b6bda7d6a82af2d98a78894", + "reference": "41e38717ac1dd7a46b6bda7d6a82af2d98a78894", "shasum": "" }, "require": { @@ -6030,7 +6032,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.4.1" + "source": "https://github.com/symfony/console/tree/v7.4.4" }, "funding": [ { @@ -6050,24 +6052,24 @@ "type": "tidelift" } ], - "time": "2025-12-05T15:23:39+00:00" + "time": "2026-01-13T11:36:38+00:00" }, { "name": "symfony/css-selector", - "version": "v7.4.0", + "version": "v8.0.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135" + "reference": "6225bd458c53ecdee056214cb4a2ffaf58bd592b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab862f478513e7ca2fe9ec117a6f01a8da6e1135", - "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/6225bd458c53ecdee056214cb4a2ffaf58bd592b", + "reference": "6225bd458c53ecdee056214cb4a2ffaf58bd592b", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.4" }, "type": "library", "autoload": { @@ -6099,7 +6101,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.4.0" + "source": "https://github.com/symfony/css-selector/tree/v8.0.0" }, "funding": [ { @@ -6119,7 +6121,7 @@ "type": "tidelift" } ], - "time": "2025-10-30T13:39:42+00:00" + "time": "2025-10-30T14:17:19+00:00" }, { "name": "symfony/deprecation-contracts", @@ -6190,16 +6192,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "48be2b0653594eea32dcef130cca1c811dcf25c2" + "reference": "8da531f364ddfee53e36092a7eebbbd0b775f6b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/48be2b0653594eea32dcef130cca1c811dcf25c2", - "reference": "48be2b0653594eea32dcef130cca1c811dcf25c2", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/8da531f364ddfee53e36092a7eebbbd0b775f6b8", + "reference": "8da531f364ddfee53e36092a7eebbbd0b775f6b8", "shasum": "" }, "require": { @@ -6248,7 +6250,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.4.0" + "source": "https://github.com/symfony/error-handler/tree/v7.4.4" }, "funding": [ { @@ -6268,20 +6270,20 @@ "type": "tidelift" } ], - "time": "2025-11-05T14:29:59+00:00" + "time": "2026-01-20T16:42:42+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v8.0.0", + "version": "v8.0.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "573f95783a2ec6e38752979db139f09fec033f03" + "reference": "99301401da182b6cfaa4700dbe9987bb75474b47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/573f95783a2ec6e38752979db139f09fec033f03", - "reference": "573f95783a2ec6e38752979db139f09fec033f03", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/99301401da182b6cfaa4700dbe9987bb75474b47", + "reference": "99301401da182b6cfaa4700dbe9987bb75474b47", "shasum": "" }, "require": { @@ -6333,7 +6335,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v8.0.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v8.0.4" }, "funding": [ { @@ -6353,7 +6355,7 @@ "type": "tidelift" } ], - "time": "2025-10-30T14:17:19+00:00" + "time": "2026-01-05T11:45:55+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -6503,16 +6505,16 @@ }, { "name": "symfony/finder", - "version": "v7.4.0", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "340b9ed7320570f319028a2cbec46d40535e94bd" + "reference": "ad4daa7c38668dcb031e63bc99ea9bd42196a2cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/340b9ed7320570f319028a2cbec46d40535e94bd", - "reference": "340b9ed7320570f319028a2cbec46d40535e94bd", + "url": "https://api.github.com/repos/symfony/finder/zipball/ad4daa7c38668dcb031e63bc99ea9bd42196a2cb", + "reference": "ad4daa7c38668dcb031e63bc99ea9bd42196a2cb", "shasum": "" }, "require": { @@ -6547,7 +6549,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.4.0" + "source": "https://github.com/symfony/finder/tree/v7.4.5" }, "funding": [ { @@ -6567,7 +6569,7 @@ "type": "tidelift" } ], - "time": "2025-11-05T05:42:40+00:00" + "time": "2026-01-26T15:07:59+00:00" }, { "name": "symfony/html-sanitizer", @@ -6645,16 +6647,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.4.1", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "bd1af1e425811d6f077db240c3a588bdb405cd27" + "reference": "446d0db2b1f21575f1284b74533e425096abdfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/bd1af1e425811d6f077db240c3a588bdb405cd27", - "reference": "bd1af1e425811d6f077db240c3a588bdb405cd27", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/446d0db2b1f21575f1284b74533e425096abdfb6", + "reference": "446d0db2b1f21575f1284b74533e425096abdfb6", "shasum": "" }, "require": { @@ -6703,7 +6705,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.4.1" + "source": "https://github.com/symfony/http-foundation/tree/v7.4.5" }, "funding": [ { @@ -6723,20 +6725,20 @@ "type": "tidelift" } ], - "time": "2025-12-07T11:13:10+00:00" + "time": "2026-01-27T16:16:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.4.2", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f6e6f0a5fa8763f75a504b930163785fb6dd055f" + "reference": "229eda477017f92bd2ce7615d06222ec0c19e82a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6e6f0a5fa8763f75a504b930163785fb6dd055f", - "reference": "f6e6f0a5fa8763f75a504b930163785fb6dd055f", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/229eda477017f92bd2ce7615d06222ec0c19e82a", + "reference": "229eda477017f92bd2ce7615d06222ec0c19e82a", "shasum": "" }, "require": { @@ -6822,7 +6824,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.4.2" + "source": "https://github.com/symfony/http-kernel/tree/v7.4.5" }, "funding": [ { @@ -6842,20 +6844,20 @@ "type": "tidelift" } ], - "time": "2025-12-08T07:43:37+00:00" + "time": "2026-01-28T10:33:42+00:00" }, { "name": "symfony/mailer", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "a3d9eea8cfa467ece41f0f54ba28185d74bd53fd" + "reference": "7b750074c40c694ceb34cb926d6dffee231c5cd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/a3d9eea8cfa467ece41f0f54ba28185d74bd53fd", - "reference": "a3d9eea8cfa467ece41f0f54ba28185d74bd53fd", + "url": "https://api.github.com/repos/symfony/mailer/zipball/7b750074c40c694ceb34cb926d6dffee231c5cd6", + "reference": "7b750074c40c694ceb34cb926d6dffee231c5cd6", "shasum": "" }, "require": { @@ -6906,7 +6908,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.4.0" + "source": "https://github.com/symfony/mailer/tree/v7.4.4" }, "funding": [ { @@ -6926,20 +6928,20 @@ "type": "tidelift" } ], - "time": "2025-11-21T15:26:00+00:00" + "time": "2026-01-08T08:25:11+00:00" }, { "name": "symfony/mime", - "version": "v7.4.0", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "bdb02729471be5d047a3ac4a69068748f1a6be7a" + "reference": "b18c7e6e9eee1e19958138df10412f3c4c316148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/bdb02729471be5d047a3ac4a69068748f1a6be7a", - "reference": "bdb02729471be5d047a3ac4a69068748f1a6be7a", + "url": "https://api.github.com/repos/symfony/mime/zipball/b18c7e6e9eee1e19958138df10412f3c4c316148", + "reference": "b18c7e6e9eee1e19958138df10412f3c4c316148", "shasum": "" }, "require": { @@ -6950,15 +6952,15 @@ }, "conflict": { "egulias/email-validator": "~3.0.0", - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/reflection-docblock": "<5.2|>=6", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/mailer": "<6.4", "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "league/html-to-markdown": "^5.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "phpdocumentor/reflection-docblock": "^5.2", "symfony/dependency-injection": "^6.4|^7.0|^8.0", "symfony/process": "^6.4|^7.0|^8.0", "symfony/property-access": "^6.4|^7.0|^8.0", @@ -6995,7 +6997,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.4.0" + "source": "https://github.com/symfony/mime/tree/v7.4.5" }, "funding": [ { @@ -7015,7 +7017,7 @@ "type": "tidelift" } ], - "time": "2025-11-16T10:14:42+00:00" + "time": "2026-01-27T08:59:58+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7848,16 +7850,16 @@ }, { "name": "symfony/process", - "version": "v7.4.0", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8" + "reference": "608476f4604102976d687c483ac63a79ba18cc97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7ca8dc2d0dcf4882658313aba8be5d9fd01026c8", - "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8", + "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97", + "reference": "608476f4604102976d687c483ac63a79ba18cc97", "shasum": "" }, "require": { @@ -7889,7 +7891,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.4.0" + "source": "https://github.com/symfony/process/tree/v7.4.5" }, "funding": [ { @@ -7909,25 +7911,25 @@ "type": "tidelift" } ], - "time": "2025-10-16T11:21:06+00:00" + "time": "2026-01-26T15:07:59+00:00" }, { "name": "symfony/property-access", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "537626149d2910ca43eb9ce465654366bf4442f4" + "reference": "fa49bf1ca8fce1ba0e2dba4e4658554cfb9364b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/537626149d2910ca43eb9ce465654366bf4442f4", - "reference": "537626149d2910ca43eb9ce465654366bf4442f4", + "url": "https://api.github.com/repos/symfony/property-access/zipball/fa49bf1ca8fce1ba0e2dba4e4658554cfb9364b1", + "reference": "fa49bf1ca8fce1ba0e2dba4e4658554cfb9364b1", "shasum": "" }, "require": { "php": ">=8.2", - "symfony/property-info": "^6.4|^7.0|^8.0" + "symfony/property-info": "^6.4.32|~7.3.10|^7.4.4|^8.0.4" }, "require-dev": { "symfony/cache": "^6.4|^7.0|^8.0", @@ -7970,7 +7972,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v7.4.0" + "source": "https://github.com/symfony/property-access/tree/v7.4.4" }, "funding": [ { @@ -7990,30 +7992,30 @@ "type": "tidelift" } ], - "time": "2025-09-08T21:14:32+00:00" + "time": "2026-01-05T08:47:25+00:00" }, { "name": "symfony/property-info", - "version": "v7.4.1", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "912aafe70bee5cfd09fec5916fe35b83f04ae6ae" + "reference": "1c9d326bd69602561e2ea467a16c09b5972eee21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/912aafe70bee5cfd09fec5916fe35b83f04ae6ae", - "reference": "912aafe70bee5cfd09fec5916fe35b83f04ae6ae", + "url": "https://api.github.com/repos/symfony/property-info/zipball/1c9d326bd69602561e2ea467a16c09b5972eee21", + "reference": "1c9d326bd69602561e2ea467a16c09b5972eee21", "shasum": "" }, "require": { "php": ">=8.2", "symfony/deprecation-contracts": "^2.5|^3", "symfony/string": "^6.4|^7.0|^8.0", - "symfony/type-info": "~7.3.8|^7.4.1|^8.0.1" + "symfony/type-info": "~7.3.10|^7.4.4|^8.0.4" }, "conflict": { - "phpdocumentor/reflection-docblock": "<5.2", + "phpdocumentor/reflection-docblock": "<5.2|>=6", "phpdocumentor/type-resolver": "<1.5.1", "symfony/cache": "<6.4", "symfony/dependency-injection": "<6.4", @@ -8060,7 +8062,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v7.4.1" + "source": "https://github.com/symfony/property-info/tree/v7.4.5" }, "funding": [ { @@ -8080,20 +8082,20 @@ "type": "tidelift" } ], - "time": "2025-12-05T14:04:53+00:00" + "time": "2026-01-27T16:16:02+00:00" }, { "name": "symfony/routing", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "4720254cb2644a0b876233d258a32bf017330db7" + "reference": "0798827fe2c79caeed41d70b680c2c3507d10147" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4720254cb2644a0b876233d258a32bf017330db7", - "reference": "4720254cb2644a0b876233d258a32bf017330db7", + "url": "https://api.github.com/repos/symfony/routing/zipball/0798827fe2c79caeed41d70b680c2c3507d10147", + "reference": "0798827fe2c79caeed41d70b680c2c3507d10147", "shasum": "" }, "require": { @@ -8145,7 +8147,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.4.0" + "source": "https://github.com/symfony/routing/tree/v7.4.4" }, "funding": [ { @@ -8165,20 +8167,20 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2026-01-12T12:19:02+00:00" }, { "name": "symfony/serializer", - "version": "v7.4.2", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "1a957acb613b520e443c2c659a67c782b67794bc" + "reference": "480cd1237c98ab1219c20945b92c9d4480a44f47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/1a957acb613b520e443c2c659a67c782b67794bc", - "reference": "1a957acb613b520e443c2c659a67c782b67794bc", + "url": "https://api.github.com/repos/symfony/serializer/zipball/480cd1237c98ab1219c20945b92c9d4480a44f47", + "reference": "480cd1237c98ab1219c20945b92c9d4480a44f47", "shasum": "" }, "require": { @@ -8188,8 +8190,8 @@ "symfony/polyfill-php84": "^1.30" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/reflection-docblock": "<5.2|>=6", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/dependency-injection": "<6.4", "symfony/property-access": "<6.4", "symfony/property-info": "<6.4", @@ -8198,7 +8200,7 @@ "symfony/yaml": "<6.4" }, "require-dev": { - "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0", + "phpdocumentor/reflection-docblock": "^5.2", "phpstan/phpdoc-parser": "^1.0|^2.0", "seld/jsonlint": "^1.10", "symfony/cache": "^6.4|^7.0|^8.0", @@ -8248,7 +8250,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v7.4.2" + "source": "https://github.com/symfony/serializer/tree/v7.4.5" }, "funding": [ { @@ -8268,7 +8270,7 @@ "type": "tidelift" } ], - "time": "2025-12-07T17:35:40+00:00" + "time": "2026-01-27T08:59:58+00:00" }, { "name": "symfony/service-contracts", @@ -8359,16 +8361,16 @@ }, { "name": "symfony/string", - "version": "v8.0.1", + "version": "v8.0.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc" + "reference": "758b372d6882506821ed666032e43020c4f57194" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ba65a969ac918ce0cc3edfac6cdde847eba231dc", - "reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc", + "url": "https://api.github.com/repos/symfony/string/zipball/758b372d6882506821ed666032e43020c4f57194", + "reference": "758b372d6882506821ed666032e43020c4f57194", "shasum": "" }, "require": { @@ -8425,7 +8427,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v8.0.1" + "source": "https://github.com/symfony/string/tree/v8.0.4" }, "funding": [ { @@ -8445,20 +8447,20 @@ "type": "tidelift" } ], - "time": "2025-12-01T09:13:36+00:00" + "time": "2026-01-12T12:37:40+00:00" }, { "name": "symfony/translation", - "version": "v8.0.1", + "version": "v8.0.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "770e3b8b0ba8360958abedcabacd4203467333ca" + "reference": "db70c8ce7db74fd2da7b1d268db46b2a8ce32c10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/770e3b8b0ba8360958abedcabacd4203467333ca", - "reference": "770e3b8b0ba8360958abedcabacd4203467333ca", + "url": "https://api.github.com/repos/symfony/translation/zipball/db70c8ce7db74fd2da7b1d268db46b2a8ce32c10", + "reference": "db70c8ce7db74fd2da7b1d268db46b2a8ce32c10", "shasum": "" }, "require": { @@ -8518,7 +8520,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v8.0.1" + "source": "https://github.com/symfony/translation/tree/v8.0.4" }, "funding": [ { @@ -8538,7 +8540,7 @@ "type": "tidelift" } ], - "time": "2025-12-01T09:13:36+00:00" + "time": "2026-01-13T13:06:50+00:00" }, { "name": "symfony/translation-contracts", @@ -8624,16 +8626,16 @@ }, { "name": "symfony/type-info", - "version": "v8.0.1", + "version": "v8.0.4", "source": { "type": "git", "url": "https://github.com/symfony/type-info.git", - "reference": "bb091cec1f70383538c7d000699781813f8d1a6a" + "reference": "106a2d3bbf0d4576b2f70e6ca866fa420956ed0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/type-info/zipball/bb091cec1f70383538c7d000699781813f8d1a6a", - "reference": "bb091cec1f70383538c7d000699781813f8d1a6a", + "url": "https://api.github.com/repos/symfony/type-info/zipball/106a2d3bbf0d4576b2f70e6ca866fa420956ed0d", + "reference": "106a2d3bbf0d4576b2f70e6ca866fa420956ed0d", "shasum": "" }, "require": { @@ -8682,7 +8684,7 @@ "type" ], "support": { - "source": "https://github.com/symfony/type-info/tree/v8.0.1" + "source": "https://github.com/symfony/type-info/tree/v8.0.4" }, "funding": [ { @@ -8702,20 +8704,20 @@ "type": "tidelift" } ], - "time": "2025-12-05T14:08:45+00:00" + "time": "2026-01-09T12:15:10+00:00" }, { "name": "symfony/uid", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "2498e9f81b7baa206f44de583f2f48350b90142c" + "reference": "7719ce8aba76be93dfe249192f1fbfa52c588e36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/2498e9f81b7baa206f44de583f2f48350b90142c", - "reference": "2498e9f81b7baa206f44de583f2f48350b90142c", + "url": "https://api.github.com/repos/symfony/uid/zipball/7719ce8aba76be93dfe249192f1fbfa52c588e36", + "reference": "7719ce8aba76be93dfe249192f1fbfa52c588e36", "shasum": "" }, "require": { @@ -8760,7 +8762,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v7.4.0" + "source": "https://github.com/symfony/uid/tree/v7.4.4" }, "funding": [ { @@ -8780,20 +8782,20 @@ "type": "tidelift" } ], - "time": "2025-09-25T11:02:55+00:00" + "time": "2026-01-03T23:30:35+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "41fd6c4ae28c38b294b42af6db61446594a0dece" + "reference": "0e4769b46a0c3c62390d124635ce59f66874b282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/41fd6c4ae28c38b294b42af6db61446594a0dece", - "reference": "41fd6c4ae28c38b294b42af6db61446594a0dece", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e4769b46a0c3c62390d124635ce59f66874b282", + "reference": "0e4769b46a0c3c62390d124635ce59f66874b282", "shasum": "" }, "require": { @@ -8847,7 +8849,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.4.0" + "source": "https://github.com/symfony/var-dumper/tree/v7.4.4" }, "funding": [ { @@ -8867,27 +8869,27 @@ "type": "tidelift" } ], - "time": "2025-10-27T20:36:44+00:00" + "time": "2026-01-01T22:13:48+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "0d72ac1c00084279c1816675284073c5a337c20d" + "reference": "f0292ccf0ec75843d65027214426b6b163b48b41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d", - "reference": "0d72ac1c00084279c1816675284073c5a337c20d", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/f0292ccf0ec75843d65027214426b6b163b48b41", + "reference": "f0292ccf0ec75843d65027214426b6b163b48b41", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "php": "^7.4 || ^8.0", - "symfony/css-selector": "^5.4 || ^6.0 || ^7.0" + "symfony/css-selector": "^5.4 || ^6.0 || ^7.0 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^2.0", @@ -8920,32 +8922,32 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.4.0" }, - "time": "2024-12-21T16:25:41+00:00" + "time": "2025-12-02T11:56:42+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v5.6.2", + "version": "v5.6.3", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af" + "reference": "955e7815d677a3eaa7075231212f2110983adecc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/24ac4c74f91ee2c193fa1aaa5c249cb0822809af", - "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/955e7815d677a3eaa7075231212f2110983adecc", + "reference": "955e7815d677a3eaa7075231212f2110983adecc", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.1.3", + "graham-campbell/result-type": "^1.1.4", "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.3", - "symfony/polyfill-ctype": "^1.24", - "symfony/polyfill-mbstring": "^1.24", - "symfony/polyfill-php80": "^1.24" + "phpoption/phpoption": "^1.9.5", + "symfony/polyfill-ctype": "^1.26", + "symfony/polyfill-mbstring": "^1.26", + "symfony/polyfill-php80": "^1.26" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", @@ -8994,7 +8996,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.2" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.3" }, "funding": [ { @@ -9006,7 +9008,7 @@ "type": "tidelift" } ], - "time": "2025-04-30T23:37:27+00:00" + "time": "2025-12-27T19:49:13+00:00" }, { "name": "voku/portable-ascii", @@ -9084,43 +9086,32 @@ }, { "name": "web-auth/cose-lib", - "version": "4.4.2", + "version": "4.5.0", "source": { "type": "git", "url": "https://github.com/web-auth/cose-lib.git", - "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15" + "reference": "5adac6fe126994a3ee17ed9950efb4947ab132a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/a93b61c48fb587855f64a9ec11ad7b60e867cb15", - "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15", + "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/5adac6fe126994a3ee17ed9950efb4947ab132a9", + "reference": "5adac6fe126994a3ee17ed9950efb4947ab132a9", "shasum": "" }, "require": { - "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13", + "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13|^0.14", "ext-json": "*", "ext-openssl": "*", "php": ">=8.1", "spomky-labs/pki-framework": "^1.0" }, "require-dev": { - "deptrac/deptrac": "^3.0", - "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0", - "infection/infection": "^0.29", - "php-parallel-lint/php-parallel-lint": "^1.3", - "phpstan/extension-installer": "^1.3", - "phpstan/phpstan": "^1.7|^2.0", - "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", - "phpstan/phpstan-phpunit": "^1.1|^2.0", - "phpstan/phpstan-strict-rules": "^1.0|^2.0", - "phpunit/phpunit": "^10.1|^11.0|^12.0", - "rector/rector": "^2.0", - "symfony/phpunit-bridge": "^6.4|^7.0", - "symplify/easy-coding-standard": "^12.0" + "spomky-labs/cbor-php": "^3.2.2" }, "suggest": { "ext-bcmath": "For better performance, please install either GMP (recommended) or BCMath extension", - "ext-gmp": "For better performance, please install either GMP (recommended) or BCMath extension" + "ext-gmp": "For better performance, please install either GMP (recommended) or BCMath extension", + "spomky-labs/cbor-php": "For COSE Signature support" }, "type": "library", "autoload": { @@ -9150,7 +9141,7 @@ ], "support": { "issues": "https://github.com/web-auth/cose-lib/issues", - "source": "https://github.com/web-auth/cose-lib/tree/4.4.2" + "source": "https://github.com/web-auth/cose-lib/tree/4.5.0" }, "funding": [ { @@ -9162,20 +9153,20 @@ "type": "patreon" } ], - "time": "2025-08-14T20:33:29+00:00" + "time": "2026-01-03T14:43:18+00:00" }, { "name": "web-auth/webauthn-lib", - "version": "5.2.2", + "version": "5.2.3", "source": { "type": "git", "url": "https://github.com/web-auth/webauthn-lib.git", - "reference": "8937c397c8ae91b5af422ca8aa915c756062da74" + "reference": "8782f575032fedc36e2eb27c39c736054e2b6867" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/8937c397c8ae91b5af422ca8aa915c756062da74", - "reference": "8937c397c8ae91b5af422ca8aa915c756062da74", + "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/8782f575032fedc36e2eb27c39c736054e2b6867", + "reference": "8782f575032fedc36e2eb27c39c736054e2b6867", "shasum": "" }, "require": { @@ -9236,7 +9227,7 @@ "webauthn" ], "support": { - "source": "https://github.com/web-auth/webauthn-lib/tree/5.2.2" + "source": "https://github.com/web-auth/webauthn-lib/tree/5.2.3" }, "funding": [ { @@ -9248,27 +9239,27 @@ "type": "patreon" } ], - "time": "2025-03-16T14:38:43+00:00" + "time": "2025-12-20T10:54:02+00:00" }, { "name": "webmozart/assert", - "version": "1.12.1", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" + "reference": "79155f94852fa27e2f73b459f6503f5e87e2c188" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", - "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/79155f94852fa27e2f73b459f6503f5e87e2c188", + "reference": "79155f94852fa27e2f73b459f6503f5e87e2c188", "shasum": "" }, "require": { "ext-ctype": "*", "ext-date": "*", "ext-filter": "*", - "php": "^7.2 || ^8.0" + "php": "^8.2" }, "suggest": { "ext-intl": "", @@ -9278,7 +9269,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-feature/2-0": "2.0-dev" } }, "autoload": { @@ -9294,6 +9285,10 @@ { "name": "Bernhard Schussek", "email": "bschussek@gmail.com" + }, + { + "name": "Woody Gilk", + "email": "woody.gilk@gmail.com" } ], "description": "Assertions to validate method input/output with nice error messages.", @@ -9304,52 +9299,61 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.12.1" + "source": "https://github.com/webmozarts/assert/tree/2.1.5" }, - "time": "2025-10-29T15:56:20+00:00" + "time": "2026-02-18T14:09:36+00:00" } ], "packages-dev": [ { "name": "barryvdh/laravel-debugbar", - "version": "v3.16.1", + "version": "v4.0.9", "source": { "type": "git", - "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "21b2c6fce05453efd4bceb34f9fddaa1cdb44090" + "url": "https://github.com/fruitcake/laravel-debugbar.git", + "reference": "4eee2f032172fd6548028395d7a1adbd8eae2ba0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/21b2c6fce05453efd4bceb34f9fddaa1cdb44090", - "reference": "21b2c6fce05453efd4bceb34f9fddaa1cdb44090", + "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/4eee2f032172fd6548028395d7a1adbd8eae2ba0", + "reference": "4eee2f032172fd6548028395d7a1adbd8eae2ba0", "shasum": "" }, "require": { - "illuminate/routing": "^10|^11|^12", - "illuminate/session": "^10|^11|^12", - "illuminate/support": "^10|^11|^12", - "php": "^8.1", - "php-debugbar/php-debugbar": "^2.2.4", - "symfony/finder": "^6|^7" + "illuminate/routing": "^11|^12", + "illuminate/session": "^11|^12", + "illuminate/support": "^11|^12", + "php": "^8.2", + "php-debugbar/php-debugbar": "^3.1", + "php-debugbar/symfony-bridge": "^1.1" }, "require-dev": { + "larastan/larastan": "^3", + "laravel/octane": "^2", + "laravel/pennant": "^1", + "laravel/pint": "^1", + "laravel/telescope": "^5.16", + "livewire/livewire": "^3.7|^4", "mockery/mockery": "^1.3.3", - "orchestra/testbench-dusk": "^7|^8|^9|^10", - "phpunit/phpunit": "^9.5.10|^10|^11", - "squizlabs/php_codesniffer": "^3.5" + "orchestra/testbench-dusk": "^9|^10", + "php-debugbar/twig-bridge": "^2.0", + "phpstan/phpstan-phpunit": "^2", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^11", + "shipmonk/phpstan-rules": "^4.3" }, "type": "library", "extra": { "laravel": { "aliases": { - "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar" + "Debugbar": "Fruitcake\\LaravelDebugbar\\Facades\\Debugbar" }, "providers": [ - "Barryvdh\\Debugbar\\ServiceProvider" + "Fruitcake\\LaravelDebugbar\\ServiceProvider" ] }, "branch-alias": { - "dev-master": "3.16-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -9357,7 +9361,7 @@ "src/helpers.php" ], "psr-4": { - "Barryvdh\\Debugbar\\": "src/" + "Fruitcake\\LaravelDebugbar\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -9365,6 +9369,10 @@ "MIT" ], "authors": [ + { + "name": "Fruitcake", + "homepage": "https://fruitcake.nl" + }, { "name": "Barry vd. Heuvel", "email": "barryvdh@gmail.com" @@ -9372,6 +9380,7 @@ ], "description": "PHP Debugbar integration for Laravel", "keywords": [ + "barryvdh", "debug", "debugbar", "dev", @@ -9380,8 +9389,8 @@ "webprofiler" ], "support": { - "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.16.1" + "issues": "https://github.com/fruitcake/laravel-debugbar/issues", + "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.0.9" }, "funding": [ { @@ -9393,7 +9402,7 @@ "type": "github" } ], - "time": "2025-11-19T08:31:25+00:00" + "time": "2026-02-17T08:14:13+00:00" }, { "name": "barryvdh/laravel-ide-helper", @@ -9543,16 +9552,16 @@ }, { "name": "composer/class-map-generator", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "2373419b7709815ed323ebf18c3c72d03ff4a8a6" + "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/2373419b7709815ed323ebf18c3c72d03ff4a8a6", - "reference": "2373419b7709815ed323ebf18c3c72d03ff4a8a6", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8f5fa3cc214230e71f54924bd0197a3bcc705eb1", + "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1", "shasum": "" }, "require": { @@ -9596,7 +9605,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.7.0" + "source": "https://github.com/composer/class-map-generator/tree/1.7.1" }, "funding": [ { @@ -9608,7 +9617,7 @@ "type": "github" } ], - "time": "2025-11-19T10:41:15+00:00" + "time": "2025-12-29T13:15:25+00:00" }, { "name": "composer/pcre", @@ -9876,39 +9885,39 @@ }, { "name": "laravel/dusk", - "version": "v8.3.4", + "version": "v8.3.6", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "33a4211c7b63ffe430bf30ec3c014012dcb6dfa6" + "reference": "5c3beee54f91f575f50cadcd7e5d44c80cc9a9aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/33a4211c7b63ffe430bf30ec3c014012dcb6dfa6", - "reference": "33a4211c7b63ffe430bf30ec3c014012dcb6dfa6", + "url": "https://api.github.com/repos/laravel/dusk/zipball/5c3beee54f91f575f50cadcd7e5d44c80cc9a9aa", + "reference": "5c3beee54f91f575f50cadcd7e5d44c80cc9a9aa", "shasum": "" }, "require": { "ext-json": "*", "ext-zip": "*", "guzzlehttp/guzzle": "^7.5", - "illuminate/console": "^10.0|^11.0|^12.0", - "illuminate/support": "^10.0|^11.0|^12.0", + "illuminate/console": "^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^10.0|^11.0|^12.0|^13.0", "php": "^8.1", "php-webdriver/webdriver": "^1.15.2", - "symfony/console": "^6.2|^7.0", - "symfony/finder": "^6.2|^7.0", - "symfony/process": "^6.2|^7.0", + "symfony/console": "^6.2|^7.0|^8.0", + "symfony/finder": "^6.2|^7.0|^8.0", + "symfony/process": "^6.2|^7.0|^8.0", "vlucas/phpdotenv": "^5.2" }, "require-dev": { - "laravel/framework": "^10.0|^11.0|^12.0", + "laravel/framework": "^10.0|^11.0|^12.0|^13.0", "mockery/mockery": "^1.6", - "orchestra/testbench-core": "^8.19|^9.17|^10.8", + "orchestra/testbench-core": "^8.19|^9.17|^10.8|^11.0", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^10.1|^11.0|^12.0.1", "psy/psysh": "^0.11.12|^0.12", - "symfony/yaml": "^6.2|^7.0" + "symfony/yaml": "^6.2|^7.0|^8.0" }, "suggest": { "ext-pcntl": "Used to gracefully terminate Dusk when tests are running." @@ -9944,43 +9953,44 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v8.3.4" + "source": "https://github.com/laravel/dusk/tree/v8.3.6" }, - "time": "2025-11-20T16:26:16+00:00" + "time": "2026-02-10T18:14:59+00:00" }, { "name": "laravel/pail", - "version": "v1.2.4", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/laravel/pail.git", - "reference": "49f92285ff5d6fc09816e976a004f8dec6a0ea30" + "reference": "aa71a01c309e7f66bc2ec4fb1a59291b82eb4abf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pail/zipball/49f92285ff5d6fc09816e976a004f8dec6a0ea30", - "reference": "49f92285ff5d6fc09816e976a004f8dec6a0ea30", + "url": "https://api.github.com/repos/laravel/pail/zipball/aa71a01c309e7f66bc2ec4fb1a59291b82eb4abf", + "reference": "aa71a01c309e7f66bc2ec4fb1a59291b82eb4abf", "shasum": "" }, "require": { "ext-mbstring": "*", - "illuminate/console": "^10.24|^11.0|^12.0", - "illuminate/contracts": "^10.24|^11.0|^12.0", - "illuminate/log": "^10.24|^11.0|^12.0", - "illuminate/process": "^10.24|^11.0|^12.0", - "illuminate/support": "^10.24|^11.0|^12.0", + "illuminate/console": "^10.24|^11.0|^12.0|^13.0", + "illuminate/contracts": "^10.24|^11.0|^12.0|^13.0", + "illuminate/log": "^10.24|^11.0|^12.0|^13.0", + "illuminate/process": "^10.24|^11.0|^12.0|^13.0", + "illuminate/support": "^10.24|^11.0|^12.0|^13.0", "nunomaduro/termwind": "^1.15|^2.0", "php": "^8.2", - "symfony/console": "^6.0|^7.0" + "symfony/console": "^6.0|^7.0|^8.0" }, "require-dev": { - "laravel/framework": "^10.24|^11.0|^12.0", + "laravel/framework": "^10.24|^11.0|^12.0|^13.0", "laravel/pint": "^1.13", - "orchestra/testbench-core": "^8.13|^9.17|^10.8", + "orchestra/testbench-core": "^8.13|^9.17|^10.8|^11.0", "pestphp/pest": "^2.20|^3.0|^4.0", "pestphp/pest-plugin-type-coverage": "^2.3|^3.0|^4.0", "phpstan/phpstan": "^1.12.27", - "symfony/var-dumper": "^6.3|^7.0" + "symfony/var-dumper": "^6.3|^7.0|^8.0", + "symfony/yaml": "^6.3|^7.0|^8.0" }, "type": "library", "extra": { @@ -10025,20 +10035,20 @@ "issues": "https://github.com/laravel/pail/issues", "source": "https://github.com/laravel/pail" }, - "time": "2025-11-20T16:29:35+00:00" + "time": "2026-02-09T13:44:54+00:00" }, { "name": "laravel/pint", - "version": "v1.26.0", + "version": "v1.27.1", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "69dcca060ecb15e4b564af63d1f642c81a241d6f" + "reference": "54cca2de13790570c7b6f0f94f37896bee4abcb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/69dcca060ecb15e4b564af63d1f642c81a241d6f", - "reference": "69dcca060ecb15e4b564af63d1f642c81a241d6f", + "url": "https://api.github.com/repos/laravel/pint/zipball/54cca2de13790570c7b6f0f94f37896bee4abcb5", + "reference": "54cca2de13790570c7b6f0f94f37896bee4abcb5", "shasum": "" }, "require": { @@ -10049,13 +10059,13 @@ "php": "^8.2.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.90.0", - "illuminate/view": "^12.40.1", - "larastan/larastan": "^3.8.0", - "laravel-zero/framework": "^12.0.4", + "friendsofphp/php-cs-fixer": "^3.93.1", + "illuminate/view": "^12.51.0", + "larastan/larastan": "^3.9.2", + "laravel-zero/framework": "^12.0.5", "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^2.3.3", - "pestphp/pest": "^3.8.4" + "pestphp/pest": "^3.8.5" }, "bin": [ "builds/pint" @@ -10092,32 +10102,32 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2025-11-25T21:15:52+00:00" + "time": "2026-02-10T20:00:20+00:00" }, { "name": "laravel/sail", - "version": "v1.51.0", + "version": "v1.53.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "1c74357df034e869250b4365dd445c9f6ba5d068" + "reference": "e340eaa2bea9b99192570c48ed837155dbf24fbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/1c74357df034e869250b4365dd445c9f6ba5d068", - "reference": "1c74357df034e869250b4365dd445c9f6ba5d068", + "url": "https://api.github.com/repos/laravel/sail/zipball/e340eaa2bea9b99192570c48ed837155dbf24fbb", + "reference": "e340eaa2bea9b99192570c48ed837155dbf24fbb", "shasum": "" }, "require": { - "illuminate/console": "^9.52.16|^10.0|^11.0|^12.0", - "illuminate/contracts": "^9.52.16|^10.0|^11.0|^12.0", - "illuminate/support": "^9.52.16|^10.0|^11.0|^12.0", + "illuminate/console": "^9.52.16|^10.0|^11.0|^12.0|^13.0", + "illuminate/contracts": "^9.52.16|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^9.52.16|^10.0|^11.0|^12.0|^13.0", "php": "^8.0", - "symfony/console": "^6.0|^7.0", - "symfony/yaml": "^6.0|^7.0" + "symfony/console": "^6.0|^7.0|^8.0", + "symfony/yaml": "^6.0|^7.0|^8.0" }, "require-dev": { - "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0|^11.0", "phpstan/phpstan": "^2.0" }, "bin": [ @@ -10155,7 +10165,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2025-12-09T13:33:49+00:00" + "time": "2026-02-06T12:16:02+00:00" }, { "name": "mockery/mockery", @@ -10302,39 +10312,36 @@ }, { "name": "nunomaduro/collision", - "version": "v8.8.3", + "version": "v8.9.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "1dc9e88d105699d0fee8bb18890f41b274f6b4c4" + "reference": "a1ed3fa530fd60bc515f9303e8520fcb7d4bd935" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/1dc9e88d105699d0fee8bb18890f41b274f6b4c4", - "reference": "1dc9e88d105699d0fee8bb18890f41b274f6b4c4", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/a1ed3fa530fd60bc515f9303e8520fcb7d4bd935", + "reference": "a1ed3fa530fd60bc515f9303e8520fcb7d4bd935", "shasum": "" }, "require": { - "filp/whoops": "^2.18.1", - "nunomaduro/termwind": "^2.3.1", + "filp/whoops": "^2.18.4", + "nunomaduro/termwind": "^2.4.0", "php": "^8.2.0", - "symfony/console": "^7.3.0" + "symfony/console": "^7.4.4 || ^8.0.4" }, "conflict": { - "laravel/framework": "<11.44.2 || >=13.0.0", - "phpunit/phpunit": "<11.5.15 || >=13.0.0" + "laravel/framework": "<11.48.0 || >=14.0.0", + "phpunit/phpunit": "<11.5.50 || >=14.0.0" }, "require-dev": { - "brianium/paratest": "^7.8.3", - "larastan/larastan": "^3.4.2", - "laravel/framework": "^11.44.2 || ^12.18", - "laravel/pint": "^1.22.1", - "laravel/sail": "^1.43.1", - "laravel/sanctum": "^4.1.1", - "laravel/tinker": "^2.10.1", - "orchestra/testbench-core": "^9.12.0 || ^10.4", - "pestphp/pest": "^3.8.2 || ^4.0.0", - "sebastian/environment": "^7.2.1 || ^8.0" + "brianium/paratest": "^7.8.5", + "larastan/larastan": "^3.9.2", + "laravel/framework": "^11.48.0 || ^12.52.0", + "laravel/pint": "^1.27.1", + "orchestra/testbench-core": "^9.12.0 || ^10.9.0", + "pestphp/pest": "^3.8.5 || ^4.4.1 || ^5.0.0", + "sebastian/environment": "^7.2.1 || ^8.0.3 || ^9.0.0" }, "type": "library", "extra": { @@ -10397,98 +10404,7 @@ "type": "patreon" } ], - "time": "2025-11-20T02:55:25+00:00" - }, - { - "name": "openai-php/client", - "version": "v0.17.1", - "source": { - "type": "git", - "url": "https://github.com/openai-php/client.git", - "reference": "f7d3150159a7b840fe144568bede1c072f768343" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/openai-php/client/zipball/f7d3150159a7b840fe144568bede1c072f768343", - "reference": "f7d3150159a7b840fe144568bede1c072f768343", - "shasum": "" - }, - "require": { - "php": "^8.2.0", - "php-http/discovery": "^1.20.0", - "php-http/multipart-stream-builder": "^1.4.2", - "psr/http-client": "^1.0.3", - "psr/http-client-implementation": "^1.0.1", - "psr/http-factory-implementation": "*", - "psr/http-message": "^1.1.0|^2.0.0" - }, - "require-dev": { - "guzzlehttp/guzzle": "^7.9.3", - "guzzlehttp/psr7": "^2.7.1", - "laravel/pint": "^1.24.0", - "mockery/mockery": "^1.6.12", - "nunomaduro/collision": "^8.8.0", - "pestphp/pest": "^3.8.2|^4.0.0", - "pestphp/pest-plugin-arch": "^3.1.1|^4.0.0", - "pestphp/pest-plugin-type-coverage": "^3.5.1|^4.0.0", - "phpstan/phpstan": "^1.12.25", - "symfony/var-dumper": "^7.2.6" - }, - "type": "library", - "autoload": { - "files": [ - "src/OpenAI.php" - ], - "psr-4": { - "OpenAI\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nuno Maduro", - "email": "enunomaduro@gmail.com" - }, - { - "name": "Sandro Gehri" - } - ], - "description": "OpenAI PHP is a supercharged PHP API client that allows you to interact with the Open AI API", - "keywords": [ - "GPT-3", - "api", - "client", - "codex", - "dall-e", - "language", - "natural", - "openai", - "php", - "processing", - "sdk" - ], - "support": { - "issues": "https://github.com/openai-php/client/issues", - "source": "https://github.com/openai-php/client/tree/v0.17.1" - }, - "funding": [ - { - "url": "https://www.paypal.com/paypalme/enunomaduro", - "type": "custom" - }, - { - "url": "https://github.com/gehrisandro", - "type": "github" - }, - { - "url": "https://github.com/nunomaduro", - "type": "github" - } - ], - "time": "2025-10-09T10:35:54+00:00" + "time": "2026-02-17T17:33:08+00:00" }, { "name": "permafrost-dev/code-snippets", @@ -10737,46 +10653,63 @@ }, { "name": "php-debugbar/php-debugbar", - "version": "v2.2.4", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/php-debugbar/php-debugbar.git", - "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35" + "reference": "e50d470344b62a033a76d3d10a803b04c8e3be69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/3146d04671f51f69ffec2a4207ac3bdcf13a9f35", - "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35", + "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/e50d470344b62a033a76d3d10a803b04c8e3be69", + "reference": "e50d470344b62a033a76d3d10a803b04c8e3be69", "shasum": "" }, "require": { - "php": "^8", + "php": "^8.2", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^4|^5|^6|^7" + "symfony/var-dumper": "^5.4|^6|^7|^8" }, "replace": { "maximebf/debugbar": "self.version" }, "require-dev": { - "dbrekelmans/bdi": "^1", - "phpunit/phpunit": "^8|^9", + "dbrekelmans/bdi": "^1.4", + "friendsofphp/php-cs-fixer": "^3.92", + "monolog/monolog": "^3.9", + "php-debugbar/doctrine-bridge": "^3@dev", + "php-debugbar/monolog-bridge": "^1@dev", + "php-debugbar/symfony-bridge": "^1@dev", + "php-debugbar/twig-bridge": "^2@dev", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^10", + "predis/predis": "^3.3", + "shipmonk/phpstan-rules": "^4.3", + "symfony/browser-kit": "^6.4|7.0", + "symfony/dom-crawler": "^6.4|^7", + "symfony/event-dispatcher": "^5.4|^6.4|^7.3|^8.0", + "symfony/http-foundation": "^5.4|^6.4|^7.3|^8.0", + "symfony/mailer": "^5.4|^6.4|^7.3|^8.0", "symfony/panther": "^1|^2.1", - "twig/twig": "^1.38|^2.7|^3.0" + "twig/twig": "^3.11.2" }, "suggest": { - "kriswallsmith/assetic": "The best way to manage assets", - "monolog/monolog": "Log using Monolog", - "predis/predis": "Redis storage" + "php-debugbar/doctrine-bridge": "To integrate Doctrine with php-debugbar.", + "php-debugbar/monolog-bridge": "To integrate Monolog with php-debugbar.", + "php-debugbar/symfony-bridge": "To integrate Symfony with php-debugbar.", + "php-debugbar/twig-bridge": "To integrate Twig with php-debugbar." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { - "DebugBar\\": "src/DebugBar/" + "DebugBar\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -10800,13 +10733,91 @@ "debug", "debug bar", "debugbar", - "dev" + "dev", + "profiler", + "toolbar" ], "support": { "issues": "https://github.com/php-debugbar/php-debugbar/issues", - "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.4" + "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.4.0" }, - "time": "2025-07-22T14:01:30+00:00" + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2026-02-14T14:10:26+00:00" + }, + { + "name": "php-debugbar/symfony-bridge", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-debugbar/symfony-bridge.git", + "reference": "e37d2debe5d316408b00d0ab2688d9c2cf59b5ad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-debugbar/symfony-bridge/zipball/e37d2debe5d316408b00d0ab2688d9c2cf59b5ad", + "reference": "e37d2debe5d316408b00d0ab2688d9c2cf59b5ad", + "shasum": "" + }, + "require": { + "php": "^8.2", + "php-debugbar/php-debugbar": "^3.1", + "symfony/http-foundation": "^5.4|^6.4|^7.3|^8.0" + }, + "require-dev": { + "dbrekelmans/bdi": "^1.4", + "phpunit/phpunit": "^10", + "symfony/browser-kit": "^6|^7", + "symfony/dom-crawler": "^6|^7", + "symfony/mailer": "^5.4|^6.4|^7.3|^8.0", + "symfony/panther": "^1|^2.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\Bridge\\Symfony\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Symfony bridge for PHP Debugbar", + "homepage": "https://github.com/php-debugbar/php-debugbar", + "keywords": [ + "debugbar", + "dev", + "symfony" + ], + "support": { + "issues": "https://github.com/php-debugbar/symfony-bridge/issues", + "source": "https://github.com/php-debugbar/symfony-bridge/tree/v1.1.0" + }, + "time": "2026-01-15T14:47:34+00:00" }, { "name": "php-di/invoker", @@ -10936,153 +10947,18 @@ ], "time": "2025-08-16T11:10:48+00:00" }, - { - "name": "php-http/discovery", - "version": "1.20.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/discovery.git", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0|^2.0", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "nyholm/psr7": "<1.0", - "zendframework/zend-diactoros": "*" - }, - "provide": { - "php-http/async-client-implementation": "*", - "php-http/client-implementation": "*", - "psr/http-client-implementation": "*", - "psr/http-factory-implementation": "*", - "psr/http-message-implementation": "*" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "graham-campbell/phpspec-skip-example-extension": "^5.0", - "php-http/httplug": "^1.0 || ^2.0", - "php-http/message-factory": "^1.0", - "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "sebastian/comparator": "^3.0.5 || ^4.0.8", - "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" - }, - "type": "composer-plugin", - "extra": { - "class": "Http\\Discovery\\Composer\\Plugin", - "plugin-optional": true - }, - "autoload": { - "psr-4": { - "Http\\Discovery\\": "src/" - }, - "exclude-from-classmap": [ - "src/Composer/Plugin.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", - "homepage": "http://php-http.org", - "keywords": [ - "adapter", - "client", - "discovery", - "factory", - "http", - "message", - "psr17", - "psr7" - ], - "support": { - "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.20.0" - }, - "time": "2024-10-02T11:20:13+00:00" - }, - { - "name": "php-http/multipart-stream-builder", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/php-http/multipart-stream-builder.git", - "reference": "10086e6de6f53489cca5ecc45b6f468604d3460e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/10086e6de6f53489cca5ecc45b6f468604d3460e", - "reference": "10086e6de6f53489cca5ecc45b6f468604d3460e", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.15", - "psr/http-factory-implementation": "^1.0" - }, - "require-dev": { - "nyholm/psr7": "^1.0", - "php-http/message": "^1.5", - "php-http/message-factory": "^1.0.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Http\\Message\\MultipartStream\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "A builder class that help you create a multipart stream", - "homepage": "http://php-http.org", - "keywords": [ - "factory", - "http", - "message", - "multipart stream", - "stream" - ], - "support": { - "issues": "https://github.com/php-http/multipart-stream-builder/issues", - "source": "https://github.com/php-http/multipart-stream-builder/tree/1.4.2" - }, - "time": "2024-09-04T13:22:54+00:00" - }, { "name": "php-webdriver/webdriver", - "version": "1.15.2", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "998e499b786805568deaf8cbf06f4044f05d91bf" + "reference": "ac0662863aa120b4f645869f584013e4c4dba46a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/998e499b786805568deaf8cbf06f4044f05d91bf", - "reference": "998e499b786805568deaf8cbf06f4044f05d91bf", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/ac0662863aa120b4f645869f584013e4c4dba46a", + "reference": "ac0662863aa120b4f645869f584013e4c4dba46a", "shasum": "" }, "require": { @@ -11091,7 +10967,7 @@ "ext-zip": "*", "php": "^7.3 || ^8.0", "symfony/polyfill-mbstring": "^1.12", - "symfony/process": "^5.0 || ^6.0 || ^7.0" + "symfony/process": "^5.0 || ^6.0 || ^7.0 || ^8.0" }, "replace": { "facebook/webdriver": "*" @@ -11104,10 +10980,10 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.5", - "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0" + "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0 || ^8.0" }, "suggest": { - "ext-SimpleXML": "For Firefox profile creation" + "ext-simplexml": "For Firefox profile creation" }, "type": "library", "autoload": { @@ -11133,41 +11009,41 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.15.2" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.16.0" }, - "time": "2024-11-21T15:12:59+00:00" + "time": "2025-12-28T23:57:40+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "11.0.11", + "version": "11.0.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4" + "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4", - "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2c1ed04922802c15e1de5d7447b4856de949cf56", + "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.4.0", + "nikic/php-parser": "^5.7.0", "php": ">=8.2", "phpunit/php-file-iterator": "^5.1.0", "phpunit/php-text-template": "^4.0.1", "sebastian/code-unit-reverse-lookup": "^4.0.1", "sebastian/complexity": "^4.0.1", - "sebastian/environment": "^7.2.0", + "sebastian/environment": "^7.2.1", "sebastian/lines-of-code": "^3.0.1", "sebastian/version": "^5.0.2", - "theseer/tokenizer": "^1.2.3" + "theseer/tokenizer": "^1.3.1" }, "require-dev": { - "phpunit/phpunit": "^11.5.2" + "phpunit/phpunit": "^11.5.46" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -11205,7 +11081,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.11" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.12" }, "funding": [ { @@ -11225,32 +11101,32 @@ "type": "tidelift" } ], - "time": "2025-08-27T14:37:49+00:00" + "time": "2025-12-24T07:01:01+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6" + "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6", - "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2f3a64888c814fc235386b7387dd5b5ed92ad903", + "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903", "shasum": "" }, "require": { "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -11278,15 +11154,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator", + "type": "tidelift" } ], - "time": "2024-08-27T05:02:59+00:00" + "time": "2026-02-02T13:52:54+00:00" }, { "name": "phpunit/php-invoker", @@ -11474,16 +11362,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.46", + "version": "11.5.55", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "75dfe79a2aa30085b7132bb84377c24062193f33" + "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/75dfe79a2aa30085b7132bb84377c24062193f33", - "reference": "75dfe79a2aa30085b7132bb84377c24062193f33", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/adc7262fccc12de2b30f12a8aa0b33775d814f00", + "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00", "shasum": "" }, "require": { @@ -11497,19 +11385,20 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0.11", - "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-code-coverage": "^11.0.12", + "phpunit/php-file-iterator": "^5.1.1", "phpunit/php-invoker": "^5.0.1", "phpunit/php-text-template": "^4.0.1", "phpunit/php-timer": "^7.0.1", "sebastian/cli-parser": "^3.0.2", "sebastian/code-unit": "^3.0.3", - "sebastian/comparator": "^6.3.2", + "sebastian/comparator": "^6.3.3", "sebastian/diff": "^6.0.2", "sebastian/environment": "^7.2.1", "sebastian/exporter": "^6.3.2", "sebastian/global-state": "^7.0.2", "sebastian/object-enumerator": "^6.0.1", + "sebastian/recursion-context": "^6.0.3", "sebastian/type": "^5.1.3", "sebastian/version": "^5.0.2", "staabm/side-effects-detector": "^1.0.5" @@ -11555,7 +11444,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.46" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.55" }, "funding": [ { @@ -11579,7 +11468,7 @@ "type": "tidelift" } ], - "time": "2025-12-06T08:01:15+00:00" + "time": "2026-02-18T12:37:06+00:00" }, { "name": "sebastian/cli-parser", @@ -11753,16 +11642,16 @@ }, { "name": "sebastian/comparator", - "version": "6.3.2", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8" + "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85c77556683e6eee4323e4c5468641ca0237e2e8", - "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", + "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", "shasum": "" }, "require": { @@ -11821,7 +11710,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.2" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.3" }, "funding": [ { @@ -11841,7 +11730,7 @@ "type": "tidelift" } ], - "time": "2025-08-10T08:07:46+00:00" + "time": "2026-01-24T09:26:40+00:00" }, { "name": "sebastian/complexity", @@ -12569,36 +12458,36 @@ }, { "name": "spatie/laravel-ray", - "version": "1.43.1", + "version": "1.43.6", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ray.git", - "reference": "108454d234d1aec7bd0ed9e1af4c2c0d794ff340" + "reference": "117a4addce2cb8adfc01b864435b5b278e2f0c40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/108454d234d1aec7bd0ed9e1af4c2c0d794ff340", - "reference": "108454d234d1aec7bd0ed9e1af4c2c0d794ff340", + "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/117a4addce2cb8adfc01b864435b5b278e2f0c40", + "reference": "117a4addce2cb8adfc01b864435b5b278e2f0c40", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", "ext-json": "*", - "illuminate/contracts": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0", - "illuminate/database": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0", - "illuminate/queue": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0", + "illuminate/contracts": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/database": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/queue": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0|^13.0", "php": "^7.4|^8.0", "spatie/backtrace": "^1.7.1", - "spatie/ray": "^1.44.0", + "spatie/ray": "^1.45.0", "symfony/stopwatch": "4.2|^5.1|^6.0|^7.0|^8.0", "zbateson/mail-mime-parser": "^1.3.1|^2.0|^3.0" }, "require-dev": { "guzzlehttp/guzzle": "^7.3", - "laravel/framework": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0", - "laravel/pint": "^1.25", - "orchestra/testbench-core": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "laravel/framework": "^7.20|^8.19|^9.0|^10.0|^11.0|^12.0|^13.0", + "laravel/pint": "^1.27", + "orchestra/testbench-core": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "pestphp/pest": "^1.22|^2.0|^3.0|^4.0", "phpstan/phpstan": "^1.10.57|^2.0.2", "phpunit/phpunit": "^9.3|^10.1|^11.0.10|^12.4", @@ -12642,7 +12531,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-ray/issues", - "source": "https://github.com/spatie/laravel-ray/tree/1.43.1" + "source": "https://github.com/spatie/laravel-ray/tree/1.43.6" }, "funding": [ { @@ -12654,27 +12543,28 @@ "type": "other" } ], - "time": "2025-11-24T15:54:04+00:00" + "time": "2026-02-19T10:24:51+00:00" }, { "name": "spatie/macroable", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/spatie/macroable.git", - "reference": "ec2c320f932e730607aff8052c44183cf3ecb072" + "reference": "2967f69810ba4df158391665c0850010b9d1507c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/macroable/zipball/ec2c320f932e730607aff8052c44183cf3ecb072", - "reference": "ec2c320f932e730607aff8052c44183cf3ecb072", + "url": "https://api.github.com/repos/spatie/macroable/zipball/2967f69810ba4df158391665c0850010b9d1507c", + "reference": "2967f69810ba4df158391665c0850010b9d1507c", "shasum": "" }, "require": { - "php": "^8.0" + "php": "^8.3" }, "require-dev": { - "phpunit/phpunit": "^8.0|^9.3" + "pestphp/pest": "^4", + "phpunit/phpunit": "^12" }, "type": "library", "autoload": { @@ -12702,22 +12592,22 @@ ], "support": { "issues": "https://github.com/spatie/macroable/issues", - "source": "https://github.com/spatie/macroable/tree/2.0.0" + "source": "https://github.com/spatie/macroable/tree/2.1.0" }, - "time": "2021-03-26T22:39:02+00:00" + "time": "2026-01-30T17:13:34+00:00" }, { "name": "spatie/ray", - "version": "1.44.1", + "version": "1.47.0", "source": { "type": "git", "url": "https://github.com/spatie/ray.git", - "reference": "588e201dda9bd94ce27af365f5a734b1de706a81" + "reference": "3112acb6a7fbcefe35f6e47b1dc13341ff5bc5ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ray/zipball/588e201dda9bd94ce27af365f5a734b1de706a81", - "reference": "588e201dda9bd94ce27af365f5a734b1de706a81", + "url": "https://api.github.com/repos/spatie/ray/zipball/3112acb6a7fbcefe35f6e47b1dc13341ff5bc5ce", + "reference": "3112acb6a7fbcefe35f6e47b1dc13341ff5bc5ce", "shasum": "" }, "require": { @@ -12731,7 +12621,7 @@ "symfony/var-dumper": "^4.2|^5.1|^6.0|^7.0.3|^8.0" }, "require-dev": { - "illuminate/support": "^7.20|^8.18|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^7.20|^8.18|^9.0|^10.0|^11.0|^12.0|^13.0", "nesbot/carbon": "^2.63|^3.8.4", "pestphp/pest": "^1.22", "phpstan/phpstan": "^1.10.57|^2.0.3", @@ -12777,7 +12667,7 @@ ], "support": { "issues": "https://github.com/spatie/ray/issues", - "source": "https://github.com/spatie/ray/tree/1.44.1" + "source": "https://github.com/spatie/ray/tree/1.47.0" }, "funding": [ { @@ -12789,20 +12679,20 @@ "type": "other" } ], - "time": "2025-11-21T10:44:03+00:00" + "time": "2026-02-20T20:42:26+00:00" }, { "name": "spatie/x-ray", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/spatie/x-ray.git", - "reference": "d69b4b1d3af845c4b9a1a6943023ef72621a1ddc" + "reference": "9f816cba11d9674d070b898ab572e01fd3690ae0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/x-ray/zipball/d69b4b1d3af845c4b9a1a6943023ef72621a1ddc", - "reference": "d69b4b1d3af845c4b9a1a6943023ef72621a1ddc", + "url": "https://api.github.com/repos/spatie/x-ray/zipball/9f816cba11d9674d070b898ab572e01fd3690ae0", + "reference": "9f816cba11d9674d070b898ab572e01fd3690ae0", "shasum": "" }, "require": { @@ -12849,7 +12739,7 @@ ], "support": { "issues": "https://github.com/spatie/x-ray/issues", - "source": "https://github.com/spatie/x-ray/tree/1.2.1" + "source": "https://github.com/spatie/x-ray/tree/1.2.2" }, "funding": [ { @@ -12861,7 +12751,7 @@ "type": "github" } ], - "time": "2025-11-24T15:24:01+00:00" + "time": "2026-02-09T20:03:00+00:00" }, { "name": "staabm/side-effects-detector", @@ -13067,28 +12957,27 @@ }, { "name": "symfony/yaml", - "version": "v7.4.1", + "version": "v8.0.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "24dd4de28d2e3988b311751ac49e684d783e2345" + "reference": "7a1a90ba1df6e821a6b53c4cabdc32a56cabfb14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/24dd4de28d2e3988b311751ac49e684d783e2345", - "reference": "24dd4de28d2e3988b311751ac49e684d783e2345", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7a1a90ba1df6e821a6b53c4cabdc32a56cabfb14", + "reference": "7a1a90ba1df6e821a6b53c4cabdc32a56cabfb14", "shasum": "" }, "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.4", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<6.4" + "symfony/console": "<7.4" }, "require-dev": { - "symfony/console": "^6.4|^7.0|^8.0" + "symfony/console": "^7.4|^8.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -13119,7 +13008,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.4.1" + "source": "https://github.com/symfony/yaml/tree/v8.0.1" }, "funding": [ { @@ -13139,7 +13028,7 @@ "type": "tidelift" } ], - "time": "2025-12-04T18:11:45+00:00" + "time": "2025-12-04T18:17:06+00:00" }, { "name": "theseer/tokenizer", @@ -13416,5 +13305,5 @@ "ext-sodium": "*" }, "platform-dev": {}, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/jbuk_dev_backup.dump b/jbuk_dev_backup.dump new file mode 100644 index 0000000000000000000000000000000000000000..f0cdee9119c8b993929b1868345f56b56d4fdd8e GIT binary patch literal 71446 zcmWG=ckvBi6kuTCU}R)4Wnf@n&;k*hAc6%%fN>p|1Q8qz3=COGrP=W*sbvgu3=9m0 z=6a?I8ZN0xnTdG{Adaq~UO{?Fx}lMQwxK35N{)ieHR1!2Ak4_Xz+k`tAwjme`Z@c% zc>1|Bpm3N#N-4a`p&t4DoG33`$yt zMrKCfz&A8AwlD!lFFa*|;@ZVA#L>wy*p&h7=3)j02InAG#}HQqn1ljMxk9*Sh=)Rm zt8ai0NZwYVBsI4nC$S{eKmnF|KmiU;6AC{5&W=8=@c}{pVV*9oK?=4CIhjexP+^d= z)V%o6V7=0kG*AL!kYHe7a0&7cz_b;6Sb$Ov1K3+x`FVMjU=}#+&{Ee;h(ZPi21r<# zT7s1t8yK2cg2N)Qs3bEvC$$(X9OCHY0}Y6NMtDGgMHLE4lX5bX^2RDcNi`78K(`h_|Agt~&2fcTCP2)?tUvxlpKp*0tS8Z6KV zxCAr!z*z}QfI|bEL(qbb0aT6~8JdGtf!Gk0X7CaSR58G+8Ej!E2reTbVW;39?&s>F z;1mfdikul37#w{z=D@n~O!Iqbp;W+wCi!jqA#ab_eW7h_~1kQ@~=G3!v zX`1U4U}+1d?=VvqBs@W-5h=Ov4n!NaXs~1uMvDgAxv(2gE<}nGr~%;INYmO5)U5)y zBQeSZOxIurB{->q2}tPR%%q0ssoDZ-CdCzwcrvRu?#znm1I$c|q=pKa*9g5Vx(f*x zEUCuKfC1E-g=H>`D$oT-dm65RP`1V0L`G}q<|XE);%F*E+NjA$RVqZJIJqb_HLo}$ zzeJ(5G&2Pv2We`9rABv%Q8%q`4LAY>$>85?jpbiT+TqOg{DVQM$E)l>4Bv5b`3r2=uRfxLV z5^J%5HTdw939bao1en`#76`@EC=HCze0Lub9N5x`83Q{50|R8l2%{|cfk+o9^&C_= zp^^ZiES~5B0jeHPxqw!J&@}%_!_px(uVbb?NDz~ndmliwVTl=YLk3WqgoFt!*X3kWdK+ca=`!^*+R1vU&(-bWDCs@%%UMbuLP7msZlnVp?U2w*jpe1qinDM zkH@4XX6B@(#AoFvVH6K)IEn`(Er=2V>o^yv-HjuMpcN3w`FVM%$t9WjScka_OH)fz zv5l4$Bv$6+C#GPNO07svEx=_U)C&a1zu}|l&Y?j;u6`l$A)daj!6A;m0dV(&v${O2 zHbbfZp|*g+7Bjhm;)L|v{sf{8OK!I?VGsh(#=+wgcZRRV-3~xIT0z7dx0x;c=k=v1!P$R>m4`n}v1PZnU z0-5N@%uC5kjW174iZ3lrEyBq388|XMnl?nn$37m1v$qbx^| z#0p$x27GP{)Gt@JvcjnU(M*T+NDH(puaujbl9}k5mr{_QnOCBO!#0S6XxeR1 zhUEj4VgoIxF>?SUia`ZBDGh~Z5N%jehNU5c7y|gU!=HMQAj04sJzA!V)n`aR3e>%mfRG1yT!v7Z7dOBF`K=Q3JLOch+ygo%NA* z(mun(i%#?mkL(Q0Py^?1FaZe&oY~wMebmnmYc>bXZ6Vu;uZLiZGjk)GfRUxalGMn^ z=p%hEAwhsGEm(jvGPs%qv%m=wQuvE8VP8W7R!k@(=jNxR=ERp&7U1gNqgCJ#^_eLO zSi2X=`8hd|P6NIik7gvEvH?wHT4qiv2?nQR785xdQk+?p3R@h4W@m0gQP9mt| zQjD!zlU!O{lAjx2P?TSgT2zvmid9j5QA%o2d~$wHX>K0Oq5&(vzzG90Cqfb*spZ!z zh&IeLYh+*y9s>p27M}`j+o303Jshny_+{EK@Dh1=m?%0un~JD=zfmVSB6<7w*u+(>(RZS%YEq1x8hds)`zQ z8v0P)8%XG2D<3Su?Hh;_a4z!0)4oC0N&EDIvwef?3`&v-`s|1U)?@-|-yqvaUi${w z1nh}|8fgK2?2`jDnhQ=3pjrlLUc|)E9K5z0;w(@}i(XIg(V6K* zkhU{=jz*f}LQTJL9f%x_V@MOGlDMW`QesJR20X{Y*8hT=R5)@H%zUaX_j!jqxQrn= z32r6soYaXYC!uQx=Omhr^Wn}|=x(7PV;Q4Q95~_5Sm@S*!DRH#)7M$LdG&i zpEY=oJEcH&7lCp#wza#Zh}40Stzha2Wh$^boXc`cu&>z#XCmyg>tORr64NnbAL2t$ zOMsL?^A8Yh*h(D8>^jUs+!+X|UG*U>D+mvwN@uA>=(k#S)1RLC|a=tJQjAz^_nbwEbYK$c@nu{GluK?5r$ zCc}Wog&-}%%)I!b)PkJK_>z1a)e=NqaYlYo369}z15JpUocv^P-HF$rf{grrb2Vq^^Nj)QH(U3TK>jw9=&eZh&dJC5uO%uoXtm|y}D5I9Rs6ZGi@7p$cws5_2q zBfcUN_jCiY30TWZYAh@^L7#45!`ZJhFa%FB7bF%JXQx(Tl$ZZ;v@u}n5k)4}-Zp5N z1E|=+DhV|MB#*uDLhE5e)q_i5G%1>PzOlDhk+G$6d8cm62dIRontEyk%ivc zLDLM*wAAf(<80obSxrGkHA7F84ZCgvxfyIlVp2{j3A2a@J-Ei) zh@TV$n}wx?WM+cC{Xa1&Gba;1LkDRR(JwJjClO%yJED(L#k%&IEnb^eZIPup}{K1IT`OP&WXh zR9k?nR0FFN`7flPO3sdQEGB#ab|uV zL|;yRUV0{0d2km;3YNuCi!5*yVP+&qLLjw>`UcU4E&Z4>@Pf`Q0b7T=NNUB?WJ1;o zE`n$}x~c*TE{vudvO6#X4qW(v2}oGrE`iYJYu&MyK$xM1r^K3A?3XU9#)`20ROiC>( z%S^_*I0}+Ii=hf}j69i|LWiDU>L8;_*n46S6T!VXJT662MaWXHQG{)zRRIbvpx_&r zQ3@z5k&Kz?Ac>6B(h9Uq7oihrQryVIkO5R&VzC={(bbH*=)!FdxE!Ny$IlQ~!G+ru zm;nkdz`z6~fN+;$=<`D!SW7Vip^2wRi^N%^;r0(k`G!R)H3~cQsiU8ez`|14nHYiR z{!0?mF&a;M5$Ogc;e*s7iZkp@r;+e0+XxY&}85R#q=BEe{87$vKpo&H7B(=Ilmw^J~gkTC=+w%MG%gb1cpXv#w$)O zEKSWzPQ||F8oZ?wOu&{jKx$m@atF{bDi*o4#N5oB%J_`L;tU)u5r`SZ8Tq9-De)

z2N<9hVCb=dnY1AhN@{8F2civ2IxsZ?pA?G`ouFe3!4U~!fCt!NIS{gtAJ4orezU-3 z26gLi(CN8Y*Gu7d31;AeiwrOU2``-GhAH}Brx(_81GH2JzZ>usC5brear|atmM-YY zN)MJxp+NxgGUAj>Fds}13J3J@?7t8V*b7cR?eZ5r~t{NWQC!kd&#n7S$ zRDxB;gG&%Ffm*~6QSpOwCiZbk?9PS;A7q>dd>Aam`=n;ie-LfhLd}dpgn@wpVSR3X zUS>%?=qO|KFbg9XW(d8|5F<8B;OnMvlvW6XsTCriSvyFefWi{FqX9j871aI0Xc&s) zsI0(>p?;=(5Fa#YQl4K#WWTs5H8(XkDYXbPy@90$Gc8 zI7ebV4%ZZY*g{f5jlv6k7z#Yo0uC5ZN;5JuFaZ}) z#s)^_M&QB=cEGzrW(xQiL+Du|km4%~-cSdZX$t;+K9R7B3$D=-d~Uh3zfY*IALxz% z(DfNmQxx)2D@w`|b2QYUD|=y@ph;8R%BmABQTMU8KzaB8bJdS4(7c3_459ui#_$y0v^XbRpM1zCTMJ@_*41RqQvDQOU@2Yb+2qFDwF zI;b9+1)K>q;Lz8=u;LClGjPQLYSn>`=fj%t@KqdejU)vf^e{l|VTYsQz-be;Qk@wz z@X$L!Y`6o@9DE!D(rIT{!><4>F(7ALWWA&WA(B4qp@`^sp=4epeKbpj&>GkXy$0sM z9gr5_<}TX7PFMpIwDuMfP!NA12PV3Hh&tk`6g0iq0~K*HF2r(Zwno!StAI6zRxC#7 z(?MLg0~T^u6!>@@tihRrCv8G>krIet9oU1;9L*wV(1CT(EWn@@3C1}`+&BZw!T>yr z0NzVXa)3c}krH5F9V7)9SO?7l3|a;nqgNn2xC6`(+?xVB3w|UG){p~@mP5h@l6jDG zE}C|TGU75Ws#fe_>3}`)p=zaBpqfG|7Gv~9nbNod)x^jE+|`4)544j7Yk=mV`3f^Y z!CFZVOprG00cnF~B{UZ!ITYPCD%H+r(58)}r3~-I41RzWk_Ta4sx4qkMD zWicn#WZHly1hJU`2?FBMC>H(L!xnM15lYx%(ND9~39ZFV(EHiKxC7b(JkkwX%Yrpz z@r`tYHIWjOAPv~V4#!A0NCT|`%M@B`o1pidMQ{g}C3vkkVo?idBAm`IL0B7^wBIJq2;3~die+*v;|MS zg9roY94f}W>Rb#A43KOLx=u z0d&K;4rIy|bf3A70%9qZjsjwxl#T-83>QrWw;+FCh2oNw%sgu@q$PY{SAYrdoF>>4 zSQqs`@3;ne6{1obG*b@df(V%RQEq|8?{&~derF`FgJ&qg-Uf})r{9Pwk?eN1>C42#>O0_bA5grTBdb zzIz%u>fm#EU@w9bD`?}HjsiR?5m$`rC_rx()lq;ob5e_G7X;AhKSU6);RpiMD;x0# z0C@Q+QUJhad3xEpNss5tR0s-4`x_AyeAt7+ z(g<9mfv1PSQ~S7UVo;|AIRL~y*D9u3cS zSPvrU=_nwb_Nk))JJM4}0d{bwjso~J15k?vav&$XsRr^m;SQCK0(kfnoWx;m8c2%| zev~E14M^uzf=Wfip_DobNGDHH9>UN`5k!L5#TvpU=*I`*Pwp{jfefFe04EdB@CDfa zP+?>?4YM|66CT2+QdoUzWQ6zFHT?dbgYIvv2P{ES8@PxEZftri3lgnrqZqUgGM7YUd4>#003DB{qkuRA2^1_y2OWXJtOR^~5hxQwPcouH#zF5z$l(YU+^5mt52N{LVFc^) zX6EO?&a;68SScdCz>auUajSDhv@*YB)S& z3GNVsiU>kYtY|dXgY`hlDoBX~s`o)#gLM>8xBb#CvqC2`5WdvF?n^UM@WKzI*#QF0 z$+>8LMbZiJF=WRjDCL2UAOns5An%k!<(E_zfW}F{Bs^Qfwm0Gm98fKplUkArI_^|Q zAvev43JDy&jP?bE7I?rL6oLle9n6r!iqZC9f%h-NcL4^whJdFn7(kOS!LB~8&LIi~ z>G8>lC5but>3YSfc(-%uC>ZG|fQ}*2gl@-z%r=m5{(>R;Mm9gJ{sEm|1DZ>KP9)** z3#cnc&@V{FsOu;gf=2Ulic=}}h$*DbLF|w6$LbMb1_lQBYyqS%2AZhF;UOmm1_r_& zf)3P!%2a6hfIMbEr5G|oKawW^tH%V8JXQ>K1`c0=S_MS=3T75ny#(oRAmSKwDgsrhfqyY*HJL1Rs=z+350KgKn}-RB!EgT&~QKg_#vuDKr>36dPRZ} z`o{cVto{M*-$fe6$L}RjgM?rVVVVX?bkr&!jL=KE5Uk$9b8$N8a0Sc)9JJbqpx4kw z{-J?IP48jclOBrIdmul6N8zDPz>%Xs`wIzr3fUZxSEyAd8KV~uVOYI_`wCHzCov-m zG&fGrPmrNi*!{iGKmvJ=N`-|nq;HHUEW)w+4dereQ=nIcf&?(VL{u~(n*;GlS|T-S zTx0ZdA_A*dK<7+CoB$e6goY@NWJgrZgkc!OQ&edVVO;qaiQ7-`acca20&Q?1ob1pI zQ`b>2F{W0ULofNFuzCt~X9PHk2sVp|s-Vz}QrA(SmVYqr!HUM}A5fM7If6jrfv7x$ zY!0ZZwV+beVBAs@gVigbr~&m1K`ZX@r#8^$dV;A9%_vCzp-!QIafwGPRu2(A;~x}z zm<65>F%5F;E776hMorIRoaG;f)w7_*f#8`90x6NGW-N+9AkP?5D=DHE=kZuQL*P_l z?9m2V?@BOLVj0DyMVz4*h6z}`3F`2IMoXbCz)@cj)!{`l1{7b^Dg`l)YE8uI5h6~I z#2#n9#AG$Z=o@G#F*CIo)R{)CdZuRo9=%bRgw?wszkmnTs1R|;=73_3N*T=*J)i;Dt6Gpfl70YRR=jzN(M-ma0L z0Z7nENT6_Y1fQz}S;U0RV94rmT&6+?;Ee@ptNKF9o7#E%3^pp7K0suH4s5dp$P?IF}@Iln2jy? zKttLDjm8;v5OXOAIOxi8M8K)x3OHi}L-5JP&~aPns&9w`um)NXo)QRZ2(}=DN`WH- zTY!OjRJZ~Rsuv@;pyFUNDG4mdY$_tKG;jwNq)vs63WN6ufJd6is#9UcU=1(W2~i-E zu>}~uIu&LxW{4r1N=cBRkFROr4l+{)(6y#Wqs|IQY;fFRO=nSf(ixHg*uoA;8f-qc z;BzC+c#IH4H=B|`giLZG(wz?OKs09n9es>sIZ7acR$oBtbgW?+N1SH~g(Z?T@Wu&9 z4Ad|I^FrGL>GXo>hqRAudpd^^lXMzoI2D70d1L)2eoYzY)B0X7p` zpn=9_aHW2*PK?9|76qF}K>$HFmLSSbbKC)B$^g2Z2r{1mn{rY><$|4qHOTPw>QK$V z7IvsAz_wruM0_0|R3k7#6IB{)10}(VKFOYhD_Bj8%^7qV7#JY-g9h%QK?-8VgNe+P zc!+Ff3cm6abejOK6a>)^G7Wd=f@E=72romyia^U$Atq*~fa)yJj#t7q;|OxFiC_ZL zpA^IZ{FpEFm`K4H6Go=sV;Uen1Gxw}CO`!d)`T5_r?f*DMIhKgrejOcE<_oQFJwU` zQxuHgp&>;1V2UgFj1A4f1t{3h(2xUJjy2Hm6`)`PaEBMjOl(1guK)!bi6fLi=1~wp z(EVkI0J6dzK#*fV;5&qh6%b5tfrB-u@TM>LJS^7mg3E$U#};UK(-&MjX2`*%z$Q}? zeCTa=8=S#sWC%Xn2b3{EYu6ND46qZh1|7a}SeR~X0SA)SWOFe%yzq=i;LDO=18{{D#7u0#gfB~ijl>#85c4PqAm~mgM3#)h z6+kA2rr`b{Y=&6@#)yY9K+_m_hN|%$9|JW3>$n$84$~TVMGI9D52<1C^$MXXi!lNd zCV^=S1%ZokY+M4)z%{S{XIPjskOG&Si4&MH*peYk4xF{Hr9^xg7N!|b_+_V7QZvXL za0QvMktu@_=ni!3yUlQ{6adv=Sj#_r$Mj$~3v1wFbqvm+#y6sl-BQee$8948(E#24 zhA0-Ca7TkV1E}o6;au#(ko(T?HPAulE8uD-V>gq8=m2jpgxU@-M8JZe7CPR73TtQ+ z8!2Ebp!QNTa@=r7jwSercgV^T$R1osm4P)61mI~wLyW*0$lz^^IMX<2=?l)71Z%|% zKCm#@L`s4QeZ1HMXD}HXLJsW&+Y1XO&}K|%WMK_0d@Uw|p@n2PJOzTpKnW1Enw7i| z1DODIGBpFv3wOX7Gw3idFko5V13#+F&Vo?UR4_g(7ZxRlR zIT#5PiyE+9lmt3@5|m1}AJ6D=5F? zo882)5Hp0a+D1WeLwB(v>i%Hd!EMQ)k8%Sobg3AY;0DdvK#L}41BH1co~jPRIwHaxWG>Wu)C~G?oI!752p&NKFJw~yli*Z_HEi*9SHW7bg(p}7 zY$j^Tg>1# z$dIJL=3@&ud~?7^`Z0nJNe*l_C4q=u)mWeeBGQG*#wI36!@RJ03~1{;GcP5z0=)3g z)6c~<0&|{zwMW8Y65He)|-CPQB2IK%R(1zxC2s1M! z9&0dx56#02CWt01`q9Hm0VRkK+7M@ufkF(lp&nO=A@ra*m6BkCUK4^b&g+aj_{B%t^UkIb7T2M`l^H3>J z8V0RhCn^mS^eH7#0ll{fqXdq?9VNyLpxyS!-HY5bBkW-gYQ>_08U+_i!AWl47CNm{I zEx#x=Gd&M{&z+k$(&i*cS7-{JAqKcHC5h?SdXmWU*z8nr^AB?MboYa7c!I0WOwm*b za&>bJa`kg|4TkluVA91Jkj5y!B}g!}AkSj-L6Ie~xe7Cmz$F8i0PmLq_ZG3=mjJyJ z-N+Cec*e%iGiecBur%C}W(gkjLv|f%q=AcMg7MW#t@uK<4mGMEa@b-CR31Yk2;YDp ziZ8)=2Weq5vLq-5K~wV3R7!=oF|mZijfnyJI}91Y!m=}Pyn>P0m-Sj zGE@(q2tu_0Tb4pq0bjfa4Ib23f;tFWG=Zdu$w;WyVPqv#X>`|65LqU$3}gwtdkJGK zBNta>nHU=~sNq~*32`yuVs9bASONth?id2eBGzzXjUJd&u*DBV4wlkD846S%xw!hc zhPWy?I|e&Dy0}_%G2ol(gct#G2aae1NntpVyf_1GpfxtOfHp#53o$X`EDvX#8JRJt z;*2w}LkUOOG-^Z{nq8!4D6H}1Pn6T}#S@yl$crXWHDm;f9i%JFjs-s{(&n`NL@{+nO93`%%EC>8Zi(#Y~>tMbHR%U7vPQr zh!rqjQV<6w&?X!#E-;%3S-9iC5A3;g5AuA=sjL@VFt86{ukk zlf@SLU^!Sb0N<1j*dnZfUyNZrd0`K!K`f!yu9-l4fEf3H=HLo@69Y)m1Yg<*W5k1I z?2tkSSJ8y;Vo;b_*or2Y9J)QIu>f@hwnzX;!Qud4K?Ji1BN|{5=q{ijB0#HT!3B^R z>;^{kVdQLF5n*g$!T?%(iDe)oF})belsc#gh(`>k!Ll%}cshiqn80o)wphci5{olX zqY>duY%z&ps0L_0T@!1IfTV>2pmH2@u`h;oU}aeRKwd%s$G<5wBbpjRJ57d$sEq|i z2Jk8#K1K$HiaEIx&So7p5NJ97E%=SDy@K#gm4M|-FE}4;|8Yr5&# z-rk@&-!ADfI~m{iI{j(IT#1J#{CX|j7j^Ini&z}W-cfhuR@3!ebFV#6#Kq{`lotAR0aDl`R+=cv$=%5W;(0wzt^2ge#+TVDVH=-W@)ZHbo~9jrUXa6gQpVT z^g3^_uT$~};OpJD;M2^qS?3=7>4@Z5wd&O?zYCX7zZF;#V0K(?`n9i7yDs_4-b&wh ztNo1nwL`NFoA$9ZuFtbDjXLz);Zmk^z_d#f@@1DquSw~9Hsr%rMnaNu#ixH-nB<4xpj57x`|vWpuW+Vv|~E*9A73U$8I z6KUJ+=~F&E;+^8gyTMKC&kHHmZsWP^{v`hAJar|#cmKsf2a_`}FfxGe`!iw%MakUo z(?xg81Z;};Gubno3d;Fe=$*6tRQriC&8L&~BZ|VT#TWxv6g2<+`od7-a4v4qs;gq1 ztOsY#dpGZ5WpPhoO?jEwPg`Ey-Ocu|C++oKQoXNGhACS9%U=0Q622Ga&R2`sxKI7~ zv2DjQ+Mgwdd~WjyyQu6d`*_yg!@Ab3(lR&9J=V5RT9f} zY+1wMnt&rav=nVQrBCO6{+snLX3vg_rRVj(9BsAQU!y*M`|@jL;@l1PK0CfT?|6DG z(8f5>+R5gm>)p!@XM!%wQ9H2fS(#Prumg{u?W7^_u| z@JnYDe^NWzb2&pTfra7t!IG4QTjEnrKQ4T?V-KVH(s{kFc{Pm<=Dp&M>+0chP@WZ5 zJ9~BP;mg4c_w@F2Fn&9xHRW)i`+^RU=tXfEMO??Hs~6n4R<>W)!p_EK%k~sq-`wYK zC5x0-Pd~GT{rexbwVaBPDQR0w6ISc(c3gj>#y4lm%Yz(mLeo^{BwX(~AoJ#v=1CTisdU)5=77eUHFvxY zD@IOnnYAcRbWeko^^%DWW-l$?KhtuqFS=+pe>2xXy#)uO65n)pZRYW$ z-n|WWrS5$l$Lx1bY3ktIbxJb(>-9Emm0*KK28T2jJY8_?)YMnE9$M+MEQq-zAZB~m zT;DvyF;G)KHKkE;k8m#A`o|0fj~~rAyIf>KgszE!fyVvPHY*q2t+!;RvDEMfE48j- z-102z8~47CItq$p8-AxT`IMX-kE+cKk9__jlL_-g}MyS zuiN}1^kvP&7&lp&Rx77zJHIkV=#~ZOxKH`~KlOjr#J~5B%wIb{?_5FOy-R{u(>+Y$ zwwab1S?%BYli8PfMdu>3b!oP5**CN)e-?V6wQAA-Q$j}s8*^qzmn528IJF^kSFF{Z zlHaPeQLXz!zt-gys(-Mk{~T|#YU|zEto@7Y8|=4K|I@tOJ5Sqy-|*I#N3FYp+8Iip zto!*p{4`g#FR#zV12elEx|2TdXpAY)U9@A`B=4%DFSbu9QWo6yL`bjdIxCyK}T4`}$o`a5}Ldf6g z59j;|aq~?*s~kOPo)X*DRsKz%9;vKwUXT=j^z^9%O;N{kDyGOv9qg!LlyKV`RvULu zqLyVvcfsqMA;%c6B+7k!CSm9`Q&2cO=2?>hQ$z=2^8M%63Yspg_ZO&&zCCw;MDFK? zdo~yBQ$23IUZb~nT15K47rXo$UzfICyJ#!jRB=J5nzb_1H~eOL^Oi|j|Be~nc|Ps$ zz1ulCPvzOS?oBRx@yeluXMySY;Lk6^7rSvsB;W4SF)z8qa&GKct2r-o?j(z~4_ZHi&*<>w%h&Omc=qjAoBHHZOTSsHzkNUJWvEEV-qgsV{S3l7 z|6D4wk0-gM_sY)PQ_0=%>!NViLcN{tG9AC){C}9Y_3GE{QR_<)$JCe~pe}$?*uH?dWqq(wc7OPb_+bDOJ&UkaMQ#PRGUy8rNyr>fmyWcR* zytvlwPRz1}kH0bRa}QYWv8#WZ^5MjgT_2m2*_@g38PDdl8*si*_K;(BZq{qEiTbwM zaGSk^0mm+n1=Idzm&u&p{z0h9_vjJtOYt0wz82@4RLl_grE_L)bF%mHtNYBSKdu+( zJ21!CYvP;OfW7q>9(_zn&kFapd!9L~j;ZMB$6jdV2)@n~RE<{5F@B=sc}Cmw>@yz5 zV6OJt!No?KEsedrxYm66s#sKY^5@Pus&m}f+|qWjwK*(F$Vg*#nig?1>CcWH3t{2z zPoFJh9hW#cBn4&_m8sphkhEZB!cL|Rg&S`q>=*Hxn;4lHnm+D=)XfZ$hFhW5gD)1v zRdIvw;KU^fzLm0z9aQ_SjW}3z+d|CdbbRBFMco=l=c!nqObLGKwW;&b*159QH*c-l zX*1DZNl74q;R4U!uebRpq*PvKpFUZuSGiHap=5vE-8qW`Ws`qrnZ5p9x2x=W$fv5P zU1`^jGR@CU-(?o0VIdZxvs<+HoCp6ByIompcV2($8>NsFrm>gL@b39A^P}JUb`(idkcTPmS$k8d_?~l8_(J((wKgM)VW$erBP${m5@7qfcn*DnC;hci_ z(#?Y6eD`aPEjs6SwZbm%%Fm-yl|*lB-(eP5EP7MIbVr_2eaOqIPgf^zREpN@I(2hW zXi47MU13LOg+{(U_Q}9gm?`tjCi^X~naTz1g-QnG5MDpwrOuIi4(~9^pUmj&SA-^^`&RZ7X7-lavn>t z@^*%6{p-T>{m*T5^}T*T=J@BB-v1|b9-iac!8ZMR%**VX94ZrxtlXMU^X)!0Y2iDA zJxaNk@31edE8%~&J(+#~TkaEApJeX3V7^#*^AY7$-K@V`->*qs|1AFda<;CCe}gu! zTy{(EE{|!DM3lvSQ&z_+$H(^TxcmdHPq&tSyBIQ;Sz6&uUw?e%9BCiOaX%et4I ztqV|HVXUNiQR^KG%gQRbBbPr{SL~9tuGq$Ef2FC?W9k2WinligPPZ-bsEv62b`9&# zj&+l)78+g=nHPQD^p<$Fz~zkFteF#TiS6QzHJ-ZsC#R+SI_AHrU8Hfx(duQygU9b0VVqMI?&!^k@)$8}omU$<6dZzaE zSF1i3Ml&v2q!B-7D(9`$tW#f4kj^Pny3(@6YsIF?lepV<%3j&p9HMx!ezElA=kbp3 zx~(G@Z#I{n>}2@9MPe`atvvNGzPXndgf3WmZi%89OV+lPDoRc-Ry~lnbbZpr(XaL@ zC0T7_+1*usi=wyxaBo+SNTKmb}|8g)Yc+T&eJC>m8Xdyy?qN>ZyiDJ@=W_ zl{)EI(B;z={}&#co$0LAc43!kzVa!R;1tcWc`2QW`ns|rzn8lkOMNb_;qZ6g|KHxf zI+?xx_Vditi0P(L|E~PJ`eJkW>6KOO2bS7Z+${)rzi-~%jaz*lTq&wC5e(1REE)F4 zr*-z(CsU>Nd%qIowGEuawNKfo;wV$fn#t1wuB}^|;lCk2U zbK0UP8%7&3*3#&2oLBzG)SNspO(b}WaI#b2p$(Tds7Qu5*~>oWo3>O;h;#b>LmTSu zw{Lx0W6Ht2`I={X)6W#{tT_h-x2k-RSKY25Q2RUgOJ{Y*E8*51uNypeOmYk2-@;e2 z@Vn<327w=J){EIT?n!E9kT1O`^@HVZ+V}ZE;y**#4<~44D|FS&dGj`>?q8j~jQa1x zk~|9!T$oTGw7XMC(|*sS8xg|O4vYVp9IVk`zdwNYO_z&Bfsf(J@JlhSMY@~BrVEAd zsd%Y!^}5l`S9)qn`Ye=7Wuph<3C-#21f%L*V`_G)E?RnNYU!s%7d2n~HHkd< zG}kWwl+a1%sEhtfzg$kaIcX)UQKw|>+QJ*Go6G{#rcAsyN9 zM&_v#F3xB6d9bPV^^e+(dK{9Mvrm28xKMt@941I|n{WOMTm1lksWy?PJC3 zE^+Ih+fr$J<7NKAARVQfIjIqA8YP_bCNuVjiWDtvIUu$2;9kv)HT;i$-n6x`zy0{< zi*x_`4t&&}qjmG5j`8$GOp`*xU(We9L8-+tAl8lPrCDCgyGfk2VYP*sHx9;MZf8j$K2Jb*G1I5DslZ(tNm(Q;Wc^R-brZ@dy%_IY6BhEE;!XKsy)@(^>T`b)7 ztZr4-+-%ADu{jN__QGwoH|l0{Yrjm{a!o(!loV*63CJbj3wh1JmKi@WF?ne6gvV1? zFVN$RW}t@WT8)P$4@`^Sr<&4v4Nk7m={)VbXEFy3Vu?_dCy;SkIgzjIopH4UCbML#_5YNE6 z_1;0>4!Z@hZA^!&Of_0x$XeYlG!nfbuCQc7lj)+njr!?rm$x*8YJ8bh{G#WXx@c8BNkLUavcIpyP)d*W@)EQ8BuGS)^s)O^L- zGHHeD!?|lGJ%6@+!@un_6Haf@WSGL>`%OSC@BfsFsIVy}GiJ>R*K?n5wrT34{*!Od zXBHr>s`hE{8cccq^GIZ+(Xx|#c_ODvOzMS>dBAgwo}zk=!)3YSI4|i z>vU1q%3J*R^v|ag|7i(L^lh<-STRwE$=vkD&H4pybtkT`)zUhlGG}=@8~e?|lUi20 zE$=ry>D*CwL-Ch`&D6@0MGf2bJl(qXD|h)el`b`#H!l};KYNf^D*HOpZvW=U#qtvi z)1I#t%zfx^>Z<2~An)FL7fWZ)Ihy_E{c@YTQx`|AIRAWm#U@5M-#7ENNrjZ}QTTrH zy+hsPH4LGj<}kEHr^>8*^{?f9`^}qA1@DJHa(Gyhc|xJeXLI#|HLow%sYYCiRtuiE zK1Khtb#eLZ*!l6(FN&~EochJ@x=+BIaTx=O;ytT<_>SLM6S_5XjpeLvUzkcJ%3v@Sh?k~<(}6T-{NM~*ZmDPo?TvdI?XFpRLs1+I=yOVhNJG)VSp7ts0qo;~YVf*#1CyMv?tgl&U zHq*yy(`=an(@$~AX=RZsnT{A_?er>=_}zT+iKqUj#}}_{mS31~>2>=LnF6zWh10l- zcNdy9PW+gXAj`KXwD5D| ze`5CL{`cs$GU|qVz8+@$(^lB@{)Bav#_@&ad0S5eO**?X?S<|2_rJo@l%Be2oa9-b zmQvz=fBV1i9pBWyZ;V_2wy1b#%&+M-OIHSk`@Qp8>ib|#l;O>L%ck$qs)*c``*O}D z?H9ot1n0fo>*S=CE~+mzo3VbmzfsQLynXk=3UWi1Ema`}@;Be{!n(dFAiU2~*CAR@Zn{u9HYQwfT7bj#&02sgffm zH>5A0_}#T7F-pQJZgNvzMc}h1tFxX-EMb<;SwFLOZ_LR^|L0%Vq!*;T;Jj<>^>v!k z;(3$yI{6+vynEfX8r8!W*=Ej|7_#--PZ8D+r>mqmmNxr|{!2;aJAO~U^k<80m1DR0 z(lmiS%k`W3w_n>Hz~^&B;f?>JLJ2iRDOJA17gKIX{{D90*PQ_Md)G_jiqu-g)~vC} zoaAX0B` z^p&SeJy^Ro{8RGc<)8l5=fMpXp8e|m~qOnMf4*9$u2 z=`E=fUEg{>Zn7WiqD}k-uh&nL+n`8~a|EZZl(n#-ggz*4k5z-Rv7h}AtSoo;nHw3Mwz5BhpaDs3uEYhhV=XsX~Xx3r1NrfezmcF34) zFC3w6rP7R!|PCd@LLKi9M|+adUdsCVYYO{W(YyQR+M)H9yK^fP42wOu=JnKVBO z3F1~c&+5nXuCk%S>_p40*{S=LPybt}ll=bqvJVU9tYV3vc<-i+#}7ljy*4>*HhOv~;`#k`O3%gf$`iMzm1=SA zKArQ%I=OV?$HU7qiv9S{-(GnATd(WJ+@o_h?fw-J_xlZR)&iaNifiw9YES7{cF6Q? zXQt(wssmkp87d|ES+e>L4;P9r(D>-L<#N`PH8GRVot*ua?YGtaSBh#!e4<3RXYHNG z6LiM)-j@f{`aI^WYc#3o)wL=8`>busg@l&9uLBP1Y5rkeBI?7sWZ{6(Kt&z|t!D_aySF0R|wvN&{+nqKE0t=u5rhS}B9Clq8?>#~(RGU+R8rD@(}PbT2_T zz4#Wl`zuL9=T0N}d0U(RRL`1n{9B^FBbz|ZrfBA}(opfK6Ybp=TzBKEw%}rKtNR%J z$SvXac8O?%Z;e`iIbL!8|LPRTb8&HrvS>+zT$;PC#*4XEjIUbX;;vrc)TmlH>$=X_ z4+|q}Md!V1-&E1tiq;f?}41Tj0KY;c9{J>8)%ceYun1z zpB_z$d$Yy-+d*#T_w_%;p6;Dz)<0WE|J0ⅇDo@wO^uDadRtcqNV<=EnY>R1W(uR zT2g*U=84Zyn+yJRlC4U~9tNV1c^<#na4i3e$xFvep2~UZtO?$1T>S>#2flf{nRsCD zV!mar(mTIS`~UnK&j#VRox%Y}DleS>aAf&hO>z=$6tv)wM`Xbls*cZ)Yu0 zlDE~U_N?buZ|*v=o>zv?;n;-4G~Xj~IoFTm>NMC@>gSo0dH(jWx^kjhMFF z#{cpj?a8xhV&}}$f4O(E!2y+Lp)8K4UdUD{**%$A>${$}()a!kS2nYN2aLa6l%o?p z4xc#2d&+v-o4I$^MyT*zjyz(_VZtRkwb|md6t5=lD?RReVJp5UWuDMKw9EUK@T@48 za`m~)uKx~cNE=8Pt~9OCuHsm~(?R##8y)wRaoo!`-}7o&_Czi%+H>ZRAI&BrBVXP7svD;Ap({czq-9=$UTT+v!;eAbm>j6-jH{>u z-$FkD+?np}Kge~+K)~hv)=?>0z^N``0(Q^K%zVJv(S~Xl|rn zO-Hr={5KkL`z8OE>Mh9M)R|^%sPI`U*O1x$Oi=bq)tM88cg#L6=(*herA?`!bNZT~ z__gZ0kF&1aIL%~sr(jv?r+~be>`k+U6}?4Mf2(rYA9?4?JTF!A+26Mh=2SDA{ci`I z;|Ov*_;Pt%j#t6wGw|i)xO9Rq`v&b&1@%78oH~Dc^^*|8RUw8ZL5993d38Ctubk#s zZBl&t`$hgv1GBFm&VT)Iy5GlyYn#W_^(E$~KXRNl;Vm=W=3#EYd-B3|gU3A|n-!p) zmjCTy&!BxA@MYW1;4y}?VfXWA8wk{?)w3qux-7*pVTqJ~_Uh8f%R;MPm}Gi~N){YA zc%#oSGjq!S+G8prlP;)SUEIv8HDnCJB#p4D|fro?(*S~#(Bx*JVlKOE4P>w^=VIa z{;847bm`RN@Fm<{Q+b{!Evr#aVyIYgPMqQS(hEB@Vqe=cv^zHSggaz9XY3AMc{JpL zt)7;s@q(4DK>{b$PMipCS!kI&v2c6T)MJdQPGKugDT`%xrcO>X?%wKgbHknE8r_L2 zn(VeeFS|UCzq!#|LZhIUuROKWarJ{sE1I3>i@pdwzcN#!!Dapm5ks#fUh4n%WqhmP zXY^ieH+P@z&$7)K+yC4?e_MaQpYq+cMJwYSUw+^?XDYD8dHbI?>d}Y8WaU!ACw0GA z=(^6U$Y}egf4gc;=hgPcPd>KR^D*D{tBN;vO_k42x8vDTG>=zT{ftG0?Rx{z$~p~Jdc*`&NnMWDsi-$Hit#`irs z3iqs)zdOav$u6BJ=B2duO8xYuL2NxU_w^+EDe{~Z+9tGHBH`Gd1t*xFAH4Ogqv7$S z8=~(l%L@dTy|i)epOYFpxp3vpZ}po)0$+^z#;KQ0Eo zdv|dkbWYhFnrS4Z(C~e2!?{QQXD97tS$g@!iVI)=MM^PD|9vDQx3~ARf=Ze!!_tYY zVh#*>hCBk65}tY+GY=`wI`-W4h4|;smNLs4icWFzPRj9e=t=AU{NkeH;^jvd&FJq| zlv?I$!TNK#WOLxwH5^=%cAcH88kv9MZTREY9yfkSWxsl-)8rdsd7$>@*{qK6y`48- QfBnaF`uk_l>SqQ90C+q=oB#j- literal 0 HcmV?d00001 diff --git a/package-lock.json b/package-lock.json index 2f96e5fe..26fd3801 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,15 +13,15 @@ "@zachleat/snow-fall": "^1.0.3" }, "devDependencies": { - "@eslint/js": "^9.6.0", + "@eslint/js": "^10.0.1", "@stylistic/eslint-plugin": "^5.1.0", "esbuild": "^0.27.1", - "eslint": "^9.7.0", - "globals": "^16.0.0", + "eslint": "^10.0.1", + "globals": "^17.3.0", "lightningcss": "^1.29.3", "lightningcss-cli": "^1.29.3", - "stylelint": "^16.7.0", - "stylelint-config-standard": "^39.0.0" + "stylelint": "^17.3.0", + "stylelint-config-standard": "^40.0.0" } }, "node_modules/@11ty/is-land": { @@ -35,13 +35,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -60,71 +60,70 @@ } }, "node_modules/@cacheable/memory": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.0.6.tgz", - "integrity": "sha512-7e8SScMocHxcAb8YhtkbMhGG+EKLRIficb1F5sjvhSYsWTZGxvg4KIDp8kgxnV2PUJ3ddPe6J9QESjKvBWRDkg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.0.7.tgz", + "integrity": "sha512-RbxnxAMf89Tp1dLhXMS7ceft/PGsDl1Ip7T20z5nZ+pwIAsQ1p2izPjVG69oCLv/jfQ7HDPHTWK0c9rcAWXN3A==", "dev": true, "license": "MIT", "dependencies": { - "@cacheable/utils": "^2.3.2", + "@cacheable/utils": "^2.3.3", "@keyv/bigmap": "^1.3.0", - "hookified": "^1.13.0", - "keyv": "^5.5.4" + "hookified": "^1.14.0", + "keyv": "^5.5.5" } }, "node_modules/@cacheable/memory/node_modules/@keyv/bigmap": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.0.tgz", - "integrity": "sha512-KT01GjzV6AQD5+IYrcpoYLkCu1Jod3nau1Z7EsEuViO3TZGRacSbO9MfHmbJ1WaOXFtWLxPVj169cn2WNKPkIg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz", + "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==", "dev": true, "license": "MIT", "dependencies": { - "hashery": "^1.2.0", - "hookified": "^1.13.0" + "hashery": "^1.4.0", + "hookified": "^1.15.0" }, "engines": { "node": ">= 18" }, "peerDependencies": { - "keyv": "^5.5.4" + "keyv": "^5.6.0" } }, "node_modules/@cacheable/memory/node_modules/keyv": { - "version": "5.5.5", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.5.tgz", - "integrity": "sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz", + "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@keyv/serialize": "^1.1.1" } }, "node_modules/@cacheable/utils": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.3.2.tgz", - "integrity": "sha512-8kGE2P+HjfY8FglaOiW+y8qxcaQAfAhVML+i66XJR3YX5FtyDqn6Txctr3K2FrbxLKixRRYYBWMbuGciOhYNDg==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.3.4.tgz", + "integrity": "sha512-knwKUJEYgIfwShABS1BX6JyJJTglAFcEU7EXqzTdiGCXur4voqkiJkdgZIQtWNFhynzDWERcTYv/sETMu3uJWA==", "dev": true, "license": "MIT", "dependencies": { - "hashery": "^1.2.0", - "keyv": "^5.5.4" + "hashery": "^1.3.0", + "keyv": "^5.6.0" } }, "node_modules/@cacheable/utils/node_modules/keyv": { - "version": "5.5.5", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.5.tgz", - "integrity": "sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz", + "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==", "dev": true, "license": "MIT", "dependencies": { "@keyv/serialize": "^1.1.1" } }, - "node_modules/@csstools/css-parser-algorithms": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", - "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", + "node_modules/@csstools/css-calc": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.1.1.tgz", + "integrity": "sha512-HJ26Z/vmsZQqs/o3a6bgKslXGFAungXGbinULZO3eMsOyNJHeBBZfup5FiZInOghgoM4Hwnmw+OgbJCNg1wwUQ==", "dev": true, "funding": [ { @@ -137,18 +136,41 @@ } ], "license": "MIT", - "peer": true, "engines": { - "node": ">=18" + "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-tokenizer": "^3.0.4" + "@csstools/css-parser-algorithms": "^4.0.0", + "@csstools/css-tokenizer": "^4.0.0" + } + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz", + "integrity": "sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=20.19.0" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^4.0.0" } }, "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.20.tgz", - "integrity": "sha512-8BHsjXfSciZxjmHQOuVdW2b8WLUPts9a+mfL13/PzEviufUEW2xnvQuOlKs9dRBHgRqJ53SF/DUoK9+MZk72oQ==", + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.28.tgz", + "integrity": "sha512-1NRf1CUBjnr3K7hu8BLxjQrKCxEe8FP/xmPTenAxCRZWVLbmGotkFvG9mfNpjA6k7Bw1bw4BilZq9cu19RA5pg==", "dev": true, "funding": [ { @@ -160,15 +182,12 @@ "url": "https://opencollective.com/csstools" } ], - "license": "MIT-0", - "engines": { - "node": ">=18" - } + "license": "MIT-0" }, "node_modules/@csstools/css-tokenizer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", - "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz", + "integrity": "sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==", "dev": true, "funding": [ { @@ -181,15 +200,14 @@ } ], "license": "MIT", - "peer": true, "engines": { - "node": ">=18" + "node": ">=20.19.0" } }, "node_modules/@csstools/media-query-list-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz", - "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-5.0.0.tgz", + "integrity": "sha512-T9lXmZOfnam3eMERPsszjY5NK0jX8RmThmmm99FZ8b7z8yMaFZWKwLWGZuTwdO3ddRY5fy13GmmEYZXB4I98Eg==", "dev": true, "funding": [ { @@ -203,17 +221,17 @@ ], "license": "MIT", "engines": { - "node": ">=18" + "node": ">=20.19.0" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-tokenizer": "^3.0.4" + "@csstools/css-parser-algorithms": "^4.0.0", + "@csstools/css-tokenizer": "^4.0.0" } }, - "node_modules/@csstools/selector-specificity": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz", - "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==", + "node_modules/@csstools/selector-resolve-nested": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-4.0.0.tgz", + "integrity": "sha512-9vAPxmp+Dx3wQBIUwc1v7Mdisw1kbbaGqXUM8QLTgWg7SoPGYtXBsMXvsFs/0Bn5yoFhcktzxNZGNaUt0VjgjA==", "dev": true, "funding": [ { @@ -227,27 +245,39 @@ ], "license": "MIT-0", "engines": { - "node": ">=18" + "node": ">=20.19.0" }, "peerDependencies": { - "postcss-selector-parser": "^7.0.0" + "postcss-selector-parser": "^7.1.1" } }, - "node_modules/@dual-bundle/import-meta-resolve": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz", - "integrity": "sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==", + "node_modules/@csstools/selector-specificity": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-6.0.0.tgz", + "integrity": "sha512-4sSgl78OtOXEX/2d++8A83zHNTgwCJMaR24FvsYL7Uf/VS8HZk9PTwR51elTbGqMuwH3szLvvOXEaVnqn0Z3zA==", "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/JounQin" + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "engines": { + "node": ">=20.19.0" + }, + "peerDependencies": { + "postcss-selector-parser": "^7.1.1" } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.1.tgz", - "integrity": "sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", + "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", "cpu": [ "ppc64" ], @@ -262,9 +292,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.1.tgz", - "integrity": "sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", + "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", "cpu": [ "arm" ], @@ -279,9 +309,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.1.tgz", - "integrity": "sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", + "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", "cpu": [ "arm64" ], @@ -296,9 +326,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.1.tgz", - "integrity": "sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", + "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", "cpu": [ "x64" ], @@ -313,9 +343,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.1.tgz", - "integrity": "sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", + "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", "cpu": [ "arm64" ], @@ -330,9 +360,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.1.tgz", - "integrity": "sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", + "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", "cpu": [ "x64" ], @@ -347,9 +377,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.1.tgz", - "integrity": "sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", + "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", "cpu": [ "arm64" ], @@ -364,9 +394,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.1.tgz", - "integrity": "sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", + "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", "cpu": [ "x64" ], @@ -381,9 +411,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.1.tgz", - "integrity": "sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", + "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", "cpu": [ "arm" ], @@ -398,9 +428,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.1.tgz", - "integrity": "sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", + "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", "cpu": [ "arm64" ], @@ -415,9 +445,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.1.tgz", - "integrity": "sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", + "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", "cpu": [ "ia32" ], @@ -432,9 +462,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.1.tgz", - "integrity": "sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", + "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", "cpu": [ "loong64" ], @@ -449,9 +479,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.1.tgz", - "integrity": "sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", + "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", "cpu": [ "mips64el" ], @@ -466,9 +496,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.1.tgz", - "integrity": "sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", + "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", "cpu": [ "ppc64" ], @@ -483,9 +513,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.1.tgz", - "integrity": "sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", + "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", "cpu": [ "riscv64" ], @@ -500,9 +530,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.1.tgz", - "integrity": "sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", + "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", "cpu": [ "s390x" ], @@ -517,9 +547,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.1.tgz", - "integrity": "sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", + "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", "cpu": [ "x64" ], @@ -534,9 +564,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.1.tgz", - "integrity": "sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", + "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", "cpu": [ "arm64" ], @@ -551,9 +581,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.1.tgz", - "integrity": "sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", + "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", "cpu": [ "x64" ], @@ -568,9 +598,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.1.tgz", - "integrity": "sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", + "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", "cpu": [ "arm64" ], @@ -585,9 +615,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.1.tgz", - "integrity": "sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", + "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", "cpu": [ "x64" ], @@ -602,9 +632,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.1.tgz", - "integrity": "sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", + "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", "cpu": [ "arm64" ], @@ -619,9 +649,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.1.tgz", - "integrity": "sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", + "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", "cpu": [ "x64" ], @@ -636,9 +666,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.1.tgz", - "integrity": "sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", + "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", "cpu": [ "arm64" ], @@ -653,9 +683,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.1.tgz", - "integrity": "sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", + "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", "cpu": [ "ia32" ], @@ -670,9 +700,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.1.tgz", - "integrity": "sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", + "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", "cpu": [ "x64" ], @@ -687,9 +717,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", - "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", "dev": true, "license": "MIT", "dependencies": { @@ -729,118 +759,89 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", - "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.2.tgz", + "integrity": "sha512-YF+fE6LV4v5MGWRGj7G404/OZzGNepVF8fxk7jqmqo3lrza7a0uUcDnROGRBG1WFC1omYUS/Wp1f42i0M+3Q3A==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.7", + "@eslint/object-schema": "^3.0.2", "debug": "^4.3.1", - "minimatch": "^3.1.2" + "minimatch": "^10.2.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/config-helpers": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", - "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.2.tgz", + "integrity": "sha512-a5MxrdDXEvqnIq+LisyCX6tQMPF/dSJpCfBgBauY+pNZ28yCtSsTvyTYrMhaI+LK26bVyCJfJkT0u8KIj2i1dQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.17.0" + "@eslint/core": "^1.1.0" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/core": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", - "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.0.tgz", + "integrity": "sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==", "dev": true, "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz", - "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.1", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/js": { - "version": "9.39.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz", - "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz", + "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==", "dev": true, "license": "MIT", "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "eslint": "^10.0.0" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } } }, "node_modules/@eslint/object-schema": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", - "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.2.tgz", + "integrity": "sha512-HOy56KJt48Bx8KmJ+XGQNSUMT/6dZee/M54XyUyuvTvPXJmsERRvBchsUVx1UMe1WwIH49XLAczNC7V2INsuUw==", "dev": true, "license": "Apache-2.0", "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", - "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.0.tgz", + "integrity": "sha512-bIZEUzOI1jkhviX2cp5vNyXQc6olzb2ohewQubuYlMXZ2Q/XjBO0x0XhGPvc9fjSIiUN0vw+0hq53BJ4eQSJKQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.17.0", + "@eslint/core": "^1.1.0", "levn": "^0.4.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@humanfs/core": { @@ -940,15 +941,28 @@ "node": ">= 8" } }, + "node_modules/@sindresorhus/merge-streams": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz", + "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@stylistic/eslint-plugin": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.6.1.tgz", - "integrity": "sha512-JCs+MqoXfXrRPGbGmho/zGS/jMcn3ieKl/A8YImqib76C8kjgZwq5uUFzc30lJkMvcchuRn6/v8IApLxli3Jyw==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.9.0.tgz", + "integrity": "sha512-FqqSkvDMYJReydrMhlugc71M76yLLQWNfmGq+SIlLa7N3kHp8Qq8i2PyWrVNAfjOyOIY+xv9XaaYwvVW7vroMA==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.9.0", - "@typescript-eslint/types": "^8.47.0", + "@eslint-community/eslint-utils": "^4.9.1", + "@typescript-eslint/types": "^8.56.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "estraverse": "^5.3.0", @@ -958,9 +972,16 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "peerDependencies": { - "eslint": ">=9.0.0" + "eslint": "^9.0.0 || ^10.0.0" } }, + "node_modules/@types/esrecurse": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", + "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -976,9 +997,9 @@ "license": "MIT" }, "node_modules/@typescript-eslint/types": { - "version": "8.49.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.49.0.tgz", - "integrity": "sha512-e9k/fneezorUo6WShlQpMxXh8/8wfyc+biu6tnAqA81oWrEic0k21RHzP9uqqpyBBeBKu4T+Bsjy9/b8u7obXQ==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.0.tgz", + "integrity": "sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==", "dev": true, "license": "MIT", "engines": { @@ -996,12 +1017,11 @@ "license": "MIT" }, "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -1020,9 +1040,9 @@ } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "license": "MIT", "dependencies": { @@ -1069,16 +1089,6 @@ "dev": true, "license": "Python-2.0" }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -1090,21 +1100,26 @@ } }, "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz", + "integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": "20 || >=22" + } }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz", + "integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" } }, "node_modules/braces": { @@ -1121,23 +1136,23 @@ } }, "node_modules/cacheable": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.3.0.tgz", - "integrity": "sha512-HHiAvOBmlcR2f3SQ7kdlYD8+AUJG+wlFZ/Ze8tl1Vzvz0MdOh8IYA/EFU4ve8t1/sZ0j4MGi7ST5MoTwHessQA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.3.2.tgz", + "integrity": "sha512-w+ZuRNmex9c1TR9RcsxbfTKCjSL0rh1WA5SABbrWprIHeNBdmyQLSYonlDy9gpD+63XT8DgZ/wNh1Smvc9WnJA==", "dev": true, "license": "MIT", "dependencies": { - "@cacheable/memory": "^2.0.6", - "@cacheable/utils": "^2.3.2", - "hookified": "^1.13.0", - "keyv": "^5.5.4", - "qified": "^0.5.2" + "@cacheable/memory": "^2.0.7", + "@cacheable/utils": "^2.3.3", + "hookified": "^1.15.0", + "keyv": "^5.5.5", + "qified": "^0.6.0" } }, "node_modules/cacheable/node_modules/keyv": { - "version": "5.5.5", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.5.tgz", - "integrity": "sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz", + "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==", "dev": true, "license": "MIT", "dependencies": { @@ -1154,23 +1169,6 @@ "node": ">=6" } }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1198,13 +1196,6 @@ "dev": true, "license": "MIT" }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, "node_modules/cosmiconfig": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", @@ -1248,13 +1239,13 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz", - "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.3.3.tgz", + "integrity": "sha512-8HFEBPKhOpJPEPu70wJJetjKta86Gw9+CCyCnB3sui2qQfOvRyqBy4IKLKKAwdMpWb2lHXWk9Wb4Z6AmaUT1Pg==", "dev": true, "license": "MIT", "engines": { - "node": ">=12 || >=16" + "node": ">=12" } }, "node_modules/css-tree": { @@ -1319,19 +1310,6 @@ "node": ">=8" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1360,9 +1338,9 @@ } }, "node_modules/esbuild": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.1.tgz", - "integrity": "sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==", + "version": "0.27.3", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", + "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1373,32 +1351,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.1", - "@esbuild/android-arm": "0.27.1", - "@esbuild/android-arm64": "0.27.1", - "@esbuild/android-x64": "0.27.1", - "@esbuild/darwin-arm64": "0.27.1", - "@esbuild/darwin-x64": "0.27.1", - "@esbuild/freebsd-arm64": "0.27.1", - "@esbuild/freebsd-x64": "0.27.1", - "@esbuild/linux-arm": "0.27.1", - "@esbuild/linux-arm64": "0.27.1", - "@esbuild/linux-ia32": "0.27.1", - "@esbuild/linux-loong64": "0.27.1", - "@esbuild/linux-mips64el": "0.27.1", - "@esbuild/linux-ppc64": "0.27.1", - "@esbuild/linux-riscv64": "0.27.1", - "@esbuild/linux-s390x": "0.27.1", - "@esbuild/linux-x64": "0.27.1", - "@esbuild/netbsd-arm64": "0.27.1", - "@esbuild/netbsd-x64": "0.27.1", - "@esbuild/openbsd-arm64": "0.27.1", - "@esbuild/openbsd-x64": "0.27.1", - "@esbuild/openharmony-arm64": "0.27.1", - "@esbuild/sunos-x64": "0.27.1", - "@esbuild/win32-arm64": "0.27.1", - "@esbuild/win32-ia32": "0.27.1", - "@esbuild/win32-x64": "0.27.1" + "@esbuild/aix-ppc64": "0.27.3", + "@esbuild/android-arm": "0.27.3", + "@esbuild/android-arm64": "0.27.3", + "@esbuild/android-x64": "0.27.3", + "@esbuild/darwin-arm64": "0.27.3", + "@esbuild/darwin-x64": "0.27.3", + "@esbuild/freebsd-arm64": "0.27.3", + "@esbuild/freebsd-x64": "0.27.3", + "@esbuild/linux-arm": "0.27.3", + "@esbuild/linux-arm64": "0.27.3", + "@esbuild/linux-ia32": "0.27.3", + "@esbuild/linux-loong64": "0.27.3", + "@esbuild/linux-mips64el": "0.27.3", + "@esbuild/linux-ppc64": "0.27.3", + "@esbuild/linux-riscv64": "0.27.3", + "@esbuild/linux-s390x": "0.27.3", + "@esbuild/linux-x64": "0.27.3", + "@esbuild/netbsd-arm64": "0.27.3", + "@esbuild/netbsd-x64": "0.27.3", + "@esbuild/openbsd-arm64": "0.27.3", + "@esbuild/openbsd-x64": "0.27.3", + "@esbuild/openharmony-arm64": "0.27.3", + "@esbuild/sunos-x64": "0.27.3", + "@esbuild/win32-arm64": "0.27.3", + "@esbuild/win32-ia32": "0.27.3", + "@esbuild/win32-x64": "0.27.3" } }, "node_modules/escape-string-regexp": { @@ -1415,34 +1393,30 @@ } }, "node_modules/eslint": { - "version": "9.39.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", - "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.0.1.tgz", + "integrity": "sha512-20MV9SUdeN6Jd84xESsKhRly+/vxI+hwvpBMA93s+9dAcjdCuCojn4IqUGS3lvVaqjVYGYHSRMCpeFtF2rQYxQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.21.1", - "@eslint/config-helpers": "^0.4.2", - "@eslint/core": "^0.17.0", - "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.39.1", - "@eslint/plugin-kit": "^0.4.1", + "@eslint-community/regexpp": "^4.12.2", + "@eslint/config-array": "^0.23.2", + "@eslint/config-helpers": "^0.5.2", + "@eslint/core": "^1.1.0", + "@eslint/plugin-kit": "^0.6.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.12.4", - "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.4.0", - "eslint-visitor-keys": "^4.2.1", - "espree": "^10.4.0", - "esquery": "^1.5.0", + "eslint-scope": "^9.1.1", + "eslint-visitor-keys": "^5.0.1", + "espree": "^11.1.1", + "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", @@ -1452,8 +1426,7 @@ "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", + "minimatch": "^10.2.1", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, @@ -1461,7 +1434,7 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://eslint.org/donate" @@ -1476,17 +1449,19 @@ } }, "node_modules/eslint-scope": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", - "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.1.tgz", + "integrity": "sha512-GaUN0sWim5qc8KVErfPBWmc31LEsOkrUJbvJZV+xuL3u2phMUK4HIvXlWAakfC8W4nzlK+chPEAkYOYb5ZScIw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { + "@types/esrecurse": "^4.3.1", + "@types/estree": "^1.0.8", "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1505,6 +1480,37 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/espree": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-11.1.1.tgz", + "integrity": "sha512-AVHPqQoZYc+RUM4/3Ly5udlZY/U4LS8pIG05jEjWM2lQMU/oaZ7qshzAl2YP1tfNmXfftH3ohurfwNAug+MnsQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.16.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^5.0.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/espree": { "version": "10.4.0", "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", @@ -1524,9 +1530,9 @@ } }, "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -1648,9 +1654,9 @@ } }, "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", "dev": true, "license": "ISC", "dependencies": { @@ -1721,6 +1727,19 @@ "dev": true, "license": "ISC" }, + "node_modules/get-east-asian-width": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz", + "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -1776,9 +1795,9 @@ } }, "node_modules/globals": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", - "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", + "version": "17.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.3.0.tgz", + "integrity": "sha512-yMqGUQVVCkD4tqjOJf3TnrvaaHDMYp4VlUSObbkIiuCPe/ofdMBFIAcBbCSRFWOnos6qRiTVStDwqPLUclaxIw==", "dev": true, "license": "MIT", "engines": { @@ -1789,26 +1808,36 @@ } }, "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-16.1.1.tgz", + "integrity": "sha512-dW7vl+yiAJSp6aCekaVnVJxurRv7DCOLyXqEG3RYMYUg7AuJ2jCqPkZTA8ooqC2vtnkaMcV5WfFBMuEnTu1OQg==", "dev": true, "license": "MIT", "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" + "@sindresorhus/merge-streams": "^4.0.0", + "fast-glob": "^3.3.3", + "ignore": "^7.0.5", + "is-path-inside": "^4.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.4.0" }, "engines": { - "node": ">=10" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globby/node_modules/ignore": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", + "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/globjoin": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", @@ -1816,44 +1845,34 @@ "dev": true, "license": "MIT" }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/hashery": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.3.0.tgz", - "integrity": "sha512-fWltioiy5zsSAs9ouEnvhsVJeAXRybGCNNv0lvzpzNOSDbULXRy7ivFWwCCv4I5Am6kSo75hmbsCduOoc2/K4w==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.0.tgz", + "integrity": "sha512-nhQ6ExaOIqti2FDWoEMWARUqIKyjr2VcZzXShrI+A3zpeiuPWzx6iPftt44LhP74E5sW36B75N6VHbvRtpvO6Q==", "dev": true, "license": "MIT", "dependencies": { - "hookified": "^1.13.0" + "hookified": "^1.14.0" }, "engines": { "node": ">=20" } }, "node_modules/hookified": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.14.0.tgz", - "integrity": "sha512-pi1ynXIMFx/uIIwpWJ/5CEtOHLGtnUB0WhGeeYT+fKcQ+WCQbm3/rrkAXnpfph++PgepNqPdTC2WTj8A6k6zoQ==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz", + "integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==", "dev": true, "license": "MIT" }, "node_modules/html-tags": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", - "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-5.1.0.tgz", + "integrity": "sha512-n6l5uca7/y5joxZ3LUePhzmBFUJ+U2YWzhMa8XUTecSeSlQiZdF5XAd/Q3/WUl0VsXgUwWi8I7CNIwdI5WN1SQ==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=20.10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -1886,6 +1905,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-meta-resolve": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", + "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -1953,6 +1983,19 @@ "node": ">=0.12.0" } }, + "node_modules/is-path-inside": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", + "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-plain-object": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", @@ -2060,9 +2103,9 @@ } }, "node_modules/lightningcss": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz", - "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.31.1.tgz", + "integrity": "sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==", "dev": true, "license": "MPL-2.0", "dependencies": { @@ -2076,23 +2119,23 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "lightningcss-android-arm64": "1.30.2", - "lightningcss-darwin-arm64": "1.30.2", - "lightningcss-darwin-x64": "1.30.2", - "lightningcss-freebsd-x64": "1.30.2", - "lightningcss-linux-arm-gnueabihf": "1.30.2", - "lightningcss-linux-arm64-gnu": "1.30.2", - "lightningcss-linux-arm64-musl": "1.30.2", - "lightningcss-linux-x64-gnu": "1.30.2", - "lightningcss-linux-x64-musl": "1.30.2", - "lightningcss-win32-arm64-msvc": "1.30.2", - "lightningcss-win32-x64-msvc": "1.30.2" + "lightningcss-android-arm64": "1.31.1", + "lightningcss-darwin-arm64": "1.31.1", + "lightningcss-darwin-x64": "1.31.1", + "lightningcss-freebsd-x64": "1.31.1", + "lightningcss-linux-arm-gnueabihf": "1.31.1", + "lightningcss-linux-arm64-gnu": "1.31.1", + "lightningcss-linux-arm64-musl": "1.31.1", + "lightningcss-linux-x64-gnu": "1.31.1", + "lightningcss-linux-x64-musl": "1.31.1", + "lightningcss-win32-arm64-msvc": "1.31.1", + "lightningcss-win32-x64-msvc": "1.31.1" } }, "node_modules/lightningcss-android-arm64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz", - "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.31.1.tgz", + "integrity": "sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==", "cpu": [ "arm64" ], @@ -2111,9 +2154,9 @@ } }, "node_modules/lightningcss-cli": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli/-/lightningcss-cli-1.30.2.tgz", - "integrity": "sha512-vTm/775SqvQ74T0y4twiqjopXV6SnAFguuRpnbKUE9aXxqJGxWJoHS77ZRkJj3dKmnD61ejOawg3FBiTT8/3Tw==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli/-/lightningcss-cli-1.31.1.tgz", + "integrity": "sha512-RPaBnXyAW4dSNbhw/wrErQI3Kizn9tDu9zlRX+PoUC8l9uYXfdQeca9gc7ud8QvAou8AnepqmSgp0kH+hIF0hQ==", "dev": true, "hasInstallScript": true, "license": "MPL-2.0", @@ -2131,23 +2174,23 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "lightningcss-cli-android-arm64": "1.30.2", - "lightningcss-cli-darwin-arm64": "1.30.2", - "lightningcss-cli-darwin-x64": "1.30.2", - "lightningcss-cli-freebsd-x64": "1.30.2", - "lightningcss-cli-linux-arm-gnueabihf": "1.30.2", - "lightningcss-cli-linux-arm64-gnu": "1.30.2", - "lightningcss-cli-linux-arm64-musl": "1.30.2", - "lightningcss-cli-linux-x64-gnu": "1.30.2", - "lightningcss-cli-linux-x64-musl": "1.30.2", - "lightningcss-cli-win32-arm64-msvc": "1.30.2", - "lightningcss-cli-win32-x64-msvc": "1.30.2" + "lightningcss-cli-android-arm64": "1.31.1", + "lightningcss-cli-darwin-arm64": "1.31.1", + "lightningcss-cli-darwin-x64": "1.31.1", + "lightningcss-cli-freebsd-x64": "1.31.1", + "lightningcss-cli-linux-arm-gnueabihf": "1.31.1", + "lightningcss-cli-linux-arm64-gnu": "1.31.1", + "lightningcss-cli-linux-arm64-musl": "1.31.1", + "lightningcss-cli-linux-x64-gnu": "1.31.1", + "lightningcss-cli-linux-x64-musl": "1.31.1", + "lightningcss-cli-win32-arm64-msvc": "1.31.1", + "lightningcss-cli-win32-x64-msvc": "1.31.1" } }, "node_modules/lightningcss-cli-android-arm64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-android-arm64/-/lightningcss-cli-android-arm64-1.30.2.tgz", - "integrity": "sha512-CcntRK9yNjFRiZKwW9m4sf5WYYNOGxlD4ROymyIb+KPbsrEBAZSaknoUM1aIhuhvB/TUTtVmPKvt/Zu0LeSR7g==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-android-arm64/-/lightningcss-cli-android-arm64-1.31.1.tgz", + "integrity": "sha512-Zcy4xfNcmavuwdf+/OYy6GJFLSD5EMtliPRiYhqzif3ACJlkGSaCj3hF5/u6SjnCzr1Unr/LKmetzBlG8QLg0w==", "cpu": [ "arm64" ], @@ -2166,9 +2209,9 @@ } }, "node_modules/lightningcss-cli-darwin-arm64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-darwin-arm64/-/lightningcss-cli-darwin-arm64-1.30.2.tgz", - "integrity": "sha512-Z2STTSes07R2R5tOPY85HipU+z1SwUBV2Yp5emAcqL+o5RsOAE1JWbkloQWa++8R6b/gxzD11VPM3WtCCqL8Gg==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-darwin-arm64/-/lightningcss-cli-darwin-arm64-1.31.1.tgz", + "integrity": "sha512-PM9U3fcZOxnvlBlpiNplh/tgJ3fHEBkg1Lp0yHEXZ3P5g0kyaaWfFPH9l9Br3ejLr3rLsvUR6JL3zQiuy/pF6w==", "cpu": [ "arm64" ], @@ -2187,9 +2230,9 @@ } }, "node_modules/lightningcss-cli-darwin-x64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-darwin-x64/-/lightningcss-cli-darwin-x64-1.30.2.tgz", - "integrity": "sha512-N0IGWWsLnv81sDw9i/vvaisp55uDnhoapGBEJ8lMED064CsUHpLCK7L/5B8kFj8UI97zL+xb7KTTGOHkcC8skg==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-darwin-x64/-/lightningcss-cli-darwin-x64-1.31.1.tgz", + "integrity": "sha512-RJPNiU+gOlHtVFtOjcWY2R71jkS5mC91T2g7AYxx44RqlaC72qXrZBYInWYI7Y4wwzEtNrGS593xKmtHNi4kpA==", "cpu": [ "x64" ], @@ -2208,9 +2251,9 @@ } }, "node_modules/lightningcss-cli-freebsd-x64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-freebsd-x64/-/lightningcss-cli-freebsd-x64-1.30.2.tgz", - "integrity": "sha512-17pN+hnxU2fPOGhGzMhPf2KZrIFFwEtrIZYshGDM/jhskJmDq57DAt5esh7PVDUjNkD7JDt3a7E9xJEVltc2Kg==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-freebsd-x64/-/lightningcss-cli-freebsd-x64-1.31.1.tgz", + "integrity": "sha512-ofUzhxh9tF9zNccwh3jWRmPG2X5NJB/EZbWAYIzWiv/+QZy4++xt9sncv2KAGDan7HuLEwy1C3/T0Hv370P90w==", "cpu": [ "x64" ], @@ -2229,9 +2272,9 @@ } }, "node_modules/lightningcss-cli-linux-arm-gnueabihf": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm-gnueabihf/-/lightningcss-cli-linux-arm-gnueabihf-1.30.2.tgz", - "integrity": "sha512-aaeEtZXqvNWDyHYCThugev1YPGlouvY9lE+o9QJg/Z5GTNb/1EM2TaTBGEwdG5m1ChYukc2lD5CPIEHjQ7qzSA==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm-gnueabihf/-/lightningcss-cli-linux-arm-gnueabihf-1.31.1.tgz", + "integrity": "sha512-Q204c6nl6RbptCKnK7kQ9PgpW25TKrCNGrAnJ/6zV5mNSevlqqgq4+YBFLIcfl5Pwt4PcasJdk5mHs7hP1nvlg==", "cpu": [ "arm" ], @@ -2250,9 +2293,9 @@ } }, "node_modules/lightningcss-cli-linux-arm64-gnu": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm64-gnu/-/lightningcss-cli-linux-arm64-gnu-1.30.2.tgz", - "integrity": "sha512-XhgByx2H85MeEWGtI0XR+ugtQRBc/bvRN8gSGdXa3YqVONmACsLj7shatVHmqVOaPgtnevKVKl7wtqfN9pW96A==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm64-gnu/-/lightningcss-cli-linux-arm64-gnu-1.31.1.tgz", + "integrity": "sha512-/87G5NR8p+CLZIvZYt3c9h4jtDSpfhm6JAdF084LRalxOOD1mS506rlcB+nFWCyqnx6hlKGsq+OaDZ+kwHR2/g==", "cpu": [ "arm64" ], @@ -2271,9 +2314,9 @@ } }, "node_modules/lightningcss-cli-linux-arm64-musl": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm64-musl/-/lightningcss-cli-linux-arm64-musl-1.30.2.tgz", - "integrity": "sha512-UR7/N/33b8sG9e07TccxJvWxvNdlMFglesdgv1fi+wMa8sbN3tBPXOGj67B5nlVWHskYD9bHLPahemRWxnNuHQ==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm64-musl/-/lightningcss-cli-linux-arm64-musl-1.31.1.tgz", + "integrity": "sha512-o+fRZtX4iFkTMhSXHzWYkLuCdd8ofKwlRWf8srb/xCq6ir74DZ+S+U3TKuJX0PO/qf+7wnFTMVjUUt/u+wKn6Q==", "cpu": [ "arm64" ], @@ -2292,9 +2335,9 @@ } }, "node_modules/lightningcss-cli-linux-x64-gnu": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-x64-gnu/-/lightningcss-cli-linux-x64-gnu-1.30.2.tgz", - "integrity": "sha512-W6U9LNo+4mCsEB22AIvtRVGp8NETN4by9U2AIRDzZbYZYb7W9+1H56xKzb/2ABQEAoDrh/7027I/XDheuGrlZg==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-x64-gnu/-/lightningcss-cli-linux-x64-gnu-1.31.1.tgz", + "integrity": "sha512-ODSKAllCrnNEtKPadEr96u8Ch2XJLiB7mLWu6q5dpUNqW0MUNNyGm5cL2boZXTWZea40W9Ga3kg7xOF6Nekeig==", "cpu": [ "x64" ], @@ -2313,9 +2356,9 @@ } }, "node_modules/lightningcss-cli-linux-x64-musl": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-x64-musl/-/lightningcss-cli-linux-x64-musl-1.30.2.tgz", - "integrity": "sha512-Qe6hwTXmc37LnKPIyoY20EQgHsVoAeTUF389Bt7sJfK5JZPLm7EyVvqkO4DukCx4Dv4DSskU03o+qT1+s6UeVw==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-x64-musl/-/lightningcss-cli-linux-x64-musl-1.31.1.tgz", + "integrity": "sha512-j0HDWml30CrgZoNtIjUmnun3kaRT31bAn/L3xE1giq7C0ic3JyRCNPCt+XUXySjVHcUwoLotk0SPa14mvJ4aTg==", "cpu": [ "x64" ], @@ -2334,9 +2377,9 @@ } }, "node_modules/lightningcss-cli-win32-arm64-msvc": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-win32-arm64-msvc/-/lightningcss-cli-win32-arm64-msvc-1.30.2.tgz", - "integrity": "sha512-PZrkKHhYncBRh/Xe2Voa7t7ors+zUMU8hm5qOLgR0W5NfhbwwjLBXa3+fFF+BVdpTeyjLGF1ovzKIWSF1rMN/g==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-win32-arm64-msvc/-/lightningcss-cli-win32-arm64-msvc-1.31.1.tgz", + "integrity": "sha512-JPCfe3mAt666yHvPnFlmxKSgOy9qHagi8idWTIvEY8NAfAc833lrtPbTc7exfyz5IPQS3oALjt2qaRw911EApg==", "cpu": [ "arm64" ], @@ -2355,9 +2398,9 @@ } }, "node_modules/lightningcss-cli-win32-x64-msvc": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-cli-win32-x64-msvc/-/lightningcss-cli-win32-x64-msvc-1.30.2.tgz", - "integrity": "sha512-5VUIS1Dcbkcy2SDr7vBlKfwpSx2BUlZwmvoRVWA+OkkLsQhVUtLUKheJJXsOFruBn9uV8FH8KPLkvTJzuGFLyQ==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-cli-win32-x64-msvc/-/lightningcss-cli-win32-x64-msvc-1.31.1.tgz", + "integrity": "sha512-BQ80Jy/sadx/Gj0esQrtDPnL5UwXQuk/gEmh75j6aN8+VvNOSo3Mwc17O8d2+mNuQSorwgxUXXaEmGeTVYBlxQ==", "cpu": [ "x64" ], @@ -2376,9 +2419,9 @@ } }, "node_modules/lightningcss-darwin-arm64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz", - "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.31.1.tgz", + "integrity": "sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==", "cpu": [ "arm64" ], @@ -2397,9 +2440,9 @@ } }, "node_modules/lightningcss-darwin-x64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz", - "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.31.1.tgz", + "integrity": "sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==", "cpu": [ "x64" ], @@ -2418,9 +2461,9 @@ } }, "node_modules/lightningcss-freebsd-x64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz", - "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.31.1.tgz", + "integrity": "sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==", "cpu": [ "x64" ], @@ -2439,9 +2482,9 @@ } }, "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz", - "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.31.1.tgz", + "integrity": "sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==", "cpu": [ "arm" ], @@ -2460,9 +2503,9 @@ } }, "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz", - "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.31.1.tgz", + "integrity": "sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==", "cpu": [ "arm64" ], @@ -2481,9 +2524,9 @@ } }, "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz", - "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.31.1.tgz", + "integrity": "sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==", "cpu": [ "arm64" ], @@ -2502,9 +2545,9 @@ } }, "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz", - "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.31.1.tgz", + "integrity": "sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==", "cpu": [ "x64" ], @@ -2523,9 +2566,9 @@ } }, "node_modules/lightningcss-linux-x64-musl": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz", - "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.31.1.tgz", + "integrity": "sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==", "cpu": [ "x64" ], @@ -2544,9 +2587,9 @@ } }, "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz", - "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.31.1.tgz", + "integrity": "sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==", "cpu": [ "arm64" ], @@ -2565,9 +2608,9 @@ } }, "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz", - "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==", + "version": "1.31.1", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.31.1.tgz", + "integrity": "sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==", "cpu": [ "x64" ], @@ -2608,13 +2651,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -2623,9 +2659,9 @@ "license": "MIT" }, "node_modules/mathml-tag-names": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", - "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-4.0.0.tgz", + "integrity": "sha512-aa6AU2Pcx0VP/XWnh8IGL0SYSgQHDT6Ucror2j2mXeFAlN3ahaNs8EZtG1YiticMkSLj3Gt6VPFfZogt7G5iFQ==", "dev": true, "license": "MIT", "funding": { @@ -2641,13 +2677,13 @@ "license": "CC0-1.0" }, "node_modules/meow": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", - "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-14.1.0.tgz", + "integrity": "sha512-EDYo6VlmtnumlcBCbh1gLJ//9jvM/ndXHfVXIFrZVr6fGcwTUyCTFNTLCKuY3ffbK8L/+3Mzqnd58RojiZqHVw==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2691,16 +2727,19 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz", + "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "*" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/ms": { @@ -2848,16 +2887,6 @@ "node": ">=8" } }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -2898,7 +2927,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -2908,13 +2936,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", - "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==", - "dev": true, - "license": "MIT" - }, "node_modules/postcss-safe-parser": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz", @@ -2948,7 +2969,6 @@ "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -2985,13 +3005,13 @@ } }, "node_modules/qified": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/qified/-/qified-0.5.3.tgz", - "integrity": "sha512-kXuQdQTB6oN3KhI6V4acnBSZx8D2I4xzZvn9+wFLLFCoBNQY/sFnCW6c43OL7pOQ2HvGV4lnWIXNmgfp7cTWhQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/qified/-/qified-0.6.0.tgz", + "integrity": "sha512-tsSGN1x3h569ZSU1u6diwhltLyfUWDp3YbFHedapTmpBl0B3P6U3+Qptg7xu+v+1io1EwhdPyyRHYbEw0KN2FA==", "dev": true, "license": "MIT", "dependencies": { - "hookified": "^1.13.0" + "hookified": "^1.14.0" }, "engines": { "node": ">=20" @@ -3110,13 +3130,16 @@ } }, "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/slice-ansi": { @@ -3175,23 +3198,10 @@ "node": ">=8" } }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/stylelint": { - "version": "16.26.1", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.26.1.tgz", - "integrity": "sha512-v20V59/crfc8sVTAtge0mdafI3AdnzQ2KsWe6v523L4OA1bJO02S7MO2oyXDCS6iWb9ckIPnqAFVItqSBQr7jw==", + "version": "17.3.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-17.3.0.tgz", + "integrity": "sha512-1POV91lcEMhj6SLVaOeA0KlS9yattS+qq+cyWqP/nYzWco7K5jznpGH1ExngvPlTM9QF1Kjd2bmuzJu9TH2OcA==", "dev": true, "funding": [ { @@ -3205,13 +3215,14 @@ ], "license": "MIT", "dependencies": { - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-syntax-patches-for-csstree": "^1.0.19", - "@csstools/css-tokenizer": "^3.0.4", - "@csstools/media-query-list-parser": "^4.0.3", - "@csstools/selector-specificity": "^5.0.0", - "@dual-bundle/import-meta-resolve": "^4.2.1", - "balanced-match": "^2.0.0", + "@csstools/css-calc": "^3.1.1", + "@csstools/css-parser-algorithms": "^4.0.0", + "@csstools/css-syntax-patches-for-csstree": "^1.0.26", + "@csstools/css-tokenizer": "^4.0.0", + "@csstools/media-query-list-parser": "^5.0.0", + "@csstools/selector-resolve-nested": "^4.0.0", + "@csstools/selector-specificity": "^6.0.0", + "balanced-match": "^3.0.1", "colord": "^2.9.3", "cosmiconfig": "^9.0.0", "css-functions-list": "^3.2.3", @@ -3219,43 +3230,42 @@ "debug": "^4.4.3", "fast-glob": "^3.3.3", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^11.1.1", + "file-entry-cache": "^11.1.2", "global-modules": "^2.0.0", - "globby": "^11.1.0", + "globby": "^16.1.0", "globjoin": "^0.1.4", - "html-tags": "^3.3.1", + "html-tags": "^5.1.0", "ignore": "^7.0.5", + "import-meta-resolve": "^4.2.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", "known-css-properties": "^0.37.0", - "mathml-tag-names": "^2.1.3", - "meow": "^13.2.0", + "mathml-tag-names": "^4.0.0", + "meow": "^14.0.0", "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "picocolors": "^1.1.1", "postcss": "^8.5.6", - "postcss-resolve-nested-selector": "^0.1.6", "postcss-safe-parser": "^7.0.1", - "postcss-selector-parser": "^7.1.0", + "postcss-selector-parser": "^7.1.1", "postcss-value-parser": "^4.2.0", - "resolve-from": "^5.0.0", - "string-width": "^4.2.3", - "supports-hyperlinks": "^3.2.0", + "string-width": "^8.1.1", + "supports-hyperlinks": "^4.4.0", "svg-tags": "^1.0.0", "table": "^6.9.0", - "write-file-atomic": "^5.0.1" + "write-file-atomic": "^7.0.0" }, "bin": { "stylelint": "bin/stylelint.mjs" }, "engines": { - "node": ">=18.12.0" + "node": ">=20.19.0" } }, "node_modules/stylelint-config-recommended": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-17.0.0.tgz", - "integrity": "sha512-WaMSdEiPfZTSFVoYmJbxorJfA610O0tlYuU2aEwY33UQhSPgFbClrVJYWvy3jGJx+XW37O+LyNLiZOEXhKhJmA==", + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-18.0.0.tgz", + "integrity": "sha512-mxgT2XY6YZ3HWWe3Di8umG6aBmWmHTblTgu/f10rqFXnyWxjKWwNdjSWkgkwCtxIKnqjSJzvFmPT5yabVIRxZg==", "dev": true, "funding": [ { @@ -3269,16 +3279,16 @@ ], "license": "MIT", "engines": { - "node": ">=18.12.0" + "node": ">=20.19.0" }, "peerDependencies": { - "stylelint": "^16.23.0" + "stylelint": "^17.0.0" } }, "node_modules/stylelint-config-standard": { - "version": "39.0.1", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-39.0.1.tgz", - "integrity": "sha512-b7Fja59EYHRNOTa3aXiuWnhUWXFU2Nfg6h61bLfAb5GS5fX3LMUD0U5t4S8N/4tpHQg3Acs2UVPR9jy2l1g/3A==", + "version": "40.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-40.0.0.tgz", + "integrity": "sha512-EznGJxOUhtWck2r6dJpbgAdPATIzvpLdK9+i5qPd4Lx70es66TkBPljSg4wN3Qnc6c4h2n+WbUrUynQ3fanjHw==", "dev": true, "funding": [ { @@ -3292,42 +3302,58 @@ ], "license": "MIT", "dependencies": { - "stylelint-config-recommended": "^17.0.0" + "stylelint-config-recommended": "^18.0.0" }, "engines": { - "node": ">=18.12.0" + "node": ">=20.19.0" }, "peerDependencies": { - "stylelint": "^16.23.0" + "stylelint": "^17.0.0" + } + }, + "node_modules/stylelint/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/stylelint/node_modules/balanced-match": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", - "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-3.0.1.tgz", + "integrity": "sha512-vjtV3hiLqYDNRoiAv0zC4QaGAMPomEoq83PRmYIofPswwZurCeWR5LByXm7SyoL0Zh5+2z0+HC7jG8gSZJUh0w==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">= 16" + } }, "node_modules/stylelint/node_modules/file-entry-cache": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.1.tgz", - "integrity": "sha512-TPVFSDE7q91Dlk1xpFLvFllf8r0HyOMOlnWy7Z2HBku5H3KhIeOGInexrIeg2D64DosVB/JXkrrk6N/7Wriq4A==", + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.2.tgz", + "integrity": "sha512-N2WFfK12gmrK1c1GXOqiAJ1tc5YE+R53zvQ+t5P8S5XhnmKYVB5eZEiLNZKDSmoG8wqqbF9EXYBBW/nef19log==", "dev": true, "license": "MIT", "dependencies": { - "flat-cache": "^6.1.19" + "flat-cache": "^6.1.20" } }, "node_modules/stylelint/node_modules/flat-cache": { - "version": "6.1.19", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.19.tgz", - "integrity": "sha512-l/K33newPTZMTGAnnzaiqSl6NnH7Namh8jBNjrgjprWxGmZUuxx/sJNIRaijOh3n7q7ESbhNZC+pvVZMFdeU4A==", + "version": "6.1.20", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.20.tgz", + "integrity": "sha512-AhHYqwvN62NVLp4lObVXGVluiABTHapoB57EyegZVmazN+hhGhLTn3uZbOofoTw4DSDvVCadzzyChXhOAvy8uQ==", "dev": true, "license": "MIT", "dependencies": { - "cacheable": "^2.2.0", + "cacheable": "^2.3.2", "flatted": "^3.3.3", - "hookified": "^1.13.0" + "hookified": "^1.15.0" } }, "node_modules/stylelint/node_modules/ignore": { @@ -3340,46 +3366,82 @@ "node": ">= 4" } }, - "node_modules/stylelint/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/stylelint/node_modules/string-width": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.0.tgz", + "integrity": "sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==", "dev": true, "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" }, "engines": { - "node": ">=8" + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/supports-hyperlinks": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz", - "integrity": "sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-4.4.0.tgz", + "integrity": "sha512-UKbpT93hN5Nr9go5UY7bopIB9YQlMz9nm/ct4IXt/irb5YRkn9WaqrOBJGZ5Pwvsd5FQzSVeYlGdXoCAPQZrPg==", "dev": true, "license": "MIT", "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" + "has-flag": "^5.0.1", + "supports-color": "^10.2.2" }, "engines": { - "node": ">=14.18" + "node": ">=20" }, "funding": { "url": "https://github.com/chalk/supports-hyperlinks?sponsor=1" } }, + "node_modules/supports-hyperlinks/node_modules/has-flag": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-5.0.1.tgz", + "integrity": "sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-hyperlinks/node_modules/supports-color": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.2.tgz", + "integrity": "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/svg-tags": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", @@ -3404,9 +3466,9 @@ } }, "node_modules/table/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, "license": "MIT", "dependencies": { @@ -3453,6 +3515,19 @@ "node": ">= 0.8.0" } }, + "node_modules/unicorn-magic": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.4.0.tgz", + "integrity": "sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -3497,9 +3572,9 @@ } }, "node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-7.0.0.tgz", + "integrity": "sha512-YnlPC6JqnZl6aO4uRc+dx5PHguiR9S6WeoLtpxNT9wIG+BDya7ZNE1q7KOjVgaA73hKhKLpVPgJ5QA9THQ5BRg==", "dev": true, "license": "ISC", "dependencies": { @@ -3507,7 +3582,7 @@ "signal-exit": "^4.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^20.17.0 || >=22.9.0" } }, "node_modules/yocto-queue": { diff --git a/package.json b/package.json index 0a1379d2..75250cf5 100644 --- a/package.json +++ b/package.json @@ -6,15 +6,15 @@ "repository": "https://github.com/jonnybarnes/jonnybarnes.uk", "license": "CC0-1.0", "devDependencies": { - "@eslint/js": "^9.6.0", + "@eslint/js": "^10.0.1", "@stylistic/eslint-plugin": "^5.1.0", "esbuild": "^0.27.1", - "eslint": "^9.7.0", - "globals": "^16.0.0", + "eslint": "^10.0.1", + "globals": "^17.3.0", "lightningcss": "^1.29.3", "lightningcss-cli": "^1.29.3", - "stylelint": "^16.7.0", - "stylelint-config-standard": "^39.0.0" + "stylelint": "^17.3.0", + "stylelint-config-standard": "^40.0.0" }, "scripts": { "eslint": "eslint resources/js/*.js", diff --git a/public/assets/css/app.css b/public/assets/css/app.css index 9e44badd..c298590d 100644 --- a/public/assets/css/app.css +++ b/public/assets/css/app.css @@ -1,2 +1,2 @@ -@layer reset{*,:before,:after{box-sizing:border-box}html{-webkit-text-size-adjust:none;-moz-text-size-adjust:none;text-size-adjust:none}body,h1,h2,h3,h4,p,figure,blockquote,dl,dd{margin-block-end:0}ul[role=list],ol[role=list]{list-style:none}body{line-height:1.5}h1,h2,h3,h4,button,input,label{line-height:1.1}h1,h2,h3,h4{text-wrap:balance}a:not([class]){text-decoration-skip-ink:auto;color:currentColor}img,picture{max-width:100%;display:block}input,button,textarea,select{font-family:inherit;font-size:inherit}textarea:not([rows]){min-height:10em}:target{scroll-margin-block:5ex}@media (prefers-reduced-motion){::view-transition-group(*),::view-transition-old(*),::view-transition-new(*){animation:none!important}}}@layer base{:root{color-scheme:light dark;--primary-hue:307;--clr-text:light-dark(oklch(5% .1 var(--primary-hue)),oklch(100% .1 var(--primary-hue)));--clr-background:light-dark(oklch(100% .1 var(--primary-hue)),oklch(15% .15 var(--primary-hue)));--clr-border:light-dark(oklch(90% .2 var(--primary-hue)),oklch(25% .1 var(--primary-hue)));--clr-snow-fall:light-dark(oklch(25% .15 var(--primary-hue)),oklch(85% .2 var(--primary-hue)))}body{background-color:var(--clr-background);color:var(--clr-text)}:root{--border-radius:8px}html{font-size:125%}body{grid-template-rows:min-content 1fr min-content;grid-template-columns:1fr min(80ch,80vw) 1fr;padding-inline:4vw;display:grid;&>header{grid-column:1/-1}&>main{grid-column:2/3}&>footer{grid-column:1/-1;margin-block-start:2ex;& search form{flex-direction:row;align-items:center;gap:1ex;display:flex;& input{min-width:0}}}}.h-feed{flex-direction:column;gap:2ex;display:flex}}@layer components{body>header{grid-template-rows:auto auto;grid-template-columns:auto 1fr auto;align-items:baseline;gap:1rem;display:grid;& a{text-decoration:none}& h1{text-wrap:nowrap;margin:0}& nav{flex-direction:row;gap:.5rem;display:flex;@media screen and (width<=1100px){flex-wrap:wrap;grid-area:2/1/auto/span 3}}}.note{border:1px solid var(--clr-border);border-radius:var(--border-radius);flex-direction:column;padding:1ex 2ex;display:flex;& .e-content{&>p:first-child{margin-block-start:0}& .u-photo{width:100%;height:auto}}& .syndication-links{flex-direction:row;gap:1ex;display:flex;& svg{border-radius:4px;width:auto;height:1lh}}}.reply-to{border:1px solid var(--clr-border);border-top-left-radius:var(--border-radius);border-top-right-radius:var(--border-radius);border-bottom:none;margin-inline:2ex;padding-inline:1ex;font-size:85%}.pagination{flex-direction:row;justify-content:center;align-items:center;display:flex;& div{flex-direction:row;gap:1ex;display:flex}}#theme-selector{& button{appearance:none;background:0 0;border:none;&:hover{cursor:pointer}}& #theme-selector-dropdown{position-area:block-end span-inline-start;border:2px solid var(--clr-border);background-color:var(--clr-background);color:var(--clr-text);margin:0;position:absolute;& fieldset{border:0;flex-direction:row;gap:1ch;display:flex;& input{display:none}}}@media (prefers-reduced-motion:no-preference){& #theme-selector-dropdown{&:popover-open{opacity:1;transform:translateY(0)scale(1);@starting-style{opacity:0;transform:translateY(30px)scale(0)}}opacity:0;transition:transform,opacity,display allow-discrete,overlay allow-discrete;transform-origin:100% 0;transition-duration:.5s;transform:translateY(0)scale(0)}}}::view-transition-group(changing-theme){animation-duration:1.25s}::view-transition-new(changing-theme),::view-transition-old(changing-theme){mix-blend-mode:normal}::view-transition-new(changing-theme){animation-name:reveal}::view-transition-old(changing-theme){animation:none}@keyframes reveal{0%{clip-path:polygon(-30% 0,-30% 0,-15% 100%,-10% 115%)}to{clip-path:polygon(-30% 0,130% 0,115% 100%,-10% 115%)}}} +@layer reset{*,:before,:after{box-sizing:border-box}html{-webkit-text-size-adjust:none;-moz-text-size-adjust:none;text-size-adjust:none}body,h1,h2,h3,h4,p,figure,blockquote,dl,dd{margin-block-end:0}ul[role=list],ol[role=list]{list-style:none}body{line-height:1.5}h1,h2,h3,h4,button,input,label{line-height:1.1}h1,h2,h3,h4{text-wrap:balance}a:not([class]){text-decoration-skip-ink:auto;color:currentColor}img,picture{max-width:100%;display:block}input,button,textarea,select{font-family:inherit;font-size:inherit}textarea:not([rows]){min-height:10em}:target{scroll-margin-block:5ex}@media (prefers-reduced-motion){::view-transition-group(*),::view-transition-old(*),::view-transition-new(*){animation:none!important}}}@layer base{:root{color-scheme:light dark;--primary-hue:307;--clr-text:light-dark(oklch(5% .1 var(--primary-hue)),oklch(100% .1 var(--primary-hue)));--clr-background:light-dark(oklch(100% .1 var(--primary-hue)),oklch(15% .15 var(--primary-hue)));--clr-border:light-dark(oklch(90% .2 var(--primary-hue)),oklch(25% .1 var(--primary-hue)));--clr-snow-fall:light-dark(oklch(25% .15 var(--primary-hue)),oklch(85% .2 var(--primary-hue)))}body{background-color:var(--clr-background);color:var(--clr-text)}:root{--border-radius:8px}html{font-size:125%}body{grid-template-rows:min-content 1fr min-content;grid-template-columns:1fr min(80ch,80vw) 1fr;padding-inline:4vw;display:grid;&>header{grid-column:1/-1}&>main{grid-column:2/3}&>footer{grid-column:1/-1;margin-block-start:2ex;& search form{flex-direction:row;align-items:center;gap:1ex;display:flex;& input{min-width:0}}}}.h-feed{flex-direction:column;gap:2ex;display:flex}}@layer components{body>header{grid-template-rows:auto auto;grid-template-columns:auto 1fr auto;align-items:baseline;gap:1rem;display:grid;& a{text-decoration:none}& h1{text-wrap:nowrap;margin:0}& nav{flex-direction:row;gap:.5rem;display:flex;@media screen and (width<=1100px){flex-wrap:wrap;grid-area:2/1/auto/span 3}}}.note{border:1px solid var(--clr-border);border-radius:var(--border-radius);flex-direction:column;padding:1ex 2ex;display:flex;& .e-content{&>p:first-child{margin-block-start:0}& .u-photo{width:100%;height:auto}}& .syndication-links{flex-direction:row;gap:1ex;display:flex;& svg{border-radius:4px;width:auto;height:1lh}}}.reply-to{border:1px solid var(--clr-border);border-top-left-radius:var(--border-radius);border-top-right-radius:var(--border-radius);border-bottom:none;margin-inline:2ex;padding-inline:1ex;font-size:85%}.pagination{flex-direction:row;justify-content:center;align-items:center;display:flex;& div{flex-direction:row;gap:1ex;display:flex}}#theme-selector{& button{appearance:none;background:0 0;border:none;&:hover{cursor:pointer}}& #theme-selector-dropdown{position-area:block-end span-inline-start;border:2px solid var(--clr-border);background-color:var(--clr-background);color:var(--clr-text);margin:0;position:absolute;& fieldset{border:0;flex-direction:row;gap:1ch;display:flex;& input{display:none}}}@media (prefers-reduced-motion:no-preference){& #theme-selector-dropdown{&:popover-open{opacity:1;transform:translateY(0)scale(1);@starting-style{opacity:0;transform:translateY(30px)scale(0)}}opacity:0;transition:transform, opacity, display allow-discrete, overlay allow-discrete;transform-origin:100% 0;transition-duration:.5s;transform:translateY(0)scale(0)}}}::view-transition-group(changing-theme){animation-duration:1.25s}::view-transition-new(changing-theme),::view-transition-old(changing-theme){mix-blend-mode:normal}::view-transition-new(changing-theme){animation-name:reveal}::view-transition-old(changing-theme){animation:none}@keyframes reveal{0%{clip-path:polygon(-30% 0,-30% 0,-15% 100%,-10% 115%)}to{clip-path:polygon(-30% 0,130% 0,115% 100%,-10% 115%)}}} /*# sourceMappingURL=/assets/css/app.css.map */ diff --git a/public/assets/css/app.css.br b/public/assets/css/app.css.br index b15a799d91f73ebf2b740d7c4be274c8a4a98436..d3c7dbc92b69d353c9d7d40681721153dfa91bd3 100644 GIT binary patch literal 1211 zcmX@Op^PD6$+@hvJ73J2^)*k+F7rX#)P~J6V#}BPj5(<;A{5hMJ=@kN=->X|3#V4p zXsbqket-IO{^vtvYw4wuMPa-(4$sOr-W0 zH~Zej@lkWE_q{%J=3&P^wk+3uD;Yv#cPm`3;W+bg+8jT_JNp>#-dye#zH{Er>z?I7 zCC57|N_Wkx%2H}M@Kun*ySJ_Xa{ZgTajCxp$7k!|Py^go5aT+3)T8%u`duT&R46)7tfrN0i>wZ0dxmVE3z zYc)4VnTG$g*(Y%}Kip@AWaSB=_j8z( zat<5C{5U-4&a_M?F7`Y5j$F$`6pbEpK5%AitLcx?oco8Va8>zNZ;S00MfiS9@OagK zTrxGStu3WQ&}+9qo9+vK$I0xLvR@gPzKOr+W4!+CB6H5NyOB@Vw*8-8ILBY(Wi2SZchSBi@3PghyY$?&Z5a!mN+P39XS*tWzxTA{Tg zqjFtc)-BCKpBnMTH-Sg)hS|+sd3EuOOMC_j20U3`cN|~7WJOK0@uO4n28r`;IfzO< zsA{(6>%6z+tY1x8oBpA&JBjCxKbd^9d_tT&nUwORl7<(sc8S|>Pv?@iAv zj_@BMx0rO&^R;Y!q)U!gF=tQHD!G;Ibm>#QlenIpFx&dPWy}6ES=CFHe|+JzawS89J;jMnMW@Dh^f1dQ$ z_v3A)7~iY4KGykGbNt_xp#IzMV_g_7GPJ+BqB!x-t8mu#juQ`^ebyD(x&8g~Bt*9A zw4R=y&dfxxEH?`&C!G^O+b2h(-&M0u_agzSAH}}Z~twhaQ2jz1;rbpYQ zZnVm-?LYlx%BhDk@11YwOvsP7D7e$yZ0I4SfQk%mpUWq z(4Izv1?@>c%=)hVmrcBP;^E8vmsV^@_li%6V zpFgxL71Od170kFKa7F*Df2yB~?gyKEb9%Gp)rUZa-M9F8 z8*9!#TX!e?(;C$|<(7Tl@E&>Ku_<$$YHf=Jpb0K_#m>Pd{AZv3`}J|M|GY zx{3Mc<3hfkPpP|*_DXoks|$%;m$&wIx0wFB{l&Xtt%B#rb*Dt+YZp9n)``xZy~TRQ j`>w0o6W{zfJte$up3<}B`qo_{XVzXY+CNih^&>t2x64|6 literal 1217 zcmX>&qm1E!$A;tyZxv=)mpRqF-12_?${(GMa<&sviW5s$X4b9aV45SqSD3zZ_yXdX_9({bN6$dh3NiN)Qy4he`%9AZW&x`&1mcz+j@~8hv@e!ZZTX}81v76~H zEnT$t5=+ReXZw^y*E}-xjsJGlWlz?WtgE$W{@LF=ys+!;x)vtiB+GT4OcUGNW^|ap zm^JO`w(CtF=WV|#+V%F;7psK2bfxcFVnp?}#+R9>5{@G|GSeQ_7Pueefh(w zlU5h*R8`w_WuLv@`VJ103^(D)+q9Q$X!{%R==MYpk;tXgw;w(fxM%{S}KF*`AyZi4A|W zNc}^EP?+9^MO@pW^Sb7*E?d&qcv?we_w)kxss8DAvH}lfGIMF%;m!J0vf%m2fSY{F zk59F~#qvLdJy=8W>!fEoD!cM`*M8dXTO;`FDDTrV(`{#`T{!=&Ca|@)-AC$P?i8`- z-PfFAZS88mPre}-_Rwe(>zXC+)$aPfE;(AmlrN^WWkdPSfn{xQwwJAqVT{yJBRzZ2onU0Pp%rVopm%Wm`7BZGox{@(EP;8f3}>(-}P&F8r`Yx4E=pI4}# zEP5I-SCh+k>+`2Q!V@H2rFmEO^xb?td+UwhmA_Wl&UqYhQ7nDkhNBl!1P`9Dyve92 zajo!oUiG$B37-^CX)`@7{9n)WH1c@jWpOi~IR;yvIx4GK*3RcJ*HDF!U? zf=t`p`bAnN>@{!R;x~6$+>qyF(kFD@o$vWP_n7?+9TzzAH=NF6Q&L*DPgh1+ad&@V z)2WXlTR$tWi2B&Wpzb9%*)Y$r;g_8<)8XxJW>n03v6z!li8b?Bll(d3Wlt54eh>N@ zcI)X(_Pa{=1vawXIC0c=d3kv3@r222nbrH))eP+WSeeT>?g z-d&8Tn-W8mEuZw}UjJBiHpV|oX4?mesO9CKa=G0*t*3oFV(VsnBUW8QD}wXLF85@Y zBLy)>UFLXXb_qXKJ=7r9_b}Q%^1t1oHPw9lf6w+*-9D@w_Vc_#+kuj(T~cgH(c7xd zXiOAx*|KHB#mF8x%X?AYN)P7UXivUS%cl~_-h0AZa8l8%m#)=DpUqF4K5VdX`E8*k zr;^=SFBJ*AGW#_3Y;5I p:first-child {\n margin-block-start: 0;\n }\n\n .u-photo {\n width: 100%;\n height: auto;\n }\n }\n\n .syndication-links {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n\n svg {\n border-radius: 4px;\n width: auto;\n height: 1lh;\n }\n }\n }\n\n .reply-to {\n font-size: 85%;\n margin-inline: 2ex;\n padding-inline: 1ex;\n border: 1px solid var(--clr-border);\n border-bottom: none;\n border-top-left-radius: var(--border-radius);\n border-top-right-radius: var(--border-radius);\n }\n}\n","@layer components {\n body > header {\n display: grid;\n grid-template-columns: auto 1fr auto;\n grid-template-rows: auto auto;\n align-items: baseline;\n gap: 1rem;\n\n a {\n text-decoration: none;\n }\n\n h1 {\n margin: 0;\n text-wrap: nowrap;\n }\n\n nav {\n display: flex;\n flex-direction: row;\n gap: .5rem;\n\n @media screen and (width <= 1100px) {\n grid-row: 2;\n grid-column: 1 / span 3;\n flex-wrap: wrap;\n }\n }\n }\n}\n","@layer base {\n :root {\n --border-radius: 8px;\n }\n\n html {\n font-size: 125%;\n }\n\n body {\n display: grid;\n grid-template-columns: 1fr min(80ch, 80vw) 1fr;\n grid-template-rows: min-content 1fr min-content;\n padding-inline: 4vw;\n\n > header {\n grid-column: 1/-1;\n }\n\n > main {\n grid-column: 2/3;\n }\n\n > footer {\n grid-column: 1/-1;\n margin-block-start: 2ex;\n\n search form {\n display: flex;\n flex-direction: row;\n align-items: center;\n gap: 1ex;\n\n input {\n min-width: 0;\n }\n }\n }\n }\n\n .h-feed {\n display: flex;\n flex-direction: column;\n gap: 2ex;\n }\n}\n","@layer components {\n .pagination {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n div {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n }\n }\n}\n","@layer components {\n #theme-selector {\n button {\n appearance: none;\n border: none;\n background: none;\n\n &:hover {\n cursor: pointer;\n }\n }\n\n /* This is the element with the [popover] attribute */\n #theme-selector-dropdown {\n position: absolute;\n position-area: block-end span-inline-start;\n margin: 0;\n border: 2px solid var(--clr-border);\n background-color: var(--clr-background);\n color: var(--clr-text);\n\n fieldset {\n border: 0;\n display: flex;\n flex-direction: row;\n gap: 1ch;\n\n input {\n display: none;\n }\n }\n }\n\n /*\n * This is the element with the [popover] attribute\n * Here we are styling the open and closing animations\n */\n @media (prefers-reduced-motion: no-preference) {\n #theme-selector-dropdown {\n &:popover-open {\n transform: translateY(0) scale(1);\n opacity: 1;\n\n /*\n * Start styles for the opening transition.\n * Added to :popover-open, but after the opened styles.\n */\n @starting-style {\n transform: translateY(30px) scale(0);\n opacity: 0;\n }\n }\n\n /*\n * End styles for the closing transition.\n */\n transform: translateY(0) scale(0);\n opacity: 0;\n\n /*\n * Enumerate transitioning properties, including display and overlay.\n */\n transition: transform, opacity, display allow-discrete, overlay allow-discrete;\n transition-duration: 0.5s;\n transform-origin: top right;\n }\n }\n }\n\n ::view-transition-group(changing-theme) {\n animation-duration: 1.25s;\n }\n\n ::view-transition-new(changing-theme),\n ::view-transition-old(changing-theme) {\n mix-blend-mode: normal;\n }\n\n ::view-transition-new(changing-theme) {\n animation-name: reveal;\n }\n\n ::view-transition-old(changing-theme) {\n animation: none;\n }\n\n @keyframes reveal {\n from {\n clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);\n }\n\n to {\n clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);\n }\n }\n}\n","@layer reset {\n /* Sourced from https://piccalil.li/blog/a-more-modern-css-reset/ */\n\n /* Box sizing rules */\n *,\n *::before,\n *::after {\n box-sizing: border-box;\n }\n\n /* Prevent font size inflation */\n html {\n /* stylelint-disable property-no-vendor-prefix */\n -moz-text-size-adjust: none;\n -webkit-text-size-adjust: none;\n /* stylelint-enable property-no-vendor-prefix */\n text-size-adjust: none;\n }\n\n /* Remove default margin in favour of better control in authored CSS */\n body, h1, h2, h3, h4, p,\n figure, blockquote, dl, dd {\n margin-block-end: 0;\n }\n\n /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */\n ul[role='list'],\n ol[role='list'] {\n list-style: none;\n }\n\n /* Set core body defaults */\n body {\n line-height: 1.5;\n }\n\n /* Set shorter line heights on headings and interactive elements */\n h1, h2, h3, h4,\n button, input, label {\n line-height: 1.1;\n }\n\n /* Balance text wrapping on headings */\n h1, h2,\n h3, h4 {\n text-wrap: balance;\n }\n\n /* A elements that don't have a class get default styles */\n a:not([class]) {\n text-decoration-skip-ink: auto;\n color: currentcolor;\n }\n\n /* Make images easier to work with */\n img,\n picture {\n max-width: 100%;\n display: block;\n }\n\n /* Inherit fonts for inputs and buttons */\n input, button,\n textarea, select {\n font-family: inherit;\n font-size: inherit;\n }\n\n /* Make sure textareas without a rows attribute are not tiny */\n textarea:not([rows]) {\n min-height: 10em;\n }\n\n /* Anything that has been anchored to should have extra scroll margin */\n :target {\n scroll-margin-block: 5ex;\n }\n\n /* Disable view transition animations for users who don’t want them */\n @media (prefers-reduced-motion) {\n ::view-transition-group(*),\n ::view-transition-old(*),\n ::view-transition-new(*) {\n animation: none !important;\n }\n }\n}\n"],"names":[]} \ No newline at end of file +{"version":3,"mappings":"AACA,aGGE,uCAOA,oFASA,8DAMA,4CAMA,qBAKA,+CAMA,8BAMA,gEAMA,yCAOA,mEAOA,qCAKA,gCAKA,gCACE,wGH/EJ,YEAE,oaAwBA,kEIxBA,0BAIA,oBAIA,iIAME,0BAIA,uBAIA,iDAIE,yEAME,uBAON,oDNvCF,kBCAE,wHAOE,yBAIA,+BAKA,gDAKE,kCAAqC,2CMrBzC,+HAOE,aACE,qCAIA,mCAMF,6DAKE,gDAQJ,4MH/BA,sFAME,+CCNF,gBACE,oDAKE,wBAMF,gMAQE,4DAME,uBAUJ,8CACE,2BACE,yDAQE,gBAAiB,8CAST,0KAahB,iEAIA,kGAKA,4DAIA,qDAIA","sources":["resources/css/app.css","resources/css/header.css","resources/css/colours.css","resources/css/reset.css","resources/css/pagination.css","resources/css/theme-selector.css","resources/css/layout.css","resources/css/notes.css"],"sourcesContent":["/* First thing we need to do is declare our cascade layers */\n@layer reset, base, components;\n\n@import url('reset.css');\n@import url('colours.css');\n@import url('layout.css');\n@import url('header.css');\n@import url('notes.css');\n@import url('pagination.css');\n@import url('theme-selector.css');\n","@layer components {\n body > header {\n display: grid;\n grid-template-columns: auto 1fr auto;\n grid-template-rows: auto auto;\n align-items: baseline;\n gap: 1rem;\n\n a {\n text-decoration: none;\n }\n\n h1 {\n margin: 0;\n text-wrap: nowrap;\n }\n\n nav {\n display: flex;\n flex-direction: row;\n gap: .5rem;\n\n @media screen and (width <= 1100px) {\n grid-row: 2;\n grid-column: 1 / span 3;\n flex-wrap: wrap;\n }\n }\n }\n}\n","@layer base {\n :root {\n color-scheme: light dark;\n\n --primary-hue: 307;\n --clr-text: light-dark(\n oklch(5% 0.1 var(--primary-hue)),\n oklch(100% 0.1 var(--primary-hue))\n );\n --clr-background: light-dark(\n oklch(100% 0.1 var(--primary-hue)),\n oklch(15% 0.15 var(--primary-hue))\n );\n --clr-border: light-dark(\n oklch(90% 0.2 var(--primary-hue)),\n oklch(25% 0.1 var(--primary-hue))\n );\n\n /* Adding snow fall colour whilst we are using it */\n --clr-snow-fall: light-dark(\n oklch(25% 0.15 var(--primary-hue)),\n oklch(85% 0.2 var(--primary-hue))\n );\n }\n\n body {\n background-color: var(--clr-background);\n color: var(--clr-text);\n }\n}\n","@layer reset {\n /* Sourced from https://piccalil.li/blog/a-more-modern-css-reset/ */\n\n /* Box sizing rules */\n *,\n *::before,\n *::after {\n box-sizing: border-box;\n }\n\n /* Prevent font size inflation */\n html {\n /* stylelint-disable property-no-vendor-prefix */\n -moz-text-size-adjust: none;\n -webkit-text-size-adjust: none;\n /* stylelint-enable property-no-vendor-prefix */\n text-size-adjust: none;\n }\n\n /* Remove default margin in favour of better control in authored CSS */\n body, h1, h2, h3, h4, p,\n figure, blockquote, dl, dd {\n margin-block-end: 0;\n }\n\n /* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */\n ul[role='list'],\n ol[role='list'] {\n list-style: none;\n }\n\n /* Set core body defaults */\n body {\n line-height: 1.5;\n }\n\n /* Set shorter line heights on headings and interactive elements */\n h1, h2, h3, h4,\n button, input, label {\n line-height: 1.1;\n }\n\n /* Balance text wrapping on headings */\n h1, h2,\n h3, h4 {\n text-wrap: balance;\n }\n\n /* A elements that don't have a class get default styles */\n a:not([class]) {\n text-decoration-skip-ink: auto;\n color: currentcolor;\n }\n\n /* Make images easier to work with */\n img,\n picture {\n max-width: 100%;\n display: block;\n }\n\n /* Inherit fonts for inputs and buttons */\n input, button,\n textarea, select {\n font-family: inherit;\n font-size: inherit;\n }\n\n /* Make sure textareas without a rows attribute are not tiny */\n textarea:not([rows]) {\n min-height: 10em;\n }\n\n /* Anything that has been anchored to should have extra scroll margin */\n :target {\n scroll-margin-block: 5ex;\n }\n\n /* Disable view transition animations for users who don’t want them */\n @media (prefers-reduced-motion) {\n ::view-transition-group(*),\n ::view-transition-old(*),\n ::view-transition-new(*) {\n animation: none !important;\n }\n }\n}\n","@layer components {\n .pagination {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n div {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n }\n }\n}\n","@layer components {\n #theme-selector {\n button {\n appearance: none;\n border: none;\n background: none;\n\n &:hover {\n cursor: pointer;\n }\n }\n\n /* This is the element with the [popover] attribute */\n #theme-selector-dropdown {\n position: absolute;\n position-area: block-end span-inline-start;\n margin: 0;\n border: 2px solid var(--clr-border);\n background-color: var(--clr-background);\n color: var(--clr-text);\n\n fieldset {\n border: 0;\n display: flex;\n flex-direction: row;\n gap: 1ch;\n\n input {\n display: none;\n }\n }\n }\n\n /*\n * This is the element with the [popover] attribute\n * Here we are styling the open and closing animations\n */\n @media (prefers-reduced-motion: no-preference) {\n #theme-selector-dropdown {\n &:popover-open {\n transform: translateY(0) scale(1);\n opacity: 1;\n\n /*\n * Start styles for the opening transition.\n * Added to :popover-open, but after the opened styles.\n */\n @starting-style {\n transform: translateY(30px) scale(0);\n opacity: 0;\n }\n }\n\n /*\n * End styles for the closing transition.\n */\n transform: translateY(0) scale(0);\n opacity: 0;\n\n /*\n * Enumerate transitioning properties, including display and overlay.\n */\n transition: transform, opacity, display allow-discrete, overlay allow-discrete;\n transition-duration: 0.5s;\n transform-origin: top right;\n }\n }\n }\n\n ::view-transition-group(changing-theme) {\n animation-duration: 1.25s;\n }\n\n ::view-transition-new(changing-theme),\n ::view-transition-old(changing-theme) {\n mix-blend-mode: normal;\n }\n\n ::view-transition-new(changing-theme) {\n animation-name: reveal;\n }\n\n ::view-transition-old(changing-theme) {\n animation: none;\n }\n\n @keyframes reveal {\n from {\n clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);\n }\n\n to {\n clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);\n }\n }\n}\n","@layer base {\n :root {\n --border-radius: 8px;\n }\n\n html {\n font-size: 125%;\n }\n\n body {\n display: grid;\n grid-template-columns: 1fr min(80ch, 80vw) 1fr;\n grid-template-rows: min-content 1fr min-content;\n padding-inline: 4vw;\n\n > header {\n grid-column: 1/-1;\n }\n\n > main {\n grid-column: 2/3;\n }\n\n > footer {\n grid-column: 1/-1;\n margin-block-start: 2ex;\n\n search form {\n display: flex;\n flex-direction: row;\n align-items: center;\n gap: 1ex;\n\n input {\n min-width: 0;\n }\n }\n }\n }\n\n .h-feed {\n display: flex;\n flex-direction: column;\n gap: 2ex;\n }\n}\n","@layer components {\n .note {\n display: flex;\n flex-direction: column;\n border: 1px solid var(--clr-border);\n border-radius: var(--border-radius);\n padding: 1ex 2ex;\n\n .e-content {\n > p:first-child {\n margin-block-start: 0;\n }\n\n .u-photo {\n width: 100%;\n height: auto;\n }\n }\n\n .syndication-links {\n display: flex;\n flex-direction: row;\n gap: 1ex;\n\n svg {\n border-radius: 4px;\n width: auto;\n height: 1lh;\n }\n }\n }\n\n .reply-to {\n font-size: 85%;\n margin-inline: 2ex;\n padding-inline: 1ex;\n border: 1px solid var(--clr-border);\n border-bottom: none;\n border-top-left-radius: var(--border-radius);\n border-top-right-radius: var(--border-radius);\n }\n}\n"],"names":[]} \ No newline at end of file diff --git a/public/assets/css/app.css.zst b/public/assets/css/app.css.zst index 962112506c2be8756dff8c812575f4d3d70d7b08..db8c79df55ce45ad12e2b361e339b09079e420a7 100644 GIT binary patch delta 1297 zcmdnay^EVyW2^q(lbEd#X4t_X^zG&C$=%LXUk|vK&6oPzc6ZLd z%$v&lRPQIRyYc?|?v24RXLfEd_4pH(SNPD*XPtWn^Uuf~e^eevC;j*L&()CnHt})c z77L>}e`2?xmL2@7paOb$@s^>5KDR`KWCh z%#ZL#i@f-p5`J!SD?j5z>F7V)OP|cMmb!W1*_S)NqCyL&9L>mZ*m0q&WDXBoV_SFs zw*E~TUWddNNws=qs4QZWpBuq4&T07-}H`HwJUbVFF8*wXx8Pp zeS67yzWeE+NosbQm*VEup9`$XVVb|?!mk?we~(RgzUfW$%sJ;RIe9K`cyYIT&ENO@ zhB2G=*ZVF==}&meAEELt$QhwNWvee?7{LYO( z!(x_iwBN46qo`Hstd+ITM)c4`gXX>O{n?`;3?4r4EH=1$wXLKGVF|gtP7TvO_8o z2FnvC*XO2QKCx-KOF(OQ@2$@z6XcKB+n$zbtJEfp+_a8{R#_hmVgw~l4w&gHz>8u6p|_@7?UiF$Xl;Z)?T zgdncBe42|TU%lfInXNy4a`;8XDHD0mE?=j|Uly{G=l{J=6Xwg#&@w$&V7Vh*dydls zL*@T0N1$LRIT zWz40=<}dD>EXv1aEVov&?zLKCyXB(E3ky6?{BrP@$YGngT~9B4)iN3BgPsi;Oj--` zmMuLYxZ-&AMdus`3GR!lYKu(YoTv|cH06`J_>%N>m*2ANLv_M4ES{;xYk_Pl^>gUNG6^ zznhz6^E$!c!S=k{-Qm%Jfsf)g6u!oMo!B=mOn zX1t4iT5r|Hy(-4|yP7Nm`=)6#9(=Od5prnOn$4F*iW{DE-*0bY?3?!4Lt)YUbC0t9 Ta(ODBTkqjl&0lSEuRjj}NhcLV%W}LS6f|F=&@ez$BB2r$@ezQzHF~s zePsKS>NBFh|5llobv0XxZ)5Ace@a*HPW#EP9Jvbi+|%c$)Of%7|8ga->tVYhn?5o3 zw#oCmzdd^JyqS;Zw)BCOMrT~(wC&p0yUdMV5dEXN=|cwZ{MOncn~aIv&RcX`xRs-3 zWz4MKQJ2*+ZQ9|D%D*jb3wHld{qy?%xr zBe9#QcHWy)m76{&cGoYQa;Ml`S^CDDdC~E!wfZ(m@bYqqM@{UTd{E&+!N-f=0>xZC ze>jCK4&dx{x$|1(-myoA%fH zE=cK5c*`2+T${oWID2cxjLp$~JPLC-S{jdTm-%S9 z{ZgQkz_P?nsml`*jJ+l=mdU!}o~JW8hAE<+`+u?aC4qHO)1t&@u)Ajp@oe{P^)yKE zJFNEq)~RI^Q}sI+aIKfx`uwGWeMf!OG)tbZY2H%GZ&P+huUGv%&(8D}&&v))iK7MG zuTKZ*g>t;w8|Scg!gI9?(JNO3{jY9RUs1R=$-^ZjMa7eA(lJMlLkV-H$lYTUdg#F8 z%q7^$QLoI{$n+u=PCsi(W2MWXO>-?_+{EuuZ$CaCWfqJFLB%O zzVDxrhgi(X-l|foa|?yz*Dqr^)3BCh@9}M`6sUOTUnRA?3zuI&ypoOI3%0r z&pI~ur}UJ)HGf?_^_+ucCic!?=6j}K<*-}pvRy$_!!?=u7~%Cn%1r9Isg(kzE=pea zCKn|O_XOzl&MP@^r*OLa&Qq5ij{JPuGA)*!`=;fCf;rlvSwTseDI^Iff}2lsEcaY<(nP~|eN;q%L#8SG(| z_9WiX<=%839+qPf6YA6V@=55-%&le8(<Qd+BRBO&U6d#uO7O29UKjG1?KRiF{kB7zDv1d0P z=F(xz@AL9GW~FhaVs~1_dectXXB+(54(TbrW?p;vfy5jewt~pusWmxm!r>QP*0e~8 z=qj@>;ydEXzmYjnCuZHZlUEIt>s>pSi|o3y%%*s5$-RZI*ILb(F?HJsbAIUsK~@Vc zmu&ueqE6Cp;^SwDmB+=7M+Ii;DEppW)avgy^^y-3)1@xE zor{TN{U5?39=bAZosSa3^tjW$1+{W>LJ!SYb2oF+Y_%tw@4FvrSp8J?W|Yb0NSX61 Tc@5szw0~XrBv&+GTlF0P{9s`p diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php index 8d10fc63..38a5feb1 100644 --- a/tests/Feature/MicropubControllerTest.php +++ b/tests/Feature/MicropubControllerTest.php @@ -271,7 +271,6 @@ class MicropubControllerTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); $response - ->dump() ->assertStatus(201) ->assertJson(['response' => 'created']); Queue::assertPushed(SendWebMentions::class); From 24cb6d61aabc6781fcd6b6861ccb95525b0700ee Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 22 Feb 2026 10:15:35 +0000 Subject: [PATCH 09/26] Implement micropub update support with clean exception-based error handling - Add MicropubUnsupportedModelException for non-note update attempts - Refactor UpdateHandler to throw exceptions instead of returning JsonResponse objects; extract applySyndication() to DRY up duplicated syndication URL mapping - Fix MicropubController: InvalidTokenScopeException now returns 401 + insufficient_scope; add catches for ModelNotFoundException (404) and MicropubUnsupportedModelException (500); updates return 200 not 201 - Slim MicropubRequest.normalizeMicropubJson() to branch on action type, keeping update and create fields cleanly separated - Update tests to match corrected status codes and error keys; remove markTestSkipped() from all update tests Co-Authored-By: Claude Sonnet 4.6 --- .../MicropubUnsupportedModelException.php | 7 ++ app/Http/Controllers/MicropubController.php | 33 +++++-- app/Http/Requests/MicropubRequest.php | 21 +++-- app/Providers/MicropubServiceProvider.php | 2 + app/Services/Micropub/UpdateHandler.php | 85 +++++++------------ tests/Feature/MicropubControllerTest.php | 40 +++------ 6 files changed, 93 insertions(+), 95 deletions(-) create mode 100644 app/Exceptions/MicropubUnsupportedModelException.php diff --git a/app/Exceptions/MicropubUnsupportedModelException.php b/app/Exceptions/MicropubUnsupportedModelException.php new file mode 100644 index 00000000..660f233f --- /dev/null +++ b/app/Exceptions/MicropubUnsupportedModelException.php @@ -0,0 +1,7 @@ +handlerRegistry->getHandler($type); $result = $handler->handle($request->getMicropubData()); - // Return appropriate response based on the handler result + if ($result['response'] === 'updated') { + return response()->json([ + 'response' => $result['response'], + ], 200)->header('Location', $result['url']); + } + return response()->json([ 'response' => $result['response'], 'location' => $result['url'] ?? null, ], 201)->header('Location', $result['url']); + } catch (InvalidTokenScopeException) { + return response()->json([ + 'error' => 'insufficient_scope', + 'error_description' => 'The token does not have the required scope for this request', + ], 401); + } catch (ModelNotFoundException) { + return response()->json([ + 'error' => 'invalid_request', + 'error_description' => 'No known note with given ID', + ], 404); + } catch (MicropubUnsupportedModelException) { + return response()->json([ + 'error' => 'invalid', + 'error_description' => 'This implementation currently only supports the updating of notes', + ], 500); } catch (\InvalidArgumentException $e) { return response()->json([ 'error' => 'invalid_request', @@ -57,15 +79,10 @@ class MicropubController extends Controller ], 400); } catch (MicropubHandlerException) { return response()->json([ - 'error' => 'Unknown Micropub type', + 'error' => 'unsupported_operation', 'error_description' => 'The request could not be processed by this server', ], 500); - } catch (InvalidTokenScopeException) { - return response()->json([ - 'error' => 'invalid_scope', - 'error_description' => 'The token does not have the required scope for this request', - ], 403); - } catch (\Exception) { + } catch (\Exception $e) { return response()->json([ 'error' => 'server_error', 'error_description' => 'An error occurred processing the request', diff --git a/app/Http/Requests/MicropubRequest.php b/app/Http/Requests/MicropubRequest.php index cc22dd3e..0f34746d 100644 --- a/app/Http/Requests/MicropubRequest.php +++ b/app/Http/Requests/MicropubRequest.php @@ -48,20 +48,25 @@ class MicropubRequest extends FormRequest $data = $json->all(); - // Convert JSON type (h-entry) to simple type (entry) + $this->micropubData['token_data'] = $data['token_data']; + + if (isset($data['action']) && $data['action'] === 'update') { + $this->micropubData['type'] = 'update'; + $this->micropubData['update_url'] = $data['url'] ?? null; + $this->micropubData['update_replace'] = $data['replace'] ?? null; + $this->micropubData['update_add'] = $data['add'] ?? null; + $this->micropubData['update_delete'] = $data['delete'] ?? null; + + return; + } + + // Create request — normalize h-type and properties if (isset($data['type']) && is_array($data['type'])) { $type = current($data['type']); if (str_starts_with($type, 'h-')) { $this->micropubData['type'] = substr($type, 2); } } - // Or set the type to update - elseif (isset($data['action']) && $data['action'] === 'update') { - $this->micropubData['type'] = 'update'; - } - - // Add in the token data - $this->micropubData['token_data'] = $data['token_data']; // Add h-entry values $this->micropubData['content'] = Arr::get($data, 'properties.content.0'); diff --git a/app/Providers/MicropubServiceProvider.php b/app/Providers/MicropubServiceProvider.php index 1002a26d..e217827f 100644 --- a/app/Providers/MicropubServiceProvider.php +++ b/app/Providers/MicropubServiceProvider.php @@ -7,6 +7,7 @@ namespace App\Providers; use App\Services\Micropub\CardHandler; use App\Services\Micropub\EntryHandler; use App\Services\Micropub\MicropubHandlerRegistry; +use App\Services\Micropub\UpdateHandler; use Illuminate\Support\ServiceProvider; class MicropubServiceProvider extends ServiceProvider @@ -19,6 +20,7 @@ class MicropubServiceProvider extends ServiceProvider // Register handlers $registry->register('card', new CardHandler); $registry->register('entry', new EntryHandler); + $registry->register('update', new UpdateHandler); return $registry; }); diff --git a/app/Services/Micropub/UpdateHandler.php b/app/Services/Micropub/UpdateHandler.php index ee018f19..d4558547 100644 --- a/app/Services/Micropub/UpdateHandler.php +++ b/app/Services/Micropub/UpdateHandler.php @@ -5,21 +5,21 @@ declare(strict_types=1); namespace App\Services\Micropub; use App\Exceptions\InvalidTokenScopeException; +use App\Exceptions\MicropubHandlerException; +use App\Exceptions\MicropubUnsupportedModelException; use App\Models\Media; use App\Models\Note; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Arr; use Illuminate\Support\Str; -/* - * @todo Implement this properly - */ class UpdateHandler implements MicropubHandlerInterface { /** * @throws InvalidTokenScopeException + * @throws MicropubUnsupportedModelException + * @throws MicropubHandlerException */ - public function handle(array $data) + public function handle(array $data): array { $scopes = $data['token_data']['scope']; if (is_string($scopes)) { @@ -30,67 +30,35 @@ class UpdateHandler implements MicropubHandlerInterface throw new InvalidTokenScopeException; } - $urlPath = parse_url(Arr::get($data, 'url'), PHP_URL_PATH); + $urlPath = parse_url(Arr::get($data, 'update_url'), PHP_URL_PATH); - // is it a note we are updating? if (mb_substr($urlPath, 1, 5) !== 'notes') { - return response()->json([ - 'error' => 'invalid', - 'error_description' => 'This implementation currently only support the updating of notes', - ], 500); + throw new MicropubUnsupportedModelException('This implementation currently only supports the updating of notes'); } - try { - $note = Note::nb60(basename($urlPath))->firstOrFail(); - } catch (ModelNotFoundException) { - return response()->json([ - 'error' => 'invalid_request', - 'error_description' => 'No known note with given ID', - ], 404); - } + $note = Note::nb60(basename($urlPath))->firstOrFail(); - // got the note, are we dealing with a “replace” request? - if (Arr::get($data, 'replace')) { - foreach (Arr::get($data, 'replace') as $property => $value) { + if (Arr::get($data, 'update_replace')) { + foreach (Arr::get($data, 'update_replace') as $property => $value) { if ($property === 'content') { $note->note = $value[0]; } if ($property === 'syndication') { - foreach ($value as $syndicationURL) { - if (Str::startsWith($syndicationURL, 'https://www.facebook.com')) { - $note->facebook_url = $syndicationURL; - } - if (Str::startsWith($syndicationURL, 'https://www.swarmapp.com')) { - $note->swarm_url = $syndicationURL; - } - if (Str::startsWith($syndicationURL, 'https://twitter.com')) { - $note->tweet_id = basename(parse_url($syndicationURL, PHP_URL_PATH)); - } - } + $this->applySyndication($note, $value); } } $note->save(); return [ 'response' => 'updated', + 'url' => $note->uri, ]; } - // how about “add” - if (Arr::get($data, 'add')) { - foreach (Arr::get($data, 'add') as $property => $value) { + if (Arr::get($data, 'update_add')) { + foreach (Arr::get($data, 'update_add') as $property => $value) { if ($property === 'syndication') { - foreach ($value as $syndicationURL) { - if (Str::startsWith($syndicationURL, 'https://www.facebook.com')) { - $note->facebook_url = $syndicationURL; - } - if (Str::startsWith($syndicationURL, 'https://www.swarmapp.com')) { - $note->swarm_url = $syndicationURL; - } - if (Str::startsWith($syndicationURL, 'https://twitter.com')) { - $note->tweet_id = basename(parse_url($syndicationURL, PHP_URL_PATH)); - } - } + $this->applySyndication($note, $value); } if ($property === 'photo') { foreach ($value as $photoURL) { @@ -106,14 +74,25 @@ class UpdateHandler implements MicropubHandlerInterface } $note->save(); - return response()->json([ + return [ 'response' => 'updated', - ]); + 'url' => $note->uri, + ]; } - return response()->json([ - 'response' => 'error', - 'error_description' => 'unsupported request', - ], 500); + throw new MicropubHandlerException('Unsupported update operation'); + } + + private function applySyndication(Note $note, array $urls): void + { + foreach ($urls as $url) { + if (Str::startsWith($url, 'https://www.facebook.com')) { + $note->facebook_url = $url; + } elseif (Str::startsWith($url, 'https://www.swarmapp.com')) { + $note->swarm_url = $url; + } elseif (Str::startsWith($url, 'https://twitter.com')) { + $note->tweet_id = basename(parse_url($url, PHP_URL_PATH)); + } + } } } diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php index 38a5feb1..a647003c 100644 --- a/tests/Feature/MicropubControllerTest.php +++ b/tests/Feature/MicropubControllerTest.php @@ -228,8 +228,8 @@ class MicropubControllerTest extends TestCase ], ['HTTP_Authorization' => 'Bearer ' . $this->getTokenWithIncorrectScope()] ); - $response->assertStatus(403); - $response->assertJson(['error' => 'invalid_scope']); + $response->assertStatus(401); + $response->assertJson(['error' => 'insufficient_scope']); } /** @@ -448,10 +448,10 @@ class MicropubControllerTest extends TestCase ); $response ->assertJson([ - 'error' => 'invalid_scope', + 'error' => 'insufficient_scope', 'error_description' => 'The token does not have the required scope for this request', ]) - ->assertStatus(403); + ->assertStatus(401); } #[Test] @@ -469,7 +469,7 @@ class MicropubControllerTest extends TestCase ); $response ->assertJson([ - 'error' => 'Unknown Micropub type', + 'error' => 'unsupported_operation', 'error_description' => 'The request could not be processed by this server', ]) ->assertStatus(500); @@ -518,8 +518,6 @@ class MicropubControllerTest extends TestCase #[Test] public function micropub_client_api_request_updates_existing_note(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $note = Note::factory()->create(); $response = $this->postJson( '/api/post', @@ -534,14 +532,15 @@ class MicropubControllerTest extends TestCase ); $response ->assertJson(['response' => 'updated']) - ->assertStatus(200); + ->assertSuccessful(); + + $note->refresh(); + $this->assertSame('replaced content', $note->content); } #[Test] public function micropub_client_api_request_updates_note_syndication_links(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $note = Note::factory()->create(); $response = $this->postJson( '/api/post', @@ -559,7 +558,8 @@ class MicropubControllerTest extends TestCase ); $response ->assertJson(['response' => 'updated']) - ->assertStatus(200); + ->assertSuccessful(); + $this->assertDatabaseHas('notes', [ 'swarm_url' => 'https://www.swarmapp.com/checkin/123', 'facebook_url' => 'https://www.facebook.com/checkin/123', @@ -569,8 +569,6 @@ class MicropubControllerTest extends TestCase #[Test] public function micropub_client_api_request_adds_image_to_note(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $note = Note::factory()->create(); $response = $this->postJson( '/api/post', @@ -585,7 +583,7 @@ class MicropubControllerTest extends TestCase ); $response ->assertJson(['response' => 'updated']) - ->assertStatus(200); + ->assertSuccessful(); $this->assertDatabaseHas('media_endpoint', [ 'path' => 'https://example.org/photo.jpg', ]); @@ -594,8 +592,6 @@ class MicropubControllerTest extends TestCase #[Test] public function micropub_client_api_request_returns_error_trying_to_update_non_note_model(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $response = $this->postJson( '/api/post', [ @@ -615,8 +611,6 @@ class MicropubControllerTest extends TestCase #[Test] public function micropub_client_api_request_returns_error_trying_to_update_non_existing_note(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $response = $this->postJson( '/api/post', [ @@ -636,8 +630,6 @@ class MicropubControllerTest extends TestCase #[Test] public function micropub_client_api_request_returns_error_when_trying_to_update_unsupported_property(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $note = Note::factory()->create(); $response = $this->postJson( '/api/post', @@ -651,15 +643,13 @@ class MicropubControllerTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); $response - ->assertJson(['response' => 'error']) + ->assertJson(['error' => 'unsupported_operation']) ->assertStatus(500); } #[Test] public function micropub_client_api_request_with_token_with_insufficient_scope_returns_error(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $response = $this->postJson( '/api/post', [ @@ -679,8 +669,6 @@ class MicropubControllerTest extends TestCase #[Test] public function micropub_client_api_request_can_replace_note_syndication_targets(): void { - $this->markTestSkipped('Update requests are not supported yet'); - $note = Note::factory()->create(); $response = $this->postJson( '/api/post', @@ -698,7 +686,7 @@ class MicropubControllerTest extends TestCase ); $response ->assertJson(['response' => 'updated']) - ->assertStatus(200); + ->assertSuccessful(); $this->assertDatabaseHas('notes', [ 'swarm_url' => 'https://www.swarmapp.com/checkin/the-id', 'facebook_url' => 'https://www.facebook.com/post/the-id', From ad15b36f4d00550866d13496287e28b224ab0a53 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 22 Feb 2026 10:41:33 +0000 Subject: [PATCH 10/26] Introduce typed DTOs and sub-namespaces for Micropub handlers Each handler now declares the data class it needs via dataClass(). The controller builds the appropriate typed DTO from the raw request array before calling handle(), giving handlers typed property access instead of raw array lookups. Handlers moved to App\Services\Micropub\Handlers, data objects to App\Services\Micropub\Data. MicropubHandlerRegistry and the interface are documented with flow diagrams and guidance for adding new types. Co-Authored-By: Claude Sonnet 4.6 --- app/Http/Controllers/MicropubController.php | 4 +- app/Providers/MicropubServiceProvider.php | 6 +- app/Services/Micropub/Data/CardData.php | 44 +++++++++++++ app/Services/Micropub/Data/EntryData.php | 65 +++++++++++++++++++ app/Services/Micropub/Data/MicropubData.php | 12 ++++ app/Services/Micropub/Data/UpdateData.php | 38 +++++++++++ .../Micropub/{ => Handlers}/CardHandler.php | 18 +++-- .../Micropub/{ => Handlers}/EntryHandler.php | 24 +++++-- .../Handlers/MicropubHandlerInterface.php | 44 +++++++++++++ .../Micropub/{ => Handlers}/UpdateHandler.php | 26 +++++--- .../Micropub/MicropubHandlerInterface.php | 10 --- .../Micropub/MicropubHandlerRegistry.php | 25 +++++++ 12 files changed, 281 insertions(+), 35 deletions(-) create mode 100644 app/Services/Micropub/Data/CardData.php create mode 100644 app/Services/Micropub/Data/EntryData.php create mode 100644 app/Services/Micropub/Data/MicropubData.php create mode 100644 app/Services/Micropub/Data/UpdateData.php rename app/Services/Micropub/{ => Handlers}/CardHandler.php (61%) rename app/Services/Micropub/{ => Handlers}/EntryHandler.php (51%) create mode 100644 app/Services/Micropub/Handlers/MicropubHandlerInterface.php rename app/Services/Micropub/{ => Handlers}/UpdateHandler.php (80%) delete mode 100644 app/Services/Micropub/MicropubHandlerInterface.php diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index be44b371..a1e81e36 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -45,7 +45,9 @@ class MicropubController extends Controller try { $handler = $this->handlerRegistry->getHandler($type); - $result = $handler->handle($request->getMicropubData()); + $dataClass = $handler->dataClass(); + $data = $dataClass::fromArray($request->getMicropubData()); + $result = $handler->handle($data); if ($result['response'] === 'updated') { return response()->json([ diff --git a/app/Providers/MicropubServiceProvider.php b/app/Providers/MicropubServiceProvider.php index e217827f..b8ff479c 100644 --- a/app/Providers/MicropubServiceProvider.php +++ b/app/Providers/MicropubServiceProvider.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Providers; -use App\Services\Micropub\CardHandler; -use App\Services\Micropub\EntryHandler; +use App\Services\Micropub\Handlers\CardHandler; +use App\Services\Micropub\Handlers\EntryHandler; +use App\Services\Micropub\Handlers\UpdateHandler; use App\Services\Micropub\MicropubHandlerRegistry; -use App\Services\Micropub\UpdateHandler; use Illuminate\Support\ServiceProvider; class MicropubServiceProvider extends ServiceProvider diff --git a/app/Services/Micropub/Data/CardData.php b/app/Services/Micropub/Data/CardData.php new file mode 100644 index 00000000..cee41109 --- /dev/null +++ b/app/Services/Micropub/Data/CardData.php @@ -0,0 +1,44 @@ + $this->tokenData, + 'name' => $this->name, + 'description' => $this->description, + 'geo' => $this->geo, + 'location' => $this->location, + 'latitude' => $this->latitude, + 'longitude' => $this->longitude, + ]; + } +} diff --git a/app/Services/Micropub/Data/EntryData.php b/app/Services/Micropub/Data/EntryData.php new file mode 100644 index 00000000..cf87fdc5 --- /dev/null +++ b/app/Services/Micropub/Data/EntryData.php @@ -0,0 +1,65 @@ + $this->tokenData, + 'content' => $this->content, + 'in-reply-to' => $this->inReplyTo, + 'published' => $this->published, + 'location' => $this->location, + 'bookmark-of' => $this->bookmarkOf, + 'like-of' => $this->likeOf, + 'mp-syndicate-to' => $this->mpSyndicateTo, + 'name' => $this->name, + 'description' => $this->description, + 'geo' => $this->geo, + 'checkin' => $this->checkin, + 'syndication' => $this->syndication, + 'photos' => $this->photos, + ]; + } +} diff --git a/app/Services/Micropub/Data/MicropubData.php b/app/Services/Micropub/Data/MicropubData.php new file mode 100644 index 00000000..3fabcadc --- /dev/null +++ b/app/Services/Micropub/Data/MicropubData.php @@ -0,0 +1,12 @@ + $this->tokenData, + 'update_url' => $this->updateUrl, + 'update_replace' => $this->updateReplace, + 'update_add' => $this->updateAdd, + 'update_delete' => $this->updateDelete, + ]; + } +} diff --git a/app/Services/Micropub/CardHandler.php b/app/Services/Micropub/Handlers/CardHandler.php similarity index 61% rename from app/Services/Micropub/CardHandler.php rename to app/Services/Micropub/Handlers/CardHandler.php index 12e283be..02e3a066 100644 --- a/app/Services/Micropub/CardHandler.php +++ b/app/Services/Micropub/Handlers/CardHandler.php @@ -2,20 +2,28 @@ declare(strict_types=1); -namespace App\Services\Micropub; +namespace App\Services\Micropub\Handlers; use App\Exceptions\InvalidTokenScopeException; +use App\Services\Micropub\Data\CardData; +use App\Services\Micropub\Data\MicropubData; use App\Services\PlaceService; class CardHandler implements MicropubHandlerInterface { + public function dataClass(): string + { + return CardData::class; + } + /** * @throws InvalidTokenScopeException */ - public function handle(array $data): array + public function handle(MicropubData $data): array { - // Handle h-card requests - $scopes = $data['token_data']['scope']; + assert($data instanceof CardData); + + $scopes = $data->tokenData['scope']; if (is_string($scopes)) { $scopes = explode(' ', $scopes); } @@ -24,7 +32,7 @@ class CardHandler implements MicropubHandlerInterface throw new InvalidTokenScopeException; } - $location = resolve(PlaceService::class)->createPlace($data)->uri; + $location = resolve(PlaceService::class)->createPlace($data->toArray())->uri; return [ 'response' => 'created', diff --git a/app/Services/Micropub/EntryHandler.php b/app/Services/Micropub/Handlers/EntryHandler.php similarity index 51% rename from app/Services/Micropub/EntryHandler.php rename to app/Services/Micropub/Handlers/EntryHandler.php index 9cdbe789..ef9740f2 100644 --- a/app/Services/Micropub/EntryHandler.php +++ b/app/Services/Micropub/Handlers/EntryHandler.php @@ -2,22 +2,31 @@ declare(strict_types=1); -namespace App\Services\Micropub; +namespace App\Services\Micropub\Handlers; use App\Exceptions\InvalidTokenScopeException; use App\Services\ArticleService; use App\Services\BookmarkService; use App\Services\LikeService; +use App\Services\Micropub\Data\EntryData; +use App\Services\Micropub\Data\MicropubData; use App\Services\NoteService; class EntryHandler implements MicropubHandlerInterface { + public function dataClass(): string + { + return EntryData::class; + } + /** * @throws InvalidTokenScopeException */ - public function handle(array $data) + public function handle(MicropubData $data): array { - $scopes = $data['token_data']['scope']; + assert($data instanceof EntryData); + + $scopes = $data->tokenData['scope']; if (is_string($scopes)) { $scopes = explode(' ', $scopes); } @@ -26,11 +35,12 @@ class EntryHandler implements MicropubHandlerInterface throw new InvalidTokenScopeException; } + $dataArray = $data->toArray(); $location = match (true) { - isset($data['like-of']) => resolve(LikeService::class)->create($data)->url, - isset($data['bookmark-of']) => resolve(BookmarkService::class)->create($data)->uri, - isset($data['name']) => resolve(ArticleService::class)->create($data)->link, - default => resolve(NoteService::class)->create($data)->uri, + isset($dataArray['like-of']) => resolve(LikeService::class)->create($dataArray)->url, + isset($dataArray['bookmark-of']) => resolve(BookmarkService::class)->create($dataArray)->uri, + isset($dataArray['name']) => resolve(ArticleService::class)->create($dataArray)->link, + default => resolve(NoteService::class)->create($dataArray)->uri, }; return [ diff --git a/app/Services/Micropub/Handlers/MicropubHandlerInterface.php b/app/Services/Micropub/Handlers/MicropubHandlerInterface.php new file mode 100644 index 00000000..6afddc5f --- /dev/null +++ b/app/Services/Micropub/Handlers/MicropubHandlerInterface.php @@ -0,0 +1,44 @@ + + */ + public function dataClass(): string; + + /** + * Process the request and return a result array with at minimum a + * 'response' key ('created' or 'updated') and a 'url' key pointing to + * the affected resource. + */ + public function handle(MicropubData $data): array; +} diff --git a/app/Services/Micropub/UpdateHandler.php b/app/Services/Micropub/Handlers/UpdateHandler.php similarity index 80% rename from app/Services/Micropub/UpdateHandler.php rename to app/Services/Micropub/Handlers/UpdateHandler.php index d4558547..fb633c8b 100644 --- a/app/Services/Micropub/UpdateHandler.php +++ b/app/Services/Micropub/Handlers/UpdateHandler.php @@ -2,26 +2,34 @@ declare(strict_types=1); -namespace App\Services\Micropub; +namespace App\Services\Micropub\Handlers; use App\Exceptions\InvalidTokenScopeException; use App\Exceptions\MicropubHandlerException; use App\Exceptions\MicropubUnsupportedModelException; use App\Models\Media; use App\Models\Note; -use Illuminate\Support\Arr; +use App\Services\Micropub\Data\MicropubData; +use App\Services\Micropub\Data\UpdateData; use Illuminate\Support\Str; class UpdateHandler implements MicropubHandlerInterface { + public function dataClass(): string + { + return UpdateData::class; + } + /** * @throws InvalidTokenScopeException * @throws MicropubUnsupportedModelException * @throws MicropubHandlerException */ - public function handle(array $data): array + public function handle(MicropubData $data): array { - $scopes = $data['token_data']['scope']; + assert($data instanceof UpdateData); + + $scopes = $data->tokenData['scope']; if (is_string($scopes)) { $scopes = explode(' ', $scopes); } @@ -30,7 +38,7 @@ class UpdateHandler implements MicropubHandlerInterface throw new InvalidTokenScopeException; } - $urlPath = parse_url(Arr::get($data, 'update_url'), PHP_URL_PATH); + $urlPath = parse_url($data->updateUrl, PHP_URL_PATH); if (mb_substr($urlPath, 1, 5) !== 'notes') { throw new MicropubUnsupportedModelException('This implementation currently only supports the updating of notes'); @@ -38,8 +46,8 @@ class UpdateHandler implements MicropubHandlerInterface $note = Note::nb60(basename($urlPath))->firstOrFail(); - if (Arr::get($data, 'update_replace')) { - foreach (Arr::get($data, 'update_replace') as $property => $value) { + if ($data->updateReplace !== null) { + foreach ($data->updateReplace as $property => $value) { if ($property === 'content') { $note->note = $value[0]; } @@ -55,8 +63,8 @@ class UpdateHandler implements MicropubHandlerInterface ]; } - if (Arr::get($data, 'update_add')) { - foreach (Arr::get($data, 'update_add') as $property => $value) { + if ($data->updateAdd !== null) { + foreach ($data->updateAdd as $property => $value) { if ($property === 'syndication') { $this->applySyndication($note, $value); } diff --git a/app/Services/Micropub/MicropubHandlerInterface.php b/app/Services/Micropub/MicropubHandlerInterface.php deleted file mode 100644 index 82040be9..00000000 --- a/app/Services/Micropub/MicropubHandlerInterface.php +++ /dev/null @@ -1,10 +0,0 @@ -dataClass()::fromArray($rawData) + * → $handler->handle($dataObject) + * + * Handlers are registered in MicropubServiceProvider. To support a new + * Micropub post type, create a handler in App\Services\Micropub\Handlers, a + * matching data class in App\Services\Micropub\Data, and register the handler + * here with its type string. + */ class MicropubHandlerRegistry { /** @@ -13,6 +33,9 @@ class MicropubHandlerRegistry */ protected array $handlers = []; + /** + * Register a handler for a given Micropub type string. + */ public function register(string $type, MicropubHandlerInterface $handler): self { $this->handlers[$type] = $handler; @@ -21,6 +44,8 @@ class MicropubHandlerRegistry } /** + * Retrieve the handler for a given type, or throw if none is registered. + * * @throws MicropubHandlerException */ public function getHandler(string $type): MicropubHandlerInterface From 1137d2a07e3fdff7715e76e9754c58b7e2b5f3ba Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 13 Mar 2026 20:39:50 +0000 Subject: [PATCH 11/26] Move request parsing into DTOs via fromRequest(), expand update handler Each DTO now owns its own parsing logic via fromRequest(), removing the normalization layer from MicropubRequest entirely. UpdateHandler gains delete support and allows replace/add/delete to compose in a single request rather than being mutually exclusive. Co-Authored-By: Claude Sonnet 4.6 --- app/Http/Controllers/MicropubController.php | 17 +-- app/Http/Requests/MicropubRequest.php | 108 ++--------------- app/Services/Micropub/Data/CardData.php | 30 +++++ app/Services/Micropub/Data/EntryData.php | 60 ++++++++++ app/Services/Micropub/Data/MicropubData.php | 4 + app/Services/Micropub/Data/UpdateData.php | 25 ++++ .../Micropub/Handlers/UpdateHandler.php | 82 ++++++++++--- tests/Feature/MicropubControllerTest.php | 110 ++++++++++++++++++ 8 files changed, 311 insertions(+), 125 deletions(-) diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index a1e81e36..c6008a9c 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -10,6 +10,7 @@ use App\Exceptions\MicropubUnsupportedModelException; use App\Http\Requests\MicropubRequest; use App\Models\Place; use App\Models\SyndicationTarget; +use App\Services\Micropub\Data\MicropubData; use App\Services\Micropub\MicropubHandlerRegistry; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\JsonResponse; @@ -28,9 +29,9 @@ class MicropubController extends Controller /** * Respond to a POST request to the micropub endpoint. * - * The request is initially processed by the MicropubRequest form request - * class. The normalizes the data, so we can pass it into the handlers for - * the different micropub requests, h-entry or h-card, for example. + * MicropubRequest detects the request type (e.g. entry, card, update). + * The handler registry resolves the appropriate handler, whose DTO + * extracts the relevant fields from the request via fromRequest(). */ public function post(MicropubRequest $request): JsonResponse { @@ -46,7 +47,8 @@ class MicropubController extends Controller try { $handler = $this->handlerRegistry->getHandler($type); $dataClass = $handler->dataClass(); - $data = $dataClass::fromArray($request->getMicropubData()); + /** @var MicropubData $data */ + $data = $dataClass::fromRequest($request); $result = $handler->handle($data); if ($result['response'] === 'updated') { @@ -95,10 +97,9 @@ class MicropubController extends Controller /** * Respond to a GET request to the micropub endpoint. * - * A GET request has been made to `api/post` with an accompanying - * token, here we check whether the token is valid and respond - * appropriately. Further if the request has the query parameter - * syndicate-to we respond with the known syndication endpoints. + * Token validation is handled by the VerifyMicropubToken middleware. + * Supports q=syndicate-to, q=config, and q=geo:, queries. + * The default response returns the token metadata. */ public function get(Request $request): JsonResponse { diff --git a/app/Http/Requests/MicropubRequest.php b/app/Http/Requests/MicropubRequest.php index 0f34746d..ab4fde74 100644 --- a/app/Http/Requests/MicropubRequest.php +++ b/app/Http/Requests/MicropubRequest.php @@ -5,12 +5,9 @@ declare(strict_types=1); namespace App\Http\Requests; use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Support\Arr; class MicropubRequest extends FormRequest { - protected array $micropubData = []; - public function rules(): array { return [ @@ -18,110 +15,25 @@ class MicropubRequest extends FormRequest ]; } - public function getMicropubData(): array - { - return $this->micropubData; - } - public function getType(): ?string { - // Return consistent type regardless of input format - return $this->micropubData['type'] ?? null; - } - - protected function prepareForValidation(): void - { - // Normalize the request data based on content type if ($this->isJson()) { - $this->normalizeMicropubJson(); - } else { - $this->normalizeMicropubForm(); - } - } + $data = $this->json()->all(); - private function normalizeMicropubJson(): void - { - $json = $this->json(); - if ($json === null) { - throw new \InvalidArgumentException('`isJson()` passed but there is no json data'); - } - - $data = $json->all(); - - $this->micropubData['token_data'] = $data['token_data']; - - if (isset($data['action']) && $data['action'] === 'update') { - $this->micropubData['type'] = 'update'; - $this->micropubData['update_url'] = $data['url'] ?? null; - $this->micropubData['update_replace'] = $data['replace'] ?? null; - $this->micropubData['update_add'] = $data['add'] ?? null; - $this->micropubData['update_delete'] = $data['delete'] ?? null; - - return; - } - - // Create request — normalize h-type and properties - if (isset($data['type']) && is_array($data['type'])) { - $type = current($data['type']); - if (str_starts_with($type, 'h-')) { - $this->micropubData['type'] = substr($type, 2); + if (isset($data['action']) && $data['action'] === 'update') { + return 'update'; } - } - // Add h-entry values - $this->micropubData['content'] = Arr::get($data, 'properties.content.0'); - $this->micropubData['in-reply-to'] = Arr::get($data, 'properties.in-reply-to.0'); - $this->micropubData['published'] = Arr::get($data, 'properties.published.0'); - $this->micropubData['location'] = $this->getLocationData($data); - $this->micropubData['bookmark-of'] = Arr::get($data, 'properties.bookmark-of.0'); - $this->micropubData['like-of'] = Arr::get($data, 'properties.like-of.0'); - $this->micropubData['mp-syndicate-to'] = Arr::get($data, 'properties.mp-syndicate-to'); + if (isset($data['type']) && is_array($data['type'])) { + $type = current($data['type']); + if (str_starts_with($type, 'h-')) { + return substr($type, 2); + } + } - // Add h-card values - $this->micropubData['name'] = Arr::get($data, 'properties.name.0'); - $this->micropubData['description'] = Arr::get($data, 'properties.description.0'); - $this->micropubData['geo'] = Arr::get($data, 'properties.geo.0'); - - // Add checkin value - $this->micropubData['checkin'] = Arr::get($data, 'checkin'); - $this->micropubData['syndication'] = Arr::get($data, 'properties.syndication.0'); - - // Add photos - $this->micropubData['photos'] = Arr::get($data, 'properties.photo'); - } - - private function normalizeMicropubForm(): void - { - // Convert form h=entry to type=entry - if ($h = $this->input('h')) { - $this->micropubData['type'] = $h; - } - - // Add some fields to the micropub data with default null values - $this->micropubData['in-reply-to'] = null; - $this->micropubData['published'] = null; - $this->micropubData['location'] = null; - $this->micropubData['description'] = null; - $this->micropubData['geo'] = null; - $this->micropubData['latitude'] = null; - $this->micropubData['longitude'] = null; - - // Map form fields to micropub data - foreach ($this->except(['h', 'access_token']) as $key => $value) { - $this->micropubData[$key] = $value; - } - } - - private function getLocationData(array $data): array|string|null - { - if (! Arr::has($data, 'properties.location')) { return null; } - if (Arr::has($data, 'properties.location.0')) { - return Arr::get($data, 'properties.location.0'); - } - - return Arr::get($data, 'properties.location'); + return $this->input('h') ?: null; } } diff --git a/app/Services/Micropub/Data/CardData.php b/app/Services/Micropub/Data/CardData.php index cee41109..cab40419 100644 --- a/app/Services/Micropub/Data/CardData.php +++ b/app/Services/Micropub/Data/CardData.php @@ -4,6 +4,9 @@ declare(strict_types=1); namespace App\Services\Micropub\Data; +use Illuminate\Http\Request; +use Illuminate\Support\Arr; + class CardData extends MicropubData { public function __construct( @@ -16,6 +19,33 @@ class CardData extends MicropubData public readonly ?string $longitude, ) {} + public static function fromRequest(Request $request): static + { + if ($request->isJson()) { + $data = $request->json()->all(); + + return new static( + tokenData: $data['token_data'], + name: Arr::get($data, 'properties.name.0'), + description: Arr::get($data, 'properties.description.0'), + geo: Arr::get($data, 'properties.geo.0'), + location: Arr::get($data, 'properties.location'), + latitude: null, + longitude: null, + ); + } + + return new static( + tokenData: $request->input('token_data'), + name: $request->input('name'), + description: $request->input('description'), + geo: $request->input('geo'), + location: $request->input('location'), + latitude: $request->input('latitude'), + longitude: $request->input('longitude'), + ); + } + public static function fromArray(array $data): static { return new static( diff --git a/app/Services/Micropub/Data/EntryData.php b/app/Services/Micropub/Data/EntryData.php index cf87fdc5..8942be78 100644 --- a/app/Services/Micropub/Data/EntryData.php +++ b/app/Services/Micropub/Data/EntryData.php @@ -4,6 +4,9 @@ declare(strict_types=1); namespace App\Services\Micropub\Data; +use Illuminate\Http\Request; +use Illuminate\Support\Arr; + class EntryData extends MicropubData { public function __construct( @@ -23,6 +26,63 @@ class EntryData extends MicropubData public readonly ?array $photos, ) {} + public static function fromRequest(Request $request): static + { + if ($request->isJson()) { + $data = $request->json()->all(); + + $rawContent = Arr::get($data, 'properties.content.0'); + $content = is_array($rawContent) ? ($rawContent['html'] ?? $rawContent['value'] ?? null) : $rawContent; + + return new static( + tokenData: $data['token_data'], + content: $content, + inReplyTo: Arr::get($data, 'properties.in-reply-to.0'), + published: Arr::get($data, 'properties.published.0'), + location: self::extractLocationData($data), + bookmarkOf: Arr::get($data, 'properties.bookmark-of.0'), + likeOf: Arr::get($data, 'properties.like-of.0'), + mpSyndicateTo: Arr::get($data, 'properties.mp-syndicate-to'), + name: Arr::get($data, 'properties.name.0'), + description: Arr::get($data, 'properties.description.0'), + geo: Arr::get($data, 'properties.geo.0'), + checkin: Arr::get($data, 'checkin'), + syndication: Arr::get($data, 'properties.syndication.0'), + photos: Arr::get($data, 'properties.photo'), + ); + } + + return new static( + tokenData: $request->input('token_data'), + content: $request->input('content'), + inReplyTo: $request->input('in-reply-to'), + published: $request->input('published'), + location: $request->input('location'), + bookmarkOf: $request->input('bookmark-of'), + likeOf: $request->input('like-of'), + mpSyndicateTo: $request->input('mp-syndicate-to'), + name: $request->input('name'), + description: $request->input('description'), + geo: $request->input('geo'), + checkin: $request->input('checkin'), + syndication: $request->input('syndication'), + photos: $request->input('photos'), + ); + } + + private static function extractLocationData(array $data): array|string|null + { + if (! Arr::has($data, 'properties.location')) { + return null; + } + + if (Arr::has($data, 'properties.location.0')) { + return Arr::get($data, 'properties.location.0'); + } + + return Arr::get($data, 'properties.location'); + } + public static function fromArray(array $data): static { return new static( diff --git a/app/Services/Micropub/Data/MicropubData.php b/app/Services/Micropub/Data/MicropubData.php index 3fabcadc..d8d56a29 100644 --- a/app/Services/Micropub/Data/MicropubData.php +++ b/app/Services/Micropub/Data/MicropubData.php @@ -4,8 +4,12 @@ declare(strict_types=1); namespace App\Services\Micropub\Data; +use Illuminate\Http\Request; + abstract class MicropubData { + abstract public static function fromRequest(Request $request): static; + abstract public static function fromArray(array $data): static; abstract public function toArray(): array; diff --git a/app/Services/Micropub/Data/UpdateData.php b/app/Services/Micropub/Data/UpdateData.php index b44cc56f..bedaee6d 100644 --- a/app/Services/Micropub/Data/UpdateData.php +++ b/app/Services/Micropub/Data/UpdateData.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace App\Services\Micropub\Data; +use Illuminate\Http\Request; + class UpdateData extends MicropubData { public function __construct( @@ -14,6 +16,29 @@ class UpdateData extends MicropubData public readonly ?array $updateDelete, ) {} + public static function fromRequest(Request $request): static + { + if ($request->isJson()) { + $data = $request->json()->all(); + + return new static( + tokenData: $data['token_data'], + updateUrl: $data['url'] ?? null, + updateReplace: $data['replace'] ?? null, + updateAdd: $data['add'] ?? null, + updateDelete: $data['delete'] ?? null, + ); + } + + return new static( + tokenData: $request->input('token_data'), + updateUrl: $request->input('url'), + updateReplace: $request->input('replace'), + updateAdd: $request->input('add'), + updateDelete: $request->input('delete'), + ); + } + public static function fromArray(array $data): static { return new static( diff --git a/app/Services/Micropub/Handlers/UpdateHandler.php b/app/Services/Micropub/Handlers/UpdateHandler.php index fb633c8b..354cdbdd 100644 --- a/app/Services/Micropub/Handlers/UpdateHandler.php +++ b/app/Services/Micropub/Handlers/UpdateHandler.php @@ -46,21 +46,18 @@ class UpdateHandler implements MicropubHandlerInterface $note = Note::nb60(basename($urlPath))->firstOrFail(); + if ($data->updateReplace === null && $data->updateAdd === null && $data->updateDelete === null) { + throw new MicropubHandlerException('Unsupported update operation'); + } + if ($data->updateReplace !== null) { foreach ($data->updateReplace as $property => $value) { - if ($property === 'content') { - $note->note = $value[0]; - } - if ($property === 'syndication') { - $this->applySyndication($note, $value); - } + match ($property) { + 'content' => $note->note = $value[0], + 'syndication' => $this->applySyndication($note, $value), + default => null, + }; } - $note->save(); - - return [ - 'response' => 'updated', - 'url' => $note->uri, - ]; } if ($data->updateAdd !== null) { @@ -80,15 +77,62 @@ class UpdateHandler implements MicropubHandlerInterface } } } - $note->save(); - - return [ - 'response' => 'updated', - 'url' => $note->uri, - ]; } - throw new MicropubHandlerException('Unsupported update operation'); + if ($data->updateDelete !== null) { + $this->applyDelete($note, $data->updateDelete); + } + + $note->save(); + + return [ + 'response' => 'updated', + 'url' => $note->uri, + ]; + } + + private function applyDelete(Note $note, array $delete): void + { + if (array_is_list($delete)) { + foreach ($delete as $property) { + match ($property) { + 'syndication' => $this->clearSyndication($note), + 'photo' => $note->media()->delete(), + default => null, + }; + } + + return; + } + + foreach ($delete as $property => $values) { + if ($property === 'syndication') { + $this->removeSyndicationValues($note, $values); + } + if ($property === 'photo') { + $note->media()->whereIn('path', $values)->delete(); + } + } + } + + private function clearSyndication(Note $note): void + { + $note->facebook_url = null; + $note->swarm_url = null; + $note->tweet_id = null; + } + + private function removeSyndicationValues(Note $note, array $urls): void + { + foreach ($urls as $url) { + if (Str::startsWith($url, 'https://www.facebook.com') && $note->facebook_url === $url) { + $note->facebook_url = null; + } elseif (Str::startsWith($url, 'https://www.swarmapp.com') && $note->swarm_url === $url) { + $note->swarm_url = null; + } elseif (Str::startsWith($url, 'https://twitter.com')) { + $note->tweet_id = null; + } + } } private function applySyndication(Note $note, array $urls): void diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php index a647003c..10d129c0 100644 --- a/tests/Feature/MicropubControllerTest.php +++ b/tests/Feature/MicropubControllerTest.php @@ -711,6 +711,116 @@ class MicropubControllerTest extends TestCase $this->assertDatabaseHas('notes', ['note' => $note]); } + #[Test] + public function micropub_client_api_request_can_combine_replace_and_add_in_single_update(): void + { + $note = Note::factory()->create(); + $response = $this->postJson( + '/api/post', + [ + 'action' => 'update', + 'url' => $note->uri, + 'replace' => [ + 'content' => ['replaced content'], + ], + 'add' => [ + 'syndication' => ['https://www.swarmapp.com/checkin/123'], + ], + ], + ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] + ); + $response + ->assertJson(['response' => 'updated']) + ->assertSuccessful(); + + $note->refresh(); + $this->assertSame('replaced content', $note->content); + $this->assertDatabaseHas('notes', [ + 'swarm_url' => 'https://www.swarmapp.com/checkin/123', + ]); + } + + #[Test] + public function micropub_client_api_request_can_delete_entire_property(): void + { + $note = Note::factory()->create([ + 'swarm_url' => 'https://www.swarmapp.com/checkin/123', + 'facebook_url' => 'https://www.facebook.com/post/123', + ]); + $response = $this->postJson( + '/api/post', + [ + 'action' => 'update', + 'url' => $note->uri, + 'delete' => ['syndication'], + ], + ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] + ); + $response + ->assertJson(['response' => 'updated']) + ->assertSuccessful(); + + $note->refresh(); + $this->assertNull($note->swarm_url); + $this->assertNull($note->facebook_url); + $this->assertNull($note->tweet_id); + } + + #[Test] + public function micropub_client_api_request_can_delete_specific_syndication_value(): void + { + $note = Note::factory()->create([ + 'swarm_url' => 'https://www.swarmapp.com/checkin/123', + 'facebook_url' => 'https://www.facebook.com/post/123', + ]); + $response = $this->postJson( + '/api/post', + [ + 'action' => 'update', + 'url' => $note->uri, + 'delete' => [ + 'syndication' => ['https://www.swarmapp.com/checkin/123'], + ], + ], + ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] + ); + $response + ->assertJson(['response' => 'updated']) + ->assertSuccessful(); + + $note->refresh(); + $this->assertNull($note->swarm_url); + $this->assertSame('https://www.facebook.com/post/123', $note->facebook_url); + } + + #[Test] + public function micropub_client_api_request_can_delete_photo(): void + { + $note = Note::factory()->create(); + $media = new \App\Models\Media; + $media->path = 'https://example.org/photo.jpg'; + $media->type = 'image'; + $media->save(); + $note->media()->save($media); + + $response = $this->postJson( + '/api/post', + [ + 'action' => 'update', + 'url' => $note->uri, + 'delete' => ['photo'], + ], + ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] + ); + $response + ->assertJson(['response' => 'updated']) + ->assertSuccessful(); + + $this->assertDatabaseMissing('media_endpoint', [ + 'path' => 'https://example.org/photo.jpg', + ]); + } + #[Test] public function micropub_client_api_request_creates_articles_when_it_includes_the_name_property(): void { From 0a13d27d6f4e4948431a0df6108b3ce30135907f Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 14 Mar 2026 16:32:22 +0000 Subject: [PATCH 12/26] Expand webmentions source and target columns to text Long brid.gy Bluesky source URLs exceed 255 characters, causing SQLSTATE[22001] errors. Changed source and target from varchar(255) to text (no performance impact in PostgreSQL). Co-Authored-By: Claude Sonnet 4.6 --- ...pand_webmentions_source_target_to_text.php | 26 +++++++++++++++ database/schema/pgsql-schema.sql | 4 +-- tests/Unit/Jobs/ProcessWebMentionJobTest.php | 32 +++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2026_03_14_000000_expand_webmentions_source_target_to_text.php diff --git a/database/migrations/2026_03_14_000000_expand_webmentions_source_target_to_text.php b/database/migrations/2026_03_14_000000_expand_webmentions_source_target_to_text.php new file mode 100644 index 00000000..de643ab0 --- /dev/null +++ b/database/migrations/2026_03_14_000000_expand_webmentions_source_target_to_text.php @@ -0,0 +1,26 @@ +text('source')->change(); + $table->text('target')->change(); + }); + } + + public function down(): void + { + Schema::table('webmentions', function (Blueprint $table) { + $table->string('source')->change(); + $table->string('target')->change(); + }); + } +}; diff --git a/database/schema/pgsql-schema.sql b/database/schema/pgsql-schema.sql index 6dae72e5..d1f926a3 100644 --- a/database/schema/pgsql-schema.sql +++ b/database/schema/pgsql-schema.sql @@ -723,8 +723,8 @@ ALTER SEQUENCE public.users_id_seq OWNED BY public.users.id; CREATE TABLE public.webmentions ( id integer NOT NULL, - source character varying(255) NOT NULL, - target character varying(255) NOT NULL, + source text NOT NULL, + target text NOT NULL, commentable_id integer, commentable_type character varying(255), type character varying(255), diff --git a/tests/Unit/Jobs/ProcessWebMentionJobTest.php b/tests/Unit/Jobs/ProcessWebMentionJobTest.php index e3754b86..549dee60 100644 --- a/tests/Unit/Jobs/ProcessWebMentionJobTest.php +++ b/tests/Unit/Jobs/ProcessWebMentionJobTest.php @@ -195,6 +195,38 @@ class ProcessWebMentionJobTest extends TestCase ]); } + #[Test] + public function webmention_with_long_source_url_gets_saved(): void + { + Queue::fake(); + + $parser = new Parser; + + $html = <<<'HTML' +

+ I liked a note. +
+ HTML; + $html = str_replace('href="', 'href="' . config('app.url'), $html); + $mock = new MockHandler([ + new Response(200, [], $html), + ]); + $handler = HandlerStack::create($mock); + $client = new Client(['handler' => $handler]); + + $note = Note::factory()->create(); + // Simulate a long brid.gy Bluesky source URL (well over 255 characters) + $source = 'https://brid.gy/comment/bluesky/did:plc:n3jhgiq2ykctnpgzlm6p6b25/at%253A%252F%252Fdid%253Aplc%253An3jhgiq2ykctnpgzlm6p6b25%252Fapp.bsky.feed.post%252F3mfekjuhykb2k/at%253A%252F%252Fdid%253Aplc%253Afsfuwigo5juzdwp23hyianzg%252Fapp.bsky.feed.post%252F3mfemw4rrvs2t'; + + $job = new ProcessWebMention($note, $source); + $job->handle($parser, $client); + + $this->assertGreaterThan(255, strlen($source)); + $this->assertDatabaseHas('webmentions', [ + 'source' => $source, + ]); + } + #[Test] public function webmention_repost_gets_deleted_when_repost_of_value_changes(): void { From 4451fc247eb4c8b5675e887058853114b9279617 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 14 Mar 2026 19:18:00 +0000 Subject: [PATCH 13/26] Fix OwnYourSwarm checkin parsing to read from properties.checkin Real OwnYourSwarm requests send the checkin h-card inside properties.checkin (as an array), not at the top level. The code was reading from the top-level key so no Place was ever created, leaving checkin notes blank. Update tests to match the real request format. Co-Authored-By: Claude Sonnet 4.6 --- app/Services/Micropub/Data/EntryData.php | 2 +- tests/Feature/SwarmTest.php | 172 +++++++++++------------ 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/app/Services/Micropub/Data/EntryData.php b/app/Services/Micropub/Data/EntryData.php index 8942be78..52dde72d 100644 --- a/app/Services/Micropub/Data/EntryData.php +++ b/app/Services/Micropub/Data/EntryData.php @@ -46,7 +46,7 @@ class EntryData extends MicropubData name: Arr::get($data, 'properties.name.0'), description: Arr::get($data, 'properties.description.0'), geo: Arr::get($data, 'properties.geo.0'), - checkin: Arr::get($data, 'checkin'), + checkin: Arr::get($data, 'properties.checkin.0'), syndication: Arr::get($data, 'properties.syndication.0'), photos: Arr::get($data, 'properties.photo'), ); diff --git a/tests/Feature/SwarmTest.php b/tests/Feature/SwarmTest.php index 76caa962..85729c0a 100644 --- a/tests/Feature/SwarmTest.php +++ b/tests/Feature/SwarmTest.php @@ -37,15 +37,15 @@ class SwarmTest extends TestCase 'value' => 'My first #checkin using Example Product', 'html' => 'My first #checkin using Example Product', ]], - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Awesome Venue'], - 'url' => ['https://foursquare.com/v/123456'], - 'latitude' => ['1.23'], - 'longitude' => ['4.56'], - ], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Awesome Venue'], + 'url' => ['https://foursquare.com/v/123456'], + 'latitude' => ['1.23'], + 'longitude' => ['4.56'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] @@ -64,7 +64,7 @@ class SwarmTest extends TestCase } /** - * This request would actually come from another client than OwnYourSwarm, but we’re testing + * This request would actually come from another client than OwnYourSwarm, but we're testing * OpenStreetMap data. */ #[Test] @@ -83,15 +83,15 @@ class SwarmTest extends TestCase 'value' => 'My first #checkin using Example Product', 'html' => 'My first #checkin using Example Product', ]], - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Awesome Venue'], - 'url' => ['https://www.openstreetmap.org/way/123456'], - 'latitude' => ['1.23'], - 'longitude' => ['4.56'], - ], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Awesome Venue'], + 'url' => ['https://www.openstreetmap.org/way/123456'], + 'latitude' => ['1.23'], + 'longitude' => ['4.56'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] @@ -125,15 +125,15 @@ class SwarmTest extends TestCase 'value' => 'My first #checkin using Example Product', 'html' => 'My first #checkin using Example Product', ]], - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Awesome Venue'], - 'url' => ['https://www.example.org/way/123456'], - 'latitude' => ['1.23'], - 'longitude' => ['4.56'], - ], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Awesome Venue'], + 'url' => ['https://www.example.org/way/123456'], + 'latitude' => ['1.23'], + 'longitude' => ['4.56'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] @@ -159,15 +159,15 @@ class SwarmTest extends TestCase 'properties' => [ 'published' => [Carbon::now()->toDateTimeString()], 'syndication' => ['https://www.swarmapp.com/checkin/def'], - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Awesomer Venue'], - 'url' => ['https://foursquare.com/v/654321'], - 'latitude' => ['3.21'], - 'longitude' => ['6.54'], - ], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Awesomer Venue'], + 'url' => ['https://foursquare.com/v/654321'], + 'latitude' => ['3.21'], + 'longitude' => ['6.54'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] @@ -202,13 +202,13 @@ class SwarmTest extends TestCase 'value' => 'My first #checkin using Example Product', 'html' => 'My first #checkin using Example Product', ]], - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Awesome Venue'], - 'url' => ['https://foursquare.com/v/123456'], - ], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Awesome Venue'], + 'url' => ['https://foursquare.com/v/123456'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] @@ -240,21 +240,21 @@ class SwarmTest extends TestCase 'value' => 'My first #checkin using Example Product', 'html' => 'My first #checkin using Example Product', ]], - ], - 'location' => [ - 'type' => ['h-adr'], - 'properties' => [ - 'latitude' => ['1.23'], - 'longitude' => ['4.56'], - 'street-address' => ['Awesome Street'], - ], - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Awesome Venue'], - 'url' => ['https://foursquare.com/v/123456'], - ], + 'location' => [[ + 'type' => ['h-adr'], + 'properties' => [ + 'latitude' => ['1.23'], + 'longitude' => ['4.56'], + 'street-address' => ['Awesome Street'], + ], + ]], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Awesome Venue'], + 'url' => ['https://foursquare.com/v/123456'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] @@ -279,34 +279,34 @@ class SwarmTest extends TestCase 'type' => ['h-entry'], 'properties' => [ 'published' => [Carbon::now()->toDateTimeString()], - ], - 'syndication' => [ - 'https://www.swarmapp.com/user/199841/checkin/5c4b1ac56dcf04002c0a4f58', - ], - 'checkin' => [ - 'type' => ['h-card'], - 'properties' => [ - 'name' => ['Forbidden Planet'], - 'url' => ['https://foursquare.com/v/4ade0e46f964a520bf6f21e3'], - 'latitude' => [53.483153021713], - 'longitude' => [-2.2350297792539], - 'street-address' => ['65 Oldham St.'], - 'locality' => ['Manchester'], - 'country-name' => ['United Kingdom'], - 'postal-code' => ['M1 1JR'], - ], - 'value' => 'https://foursquare.com/v/4ade0e46f964a520bf6f21e3', - ], - 'location' => [ - 'type' => ['h-adr'], - 'properties' => [ - 'latitude' => [53.483153021713], - 'longitude' => [-2.2350297792539], - 'street-address' => ['65 Oldham St.'], - 'locality' => ['Manchester'], - 'country-name' => ['United Kingdom'], - 'postal-code' => ['M1 1JR'], + 'syndication' => [ + 'https://www.swarmapp.com/user/199841/checkin/5c4b1ac56dcf04002c0a4f58', ], + 'checkin' => [[ + 'type' => ['h-card'], + 'properties' => [ + 'name' => ['Forbidden Planet'], + 'url' => ['https://foursquare.com/v/4ade0e46f964a520bf6f21e3'], + 'latitude' => [53.483153021713], + 'longitude' => [-2.2350297792539], + 'street-address' => ['65 Oldham St.'], + 'locality' => ['Manchester'], + 'country-name' => ['United Kingdom'], + 'postal-code' => ['M1 1JR'], + ], + 'value' => 'https://foursquare.com/v/4ade0e46f964a520bf6f21e3', + ]], + 'location' => [[ + 'type' => ['h-adr'], + 'properties' => [ + 'latitude' => [53.483153021713], + 'longitude' => [-2.2350297792539], + 'street-address' => ['65 Oldham St.'], + 'locality' => ['Manchester'], + 'country-name' => ['United Kingdom'], + 'postal-code' => ['M1 1JR'], + ], + ]], ], ], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] From e8e2bff5e4c7a1775e9dcfabf9719b21d02ddf43 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 18 Mar 2026 17:43:57 +0000 Subject: [PATCH 14/26] Fix UpdateHandler crash when replace.content is a rich-text object OwnYourSwarm sends content as an array of objects with `value` and `html` keys per the Micropub spec. The handler now handles both forms: plain strings and rich objects, preferring `html` over `value`. Co-Authored-By: Claude Sonnet 4.6 --- .../Micropub/Handlers/UpdateHandler.php | 2 +- tests/Feature/MicropubControllerTest.php | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/Services/Micropub/Handlers/UpdateHandler.php b/app/Services/Micropub/Handlers/UpdateHandler.php index 354cdbdd..e252b243 100644 --- a/app/Services/Micropub/Handlers/UpdateHandler.php +++ b/app/Services/Micropub/Handlers/UpdateHandler.php @@ -53,7 +53,7 @@ class UpdateHandler implements MicropubHandlerInterface if ($data->updateReplace !== null) { foreach ($data->updateReplace as $property => $value) { match ($property) { - 'content' => $note->note = $value[0], + 'content' => $note->note = is_array($value[0]) ? ($value[0]['html'] ?? $value[0]['value'] ?? null) : $value[0], 'syndication' => $this->applySyndication($note, $value), default => null, }; diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php index 10d129c0..f694916b 100644 --- a/tests/Feature/MicropubControllerTest.php +++ b/tests/Feature/MicropubControllerTest.php @@ -538,6 +538,29 @@ class MicropubControllerTest extends TestCase $this->assertSame('replaced content', $note->content); } + #[Test] + public function micropub_client_api_request_updates_existing_note_with_rich_text_content(): void + { + $note = Note::factory()->create(); + $response = $this->postJson( + '/api/post', + [ + 'action' => 'update', + 'url' => $note->uri, + 'replace' => [ + 'content' => [['value' => 'plain text', 'html' => 'html version']], + ], + ], + ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] + ); + $response + ->assertJson(['response' => 'updated']) + ->assertSuccessful(); + + $note->refresh(); + $this->assertSame('html version', $note->content); + } + #[Test] public function micropub_client_api_request_updates_note_syndication_links(): void { From 9f012b01e40ab1aa7f2d36ea940909b4f42005f3 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Tue, 7 Apr 2026 09:01:19 +0100 Subject: [PATCH 15/26] Upgrade to Laravel 13 --- .env.example | 5 - app/CommonMark/Renderers/MentionRenderer.php | 4 +- app/Console/Commands/CopyMediaToLocal.php | 14 +- .../Commands/MigratePlaceDataFromPostgis.php | 2 +- .../Commands/ParseCachedWebMentions.php | 6 +- .../Commands/ReDownloadWebMentions.php | 2 +- .../Controllers/Admin/ContactsController.php | 19 +- .../Controllers/Admin/PasskeysController.php | 4 +- .../Controllers/Admin/PlacesController.php | 2 + app/Http/Controllers/ArticlesController.php | 6 +- app/Http/Controllers/ContactsController.php | 8 +- app/Http/Controllers/FeedsController.php | 24 +- .../Controllers/MicropubMediaController.php | 2 +- app/Http/Controllers/NotesController.php | 2 +- app/Http/Middleware/LinkHeadersMiddleware.php | 10 +- .../Middleware/RedirectIfAuthenticated.php | 2 +- app/Jobs/DownloadWebMention.php | 4 +- app/Jobs/ProcessLike.php | 42 - app/Jobs/ProcessMedia.php | 4 +- app/Jobs/ProcessWebMention.php | 2 +- app/Jobs/SaveProfileImage.php | 4 +- app/Jobs/SaveScreenshot.php | 14 +- app/Jobs/SendWebMentions.php | 7 +- app/Jobs/SyndicateNoteToBluesky.php | 2 +- app/Jobs/SyndicateNoteToMastodon.php | 2 +- app/Models/Article.php | 29 +- app/Models/Bookmark.php | 9 +- app/Models/Contact.php | 14 +- app/Models/Like.php | 5 +- app/Models/Media.php | 16 +- app/Models/MicropubClient.php | 10 +- app/Models/Note.php | 113 +- app/Models/Passkey.php | 8 +- app/Models/Place.php | 7 +- app/Models/SyndicationTarget.php | 32 +- app/Models/Tag.php | 5 +- app/Models/User.php | 33 +- app/Models/WebMention.php | 29 +- app/Providers/AppServiceProvider.php | 34 +- app/Services/BookmarkService.php | 2 +- .../Micropub/Handlers/UpdateHandler.php | 8 +- app/Services/NoteService.php | 2 +- bootstrap/app.php | 19 +- bootstrap/providers.php | 10 +- composer.json | 28 +- composer.lock | 2251 +++++++---------- config/auth.php | 4 +- config/cache.php | 18 +- config/database.php | 9 +- config/debugbar.php | 2 +- config/filesystems.php | 4 +- config/flare.php | 6 +- config/ide-helper.php | 2 +- config/logging.php | 6 +- config/mail.php | 2 +- config/sanctum.php | 67 - config/session.php | 16 + config/ttwitter.php | 18 - database/factories/ArticleFactory.php | 2 +- database/factories/BioFactory.php | 3 +- database/factories/BookmarkFactory.php | 2 +- database/factories/ContactFactory.php | 2 +- database/factories/LikeFactory.php | 4 +- database/factories/MediaFactory.php | 4 +- database/factories/MicropubClientFactory.php | 2 +- database/factories/NoteFactory.php | 2 +- database/factories/PasskeyFactory.php | 2 +- database/factories/PlaceFactory.php | 2 +- .../factories/SyndicationTargetFactory.php | 3 +- database/factories/TagFactory.php | 2 +- database/factories/UserFactory.php | 2 +- database/factories/WebMentionFactory.php | 2 +- database/seeders/LikesTableSeeder.php | 9 +- database/seeders/NotesTableSeeder.php | 6 +- database/seeders/WebMentionsTableSeeder.php | 14 +- helpers.php | 12 +- pint.json | 5 +- .../views/admin/places/merge/index.blade.php | 2 +- resources/views/bookmarks/index.blade.php | 6 +- resources/views/bookmarks/tagged.blade.php | 6 +- resources/views/templates/note.blade.php | 4 +- tests/DuskTestCase.php | 2 +- tests/Feature/Admin/ArticlesTest.php | 10 +- tests/Feature/Admin/ClientsTest.php | 6 +- tests/Feature/Admin/ContactsTest.php | 42 +- tests/Feature/Admin/LikesTest.php | 6 +- tests/Feature/Admin/NotesTest.php | 6 +- tests/Feature/Admin/PlacesTest.php | 63 +- .../Feature/Admin/SyndicationTargetsTest.php | 136 + tests/Feature/ArticlesTest.php | 8 +- tests/Feature/BookmarksTest.php | 30 +- tests/Feature/CorsHeadersTest.php | 2 +- tests/Feature/FeedsTest.php | 4 +- tests/Feature/HeaderLinkTest.php | 10 +- tests/Feature/IndieAuthTest.php | 2 +- tests/Feature/LikesTest.php | 83 +- tests/Feature/MicropubControllerTest.php | 86 +- tests/Feature/MicropubMediaTest.php | 66 +- tests/Feature/NotesControllerTest.php | 2 +- tests/Feature/ParseCachedWebMentionsTest.php | 36 +- tests/Feature/SwarmTest.php | 14 +- tests/Feature/TokenServiceTest.php | 4 +- tests/Feature/WebMentionsControllerTest.php | 6 +- tests/Unit/ArticlesTest.php | 4 +- tests/Unit/Jobs/DownloadWebMentionJobTest.php | 16 +- tests/Unit/Jobs/ProcessMediaJobTest.php | 8 +- tests/Unit/Jobs/ProcessWebMentionJobTest.php | 16 +- tests/Unit/Jobs/SaveProfileImageJobTest.php | 16 +- tests/Unit/Jobs/SaveScreenshotJobTest.php | 13 +- tests/Unit/Jobs/SendWebMentionJobTest.php | 2 +- .../Jobs/SyndicateNoteToBlueskyJobTest.php | 8 +- .../Jobs/SyndicateNoteToMastodonJobTest.php | 8 +- tests/Unit/MediaTest.php | 65 + tests/Unit/MicropubUpdateDataTest.php | 110 + tests/Unit/NotesTest.php | 36 +- tests/Unit/PlacesTest.php | 2 +- tests/Unit/WebMentionTest.php | 70 +- 117 files changed, 1885 insertions(+), 2222 deletions(-) delete mode 100644 config/sanctum.php delete mode 100644 config/ttwitter.php create mode 100644 tests/Feature/Admin/SyndicationTargetsTest.php create mode 100644 tests/Unit/MicropubUpdateDataTest.php diff --git a/.env.example b/.env.example index 4eb61db5..4235fe34 100644 --- a/.env.example +++ b/.env.example @@ -70,11 +70,6 @@ ADMIN_USER=admin# pick something better, this is used for `/admin` ADMIN_PASS=password DISPLAY_NAME='Joe Bloggs'# This is used for example in the header and titles -TWITTER_CONSUMER_KEY= -TWITTER_CONSUMER_SECRET= -TWITTER_ACCESS_TOKEN= -TWITTER_ACCESS_TOKEN_SECRET= - SCOUT_DRIVER=database SCOUT_QUEUE=false diff --git a/app/CommonMark/Renderers/MentionRenderer.php b/app/CommonMark/Renderers/MentionRenderer.php index d970fac8..2803a822 100644 --- a/app/CommonMark/Renderers/MentionRenderer.php +++ b/app/CommonMark/Renderers/MentionRenderer.php @@ -28,10 +28,10 @@ class MentionRenderer implements NodeRendererInterface // This is not [@]handle@instance, so return a Twitter link if (count($parts) === 1) { - return new HtmlElement('a', ['href' => 'https://twitter.com/' . $parts[0]], '@' . $mentionText); + return new HtmlElement('a', ['href' => 'https://twitter.com/'.$parts[0]], '@'.$mentionText); } // Render the Mastodon profile link - return new HtmlElement('a', ['href' => 'https://' . $parts[1] . '/@' . $parts[0]], '@' . $mentionText); + return new HtmlElement('a', ['href' => 'https://'.$parts[1].'/@'.$parts[0]], '@'.$mentionText); } } diff --git a/app/Console/Commands/CopyMediaToLocal.php b/app/Console/Commands/CopyMediaToLocal.php index 2e8d2bce..90a0bd39 100644 --- a/app/Console/Commands/CopyMediaToLocal.php +++ b/app/Console/Commands/CopyMediaToLocal.php @@ -34,10 +34,10 @@ class CopyMediaToLocal extends Command foreach ($media as $mediaItem) { $filename = $mediaItem->path; - $this->info('Processing: ' . $filename); + $this->info('Processing: '.$filename); // If the file is already saved locally skip to next one - if (Storage::disk('local')->exists('public/' . $filename)) { + if (Storage::disk('local')->exists('public/'.$filename)) { $this->info('File already exists locally, skipping'); continue; @@ -50,19 +50,19 @@ class CopyMediaToLocal extends Command continue; } $contents = Storage::disk('s3')->get($filename); - Storage::disk('local')->put('public/' . $filename, $contents); + Storage::disk('local')->put('public/'.$filename, $contents); // Copy -medium and -small versions if they exist $filenameParts = explode('.', $filename); $extension = array_pop($filenameParts); $basename = trim(implode('.', $filenameParts), '.'); - $mediumFilename = $basename . '-medium.' . $extension; - $smallFilename = $basename . '-small.' . $extension; + $mediumFilename = $basename.'-medium.'.$extension; + $smallFilename = $basename.'-small.'.$extension; if (Storage::disk('s3')->exists($mediumFilename)) { - Storage::disk('local')->put('public/' . $mediumFilename, Storage::disk('s3')->get($mediumFilename)); + Storage::disk('local')->put('public/'.$mediumFilename, Storage::disk('s3')->get($mediumFilename)); } if (Storage::disk('s3')->exists($smallFilename)) { - Storage::disk('local')->put('public/' . $smallFilename, Storage::disk('s3')->get($smallFilename)); + Storage::disk('local')->put('public/'.$smallFilename, Storage::disk('s3')->get($smallFilename)); } } } diff --git a/app/Console/Commands/MigratePlaceDataFromPostgis.php b/app/Console/Commands/MigratePlaceDataFromPostgis.php index 8d5d2c92..4e7c58c0 100644 --- a/app/Console/Commands/MigratePlaceDataFromPostgis.php +++ b/app/Console/Commands/MigratePlaceDataFromPostgis.php @@ -63,7 +63,7 @@ class MigratePlaceDataFromPostgis extends Command $places = Place::all(); $places->each(function ($place) { - $this->info('Extracting Postgis data for place: ' . $place->name); + $this->info('Extracting Postgis data for place: '.$place->name); $place->latitude = $place->location->getLat(); $place->longitude = $place->location->getLng(); diff --git a/app/Console/Commands/ParseCachedWebMentions.php b/app/Console/Commands/ParseCachedWebMentions.php index a6b29176..a27e2738 100644 --- a/app/Console/Commands/ParseCachedWebMentions.php +++ b/app/Console/Commands/ParseCachedWebMentions.php @@ -32,11 +32,11 @@ class ParseCachedWebMentions extends Command */ public function handle(FileSystem $filesystem): void { - $htmlFiles = $filesystem->allFiles(storage_path() . '/HTML'); + $htmlFiles = $filesystem->allFiles(storage_path().'/HTML'); foreach ($htmlFiles as $file) { if ($file->getExtension() !== 'backup') { // we don’t want to parse `.backup` files $filepath = $file->getPathname(); - $this->info('Loading HTML from: ' . $filepath); + $this->info('Loading HTML from: '.$filepath); $html = $filesystem->get($filepath); $url = $this->urlFromFilename($filepath); $webmention = WebMention::where('source', $url)->firstOrFail(); @@ -53,7 +53,7 @@ class ParseCachedWebMentions extends Command */ private function urlFromFilename(string $filepath): string { - $dir = mb_substr($filepath, mb_strlen(storage_path() . '/HTML/')); + $dir = mb_substr($filepath, mb_strlen(storage_path().'/HTML/')); $url = str_replace(['http/', 'https/'], ['http://', 'https://'], $dir); if (mb_substr($url, -10) === 'index.html') { $url = mb_substr($url, 0, -10); diff --git a/app/Console/Commands/ReDownloadWebMentions.php b/app/Console/Commands/ReDownloadWebMentions.php index c6452ba9..c43a52bd 100644 --- a/app/Console/Commands/ReDownloadWebMentions.php +++ b/app/Console/Commands/ReDownloadWebMentions.php @@ -31,7 +31,7 @@ class ReDownloadWebMentions extends Command { $webmentions = WebMention::all(); foreach ($webmentions as $webmention) { - $this->info('Initiation re-download of ' . $webmention->source); + $this->info('Initiation re-download of '.$webmention->source); dispatch(new DownloadWebMention($webmention->source)); } } diff --git a/app/Http/Controllers/Admin/ContactsController.php b/app/Http/Controllers/Admin/ContactsController.php index eb45320c..17e4a8a7 100644 --- a/app/Http/Controllers/Admin/ContactsController.php +++ b/app/Http/Controllers/Admin/ContactsController.php @@ -7,6 +7,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\Contact; use GuzzleHttp\Client; +use GuzzleHttp\Exception\BadResponseException; use Illuminate\Filesystem\Filesystem; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Arr; @@ -75,7 +76,7 @@ class ContactsController extends Controller if (request()->hasFile('avatar') && (request()->input('homepage') != '')) { $dir = parse_url(request()->input('homepage'), PHP_URL_HOST); - $destination = public_path() . '/assets/profile-images/' . $dir; + $destination = public_path().'/assets/profile-images/'.$dir; $filesystem = new Filesystem; if ($filesystem->isDirectory($destination) === false) { $filesystem->makeDirectory($destination); @@ -103,7 +104,7 @@ class ContactsController extends Controller * This method attempts to find the microformat marked-up profile image * from a given homepage and save it accordingly * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View + * @return RedirectResponse|View */ public function getAvatar(int $contactId) { @@ -115,8 +116,8 @@ class ContactsController extends Controller $client = resolve(Client::class); try { $response = $client->get($contact->homepage); - } catch (\GuzzleHttp\Exception\BadResponseException $e) { - return redirect('/admin/contacts/' . $contactId . '/edit') + } catch (BadResponseException $e) { + return redirect('/admin/contacts/'.$contactId.'/edit') ->with('error', 'Bad resposne from contact’s homepage'); } $mf2 = \Mf2\parse((string) $response->getBody(), $contact->homepage); @@ -129,18 +130,18 @@ class ContactsController extends Controller if ($avatarURL !== null) { try { $avatar = $client->get($avatarURL); - } catch (\GuzzleHttp\Exception\BadResponseException $e) { - return redirect('/admin/contacts/' . $contactId . '/edit') + } catch (BadResponseException $e) { + return redirect('/admin/contacts/'.$contactId.'/edit') ->with('error', 'Unable to download avatar'); } } if ($avatar !== null) { - $directory = public_path() . '/assets/profile-images/' . parse_url($contact->homepage, PHP_URL_HOST); + $directory = public_path().'/assets/profile-images/'.parse_url($contact->homepage, PHP_URL_HOST); $filesystem = new Filesystem; if ($filesystem->isDirectory($directory) === false) { $filesystem->makeDirectory($directory); } - $filesystem->put($directory . '/image', $avatar->getBody()); + $filesystem->put($directory.'/image', $avatar->getBody()); return view('admin.contacts.getavatarsuccess', [ 'homepage' => parse_url($contact->homepage, PHP_URL_HOST), @@ -148,6 +149,6 @@ class ContactsController extends Controller } } - return redirect('/admin/contacts/' . $contactId . '/edit'); + return redirect('/admin/contacts/'.$contactId.'/edit'); } } diff --git a/app/Http/Controllers/Admin/PasskeysController.php b/app/Http/Controllers/Admin/PasskeysController.php index 9f635f10..8012f9b8 100644 --- a/app/Http/Controllers/Admin/PasskeysController.php +++ b/app/Http/Controllers/Admin/PasskeysController.php @@ -128,7 +128,7 @@ class PasskeysController extends Controller // Unset session data to mitigate replay attacks $request->session()->forget('create_options'); if (empty($publicKeyCredentialCreationOptionsData)) { - throw new WebAuthnException('No public key credential request options found'); + throw new WebauthnException('No public key credential request options found'); } $attestationStatementSupportManager = new AttestationStatementSupportManager; @@ -145,7 +145,7 @@ class PasskeysController extends Controller ); if (! $publicKeyCredential->response instanceof AuthenticatorAttestationResponse) { - throw new WebAuthnException('Invalid response type'); + throw new WebauthnException('Invalid response type'); } $algorithmManager = new Manager; diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php index e5e82bcd..26f47b79 100644 --- a/app/Http/Controllers/Admin/PlacesController.php +++ b/app/Http/Controllers/Admin/PlacesController.php @@ -120,6 +120,7 @@ class PlacesController extends Controller foreach ($place1->notes as $note) { $note->place()->dissociate(); $note->place()->associate($place2->id); + $note->save(); } $place1->delete(); } @@ -127,6 +128,7 @@ class PlacesController extends Controller foreach ($place2->notes as $note) { $note->place()->dissociate(); $note->place()->associate($place1->id); + $note->save(); } $place2->delete(); } diff --git a/app/Http/Controllers/ArticlesController.php b/app/Http/Controllers/ArticlesController.php index 9ab860d7..ff28fd50 100644 --- a/app/Http/Controllers/ArticlesController.php +++ b/app/Http/Controllers/ArticlesController.php @@ -38,9 +38,9 @@ class ArticlesController extends Controller if ($article->updated_at->year != $year || $article->updated_at->month != $month) { return redirect('/blog/' - . $article->updated_at->year - . '/' . $article->updated_at->format('m') - . '/' . $slug); + .$article->updated_at->year + .'/'.$article->updated_at->format('m') + .'/'.$slug); } return view('articles.show', compact('article')); diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php index 280cc3ed..13989eac 100644 --- a/app/Http/Controllers/ContactsController.php +++ b/app/Http/Controllers/ContactsController.php @@ -19,9 +19,9 @@ class ContactsController extends Controller $contacts = Contact::all(); foreach ($contacts as $contact) { $contact->homepageHost = parse_url($contact->homepage, PHP_URL_HOST); - $file = public_path() . '/assets/profile-images/' . $contact->homepageHost . '/image'; + $file = public_path().'/assets/profile-images/'.$contact->homepageHost.'/image'; $contact->image = ($filesystem->exists($file)) ? - '/assets/profile-images/' . $contact->homepageHost . '/image' + '/assets/profile-images/'.$contact->homepageHost.'/image' : '/assets/profile-images/default-image'; } @@ -35,11 +35,11 @@ class ContactsController extends Controller public function show(Contact $contact): View { $contact->homepageHost = parse_url($contact->homepage, PHP_URL_HOST); - $file = public_path() . '/assets/profile-images/' . $contact->homepageHost . '/image'; + $file = public_path().'/assets/profile-images/'.$contact->homepageHost.'/image'; $filesystem = new Filesystem; $image = ($filesystem->exists($file)) ? - '/assets/profile-images/' . $contact->homepageHost . '/image' + '/assets/profile-images/'.$contact->homepageHost.'/image' : '/assets/profile-images/default-image'; diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php index eb0847a3..a30c89dc 100644 --- a/app/Http/Controllers/FeedsController.php +++ b/app/Http/Controllers/FeedsController.php @@ -71,9 +71,9 @@ class FeedsController extends Controller $articles = Article::where('published', '1')->latest('updated_at')->take(20)->get(); $data = [ 'version' => 'https://jsonfeed.org/version/1.1', - 'title' => 'The JSON Feed for ' . config('user.display_name') . '’s blog', - 'home_page_url' => config('app.url') . '/blog', - 'feed_url' => config('app.url') . '/blog/feed.json', + 'title' => 'The JSON Feed for '.config('user.display_name').'’s blog', + 'home_page_url' => config('app.url').'/blog', + 'feed_url' => config('app.url').'/blog/feed.json', 'authors' => [ [ 'name' => config('user.display_name'), @@ -85,9 +85,9 @@ class FeedsController extends Controller foreach ($articles as $key => $article) { $data['items'][$key] = [ - 'id' => config('app.url') . $article->link, + 'id' => config('app.url').$article->link, 'title' => $article->title, - 'url' => config('app.url') . $article->link, + 'url' => config('app.url').$article->link, 'content_html' => $article->main, 'date_published' => $article->created_at->tz('UTC')->toRfc3339String(), 'date_modified' => $article->updated_at->tz('UTC')->toRfc3339String(), @@ -105,9 +105,9 @@ class FeedsController extends Controller $notes = Note::latest()->with('media', 'place', 'tags')->take(20)->get(); $data = [ 'version' => 'https://jsonfeed.org/version/1.1', - 'title' => 'The JSON Feed for ' . config('user.display_name') . '’s notes', - 'home_page_url' => config('app.url') . '/notes', - 'feed_url' => config('app.url') . '/notes/feed.json', + 'title' => 'The JSON Feed for '.config('user.display_name').'’s notes', + 'home_page_url' => config('app.url').'/notes', + 'feed_url' => config('app.url').'/notes/feed.json', 'authors' => [ [ 'name' => config('user.display_name'), @@ -144,8 +144,8 @@ class FeedsController extends Controller $items[] = [ 'type' => 'entry', 'published' => $article->created_at, - 'uid' => config('app.url') . $article->link, - 'url' => config('app.url') . $article->link, + 'uid' => config('app.url').$article->link, + 'url' => config('app.url').$article->link, 'content' => [ 'text' => $article->main, 'html' => $article->html, @@ -156,7 +156,7 @@ class FeedsController extends Controller return response()->json([ 'type' => 'feed', - 'name' => 'Blog feed for ' . config('app.name'), + 'name' => 'Blog feed for '.config('app.name'), 'url' => url('/blog'), 'author' => [ 'type' => 'card', @@ -192,7 +192,7 @@ class FeedsController extends Controller return response()->json([ 'type' => 'feed', - 'name' => 'Notes feed for ' . config('app.name'), + 'name' => 'Notes feed for '.config('app.name'), 'url' => url('/notes'), 'author' => [ 'type' => 'card', diff --git a/app/Http/Controllers/MicropubMediaController.php b/app/Http/Controllers/MicropubMediaController.php index fc804ea2..1cca74b3 100644 --- a/app/Http/Controllers/MicropubMediaController.php +++ b/app/Http/Controllers/MicropubMediaController.php @@ -193,7 +193,7 @@ class MicropubMediaController extends Controller */ private function saveFileToLocal(UploadedFile $file): string { - $filename = Uuid::uuid4()->toString() . '.' . $file->extension(); + $filename = Uuid::uuid4()->toString().'.'.$file->extension(); Storage::disk('local')->putFileAs('', $file, $filename); return $filename; diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index e20b67a1..ab81002b 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -64,7 +64,7 @@ class NotesController extends Controller */ public function redirect(int $decId): RedirectResponse { - return redirect(config('app.url') . '/notes/' . (new Numbers)->numto60($decId)); + return redirect(config('app.url').'/notes/'.(new Numbers)->numto60($decId)); } /** diff --git a/app/Http/Middleware/LinkHeadersMiddleware.php b/app/Http/Middleware/LinkHeadersMiddleware.php index 467283db..b9e55139 100644 --- a/app/Http/Middleware/LinkHeadersMiddleware.php +++ b/app/Http/Middleware/LinkHeadersMiddleware.php @@ -14,11 +14,11 @@ class LinkHeadersMiddleware public function handle(Request $request, Closure $next): Response { $response = $next($request); - $response->header('Link', '<' . route('indieauth.metadata') . '>; rel="indieauth-metadata"', false); - $response->header('Link', '<' . route('indieauth.start') . '>; rel="authorization_endpoint"', false); - $response->header('Link', '<' . route('indieauth.token') . '>; rel="token_endpoint"', false); - $response->header('Link', '<' . route('micropub-endpoint') . '>; rel="micropub"', false); - $response->header('Link', '<' . route('webmention-endpoint') . '>; rel="webmention"', false); + $response->header('Link', '<'.route('indieauth.metadata').'>; rel="indieauth-metadata"', false); + $response->header('Link', '<'.route('indieauth.start').'>; rel="authorization_endpoint"', false); + $response->header('Link', '<'.route('indieauth.token').'>; rel="token_endpoint"', false); + $response->header('Link', '<'.route('micropub-endpoint').'>; rel="micropub"', false); + $response->header('Link', '<'.route('webmention-endpoint').'>; rel="webmention"', false); return $response; } diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index a6a6c8c4..1e06ab05 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -16,7 +16,7 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next + * @param Closure(Request): (Response) $next */ public function handle(Request $request, Closure $next, string ...$guards): Response { diff --git a/app/Jobs/DownloadWebMention.php b/app/Jobs/DownloadWebMention.php index 3c187dd4..341c35c8 100644 --- a/app/Jobs/DownloadWebMention.php +++ b/app/Jobs/DownloadWebMention.php @@ -39,9 +39,9 @@ class DownloadWebMention implements ShouldQueue // Laravel should catch and retry these automatically. if ($response->getStatusCode() === 200) { $filesystem = new FileSystem; - $filename = storage_path('HTML') . '/' . $this->createFilenameFromURL($this->source); + $filename = storage_path('HTML').'/'.$this->createFilenameFromURL($this->source); // backup file first - $filenameBackup = $filename . '.' . date('Y-m-d') . '.backup'; + $filenameBackup = $filename.'.'.date('Y-m-d').'.backup'; if ($filesystem->exists($filename)) { $filesystem->copy($filename, $filenameBackup); } diff --git a/app/Jobs/ProcessLike.php b/app/Jobs/ProcessLike.php index 3c6028a9..49302885 100644 --- a/app/Jobs/ProcessLike.php +++ b/app/Jobs/ProcessLike.php @@ -5,10 +5,8 @@ declare(strict_types=1); namespace App\Jobs; use App\Models\Like; -use Codebird\Codebird; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; -use GuzzleHttp\Exception\RequestException; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -39,35 +37,6 @@ class ProcessLike implements ShouldQueue */ public function handle(Client $client, Authorship $authorship): int { - if ($this->isTweet($this->like->url)) { - $codebird = resolve(Codebird::class); - - $tweet = $codebird->statuses_oembed(['url' => $this->like->url]); - - $this->like->author_name = $tweet->author_name; - $this->like->author_url = $tweet->author_url; - $this->like->content = $tweet->html; - $this->like->save(); - - // POSSE like - try { - $client->request( - 'POST', - 'https://brid.gy/publish/webmention', - [ - 'form_params' => [ - 'source' => $this->like->url, - 'target' => 'https://brid.gy/publish/twitter', - ], - ] - ); - } catch (RequestException) { - return 0; - } - - return 0; - } - $response = $client->request('GET', $this->like->url); $mf2 = \Mf2\parse((string) $response->getBody(), $this->like->url); if (Arr::has($mf2, 'items.0.properties.content')) { @@ -91,15 +60,4 @@ class ProcessLike implements ShouldQueue return 0; } - - /** - * Determine if a given URL is that of a Tweet. - */ - private function isTweet(string $url): bool - { - $host = parse_url($url, PHP_URL_HOST); - $parts = array_reverse(explode('.', $host)); - - return $parts[0] === 'com' && $parts[1] === 'twitter'; - } } diff --git a/app/Jobs/ProcessMedia.php b/app/Jobs/ProcessMedia.php index a693a821..e9e291a6 100644 --- a/app/Jobs/ProcessMedia.php +++ b/app/Jobs/ProcessMedia.php @@ -57,10 +57,10 @@ class ProcessMedia implements ShouldQueue $basename = trim(implode('.', $filenameParts), '.'); $medium = $image->resize(width: 1000); - Storage::disk('public')->put($basename . '-medium.' . $extension, (string) $medium->encode()); + Storage::disk('public')->put($basename.'-medium.'.$extension, (string) $medium->encode()); $small = $image->resize(width: 500); - Storage::disk('public')->put($basename . '-small.' . $extension, (string) $small->encode()); + Storage::disk('public')->put($basename.'-small.'.$extension, (string) $small->encode()); } // Now we can delete the locally saved image diff --git a/app/Jobs/ProcessWebMention.php b/app/Jobs/ProcessWebMention.php index d92dfa18..6677b285 100644 --- a/app/Jobs/ProcessWebMention.php +++ b/app/Jobs/ProcessWebMention.php @@ -110,7 +110,7 @@ class ProcessWebMention implements ShouldQueue if (str_ends_with($url, '/')) { $filenameFromURL .= 'index.html'; } - $path = storage_path() . '/HTML/' . $filenameFromURL; + $path = storage_path().'/HTML/'.$filenameFromURL; $parts = explode('/', $path); $name = array_pop($parts); $dir = implode('/', $parts); diff --git a/app/Jobs/SaveProfileImage.php b/app/Jobs/SaveProfileImage.php index 08152d5b..0bcbd4e7 100644 --- a/app/Jobs/SaveProfileImage.php +++ b/app/Jobs/SaveProfileImage.php @@ -62,13 +62,13 @@ class SaveProfileImage implements ShouldQueue $image = $response->getBody(); } catch (RequestException) { // we are opening and reading the default image so that - $default = public_path() . '/assets/profile-images/default-image'; + $default = public_path().'/assets/profile-images/default-image'; $handle = fopen($default, 'rb'); $image = fread($handle, filesize($default)); fclose($handle); } - $path = public_path() . '/assets/profile-images/' . parse_url($home, PHP_URL_HOST) . '/image'; + $path = public_path().'/assets/profile-images/'.parse_url($home, PHP_URL_HOST).'/image'; $parts = explode('/', $path); $name = array_pop($parts); $dir = implode('/', $parts); diff --git a/app/Jobs/SaveScreenshot.php b/app/Jobs/SaveScreenshot.php index 0e07efbd..4661ccfe 100755 --- a/app/Jobs/SaveScreenshot.php +++ b/app/Jobs/SaveScreenshot.php @@ -41,7 +41,7 @@ class SaveScreenshot implements ShouldQueue // First request that CloudConvert takes a screenshot of the URL $takeScreenshotJobResponse = $client->request('POST', 'https://api.cloudconvert.com/v2/capture-website', [ 'headers' => [ - 'Authorization' => 'Bearer ' . config('services.cloudconvert.token'), + 'Authorization' => 'Bearer '.config('services.cloudconvert.token'), ], 'json' => [ 'url' => $this->bookmark->url, @@ -56,9 +56,9 @@ class SaveScreenshot implements ShouldQueue $taskId = json_decode($takeScreenshotJobResponse->getBody()->getContents(), false, 512, JSON_THROW_ON_ERROR)->data->id; // Now wait till the status job is finished - $screenshotJobStatusResponse = $retryClient->request('GET', 'https://api.cloudconvert.com/v2/tasks/' . $taskId, [ + $screenshotJobStatusResponse = $retryClient->request('GET', 'https://api.cloudconvert.com/v2/tasks/'.$taskId, [ 'headers' => [ - 'Authorization' => 'Bearer ' . config('services.cloudconvert.token'), + 'Authorization' => 'Bearer '.config('services.cloudconvert.token'), ], 'query' => [ 'include' => 'payload', @@ -70,7 +70,7 @@ class SaveScreenshot implements ShouldQueue // Now we can create a new job to request thst the screenshot is exported to a temporary URL we can download the screenshot from $exportImageJob = $client->request('POST', 'https://api.cloudconvert.com/v2/export/url', [ 'headers' => [ - 'Authorization' => 'Bearer ' . config('services.cloudconvert.token'), + 'Authorization' => 'Bearer '.config('services.cloudconvert.token'), ], 'json' => [ 'input' => $finishedCaptureId, @@ -81,9 +81,9 @@ class SaveScreenshot implements ShouldQueue $exportImageJobId = json_decode($exportImageJob->getBody()->getContents(), false, 512, JSON_THROW_ON_ERROR)->data->id; // Again, wait till the status of this export job is finished - $finalImageUrlResponse = $retryClient->request('GET', 'https://api.cloudconvert.com/v2/tasks/' . $exportImageJobId, [ + $finalImageUrlResponse = $retryClient->request('GET', 'https://api.cloudconvert.com/v2/tasks/'.$exportImageJobId, [ 'headers' => [ - 'Authorization' => 'Bearer ' . config('services.cloudconvert.token'), + 'Authorization' => 'Bearer '.config('services.cloudconvert.token'), ], 'query' => [ 'include' => 'payload', @@ -95,7 +95,7 @@ class SaveScreenshot implements ShouldQueue $finalImageUrlContent = $client->request('GET', $finalImageUrl); - Storage::disk('public')->put('/assets/img/bookmarks/' . $taskId . '.png', $finalImageUrlContent->getBody()->getContents()); + Storage::disk('public')->put('/assets/img/bookmarks/'.$taskId.'.png', $finalImageUrlContent->getBody()->getContents()); $this->bookmark->screenshot = $taskId; $this->bookmark->save(); diff --git a/app/Jobs/SendWebMentions.php b/app/Jobs/SendWebMentions.php index 2ff5f2c6..827aaf0a 100644 --- a/app/Jobs/SendWebMentions.php +++ b/app/Jobs/SendWebMentions.php @@ -15,6 +15,7 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Str; +use Mf2\Parser; class SendWebMentions implements ShouldQueue { @@ -83,7 +84,11 @@ class SendWebMentions implements ShouldQueue // failed to find a header so parse HTML $html = (string) $response->getBody(); - $mf2 = new \Mf2\Parser($html, $url); + if ($html === '') { + return null; + } + + $mf2 = new Parser($html, $url); $rels = $mf2->parseRelsAndAlternates(); if (array_key_exists('webmention', $rels[0])) { $endpoint = $rels[0]['webmention'][0]; diff --git a/app/Jobs/SyndicateNoteToBluesky.php b/app/Jobs/SyndicateNoteToBluesky.php index e815be34..f9f2486b 100644 --- a/app/Jobs/SyndicateNoteToBluesky.php +++ b/app/Jobs/SyndicateNoteToBluesky.php @@ -42,7 +42,7 @@ class SyndicateNoteToBluesky implements ShouldQueue 'https://brid.gy/micropub', [ 'headers' => [ - 'Authorization' => 'Bearer ' . config('bridgy.bluesky_token'), + 'Authorization' => 'Bearer '.config('bridgy.bluesky_token'), ], 'json' => [ 'type' => ['h-entry'], diff --git a/app/Jobs/SyndicateNoteToMastodon.php b/app/Jobs/SyndicateNoteToMastodon.php index b79c092c..07ea3b71 100644 --- a/app/Jobs/SyndicateNoteToMastodon.php +++ b/app/Jobs/SyndicateNoteToMastodon.php @@ -42,7 +42,7 @@ class SyndicateNoteToMastodon implements ShouldQueue 'https://brid.gy/micropub', [ 'headers' => [ - 'Authorization' => 'Bearer ' . config('bridgy.mastodon_token'), + 'Authorization' => 'Bearer '.config('bridgy.mastodon_token'), ], 'json' => [ 'type' => ['h-entry'], diff --git a/app/Models/Article.php b/app/Models/Article.php index bfbd5d51..ea215757 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -5,6 +5,8 @@ declare(strict_types=1); namespace App\Models; use Cviebrock\EloquentSluggable\Sluggable; +use Illuminate\Database\Eloquent\Attributes\Fillable; +use Illuminate\Database\Eloquent\Attributes\Table; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -18,23 +20,14 @@ use League\CommonMark\MarkdownConverter; use Spatie\CommonMarkHighlighter\FencedCodeRenderer; use Spatie\CommonMarkHighlighter\IndentedCodeRenderer; +#[Table('articles')] +#[Fillable(['url', 'title', 'main', 'published'])] class Article extends Model { use HasFactory; use Sluggable; use SoftDeletes; - /** @var string */ - protected $table = 'articles'; - - /** @var array */ - protected $fillable = [ - 'url', - 'title', - 'main', - 'published', - ]; - /** @var array */ protected $casts = [ 'created_at' => 'datetime', @@ -100,7 +93,7 @@ class Article extends Model protected function link(): Attribute { return Attribute::get( - get: fn () => '/blog/' . $this->updated_at->year . '/' . $this->updated_at->format('m') . '/' . $this->titleurl, + get: fn () => '/blog/'.$this->updated_at->year.'/'.$this->updated_at->format('m').'/'.$this->titleurl, ); } @@ -112,15 +105,15 @@ class Article extends Model if ($year === null) { return $query; } - $start = $year . '-01-01 00:00:00'; - $end = ($year + 1) . '-01-01 00:00:00'; + $start = $year.'-01-01 00:00:00'; + $end = ($year + 1).'-01-01 00:00:00'; if (($month !== null) && ($month !== 12)) { - $start = $year . '-' . $month . '-01 00:00:00'; - $end = $year . '-' . ($month + 1) . '-01 00:00:00'; + $start = $year.'-'.$month.'-01 00:00:00'; + $end = $year.'-'.($month + 1).'-01 00:00:00'; } if ($month === 12) { - $start = $year . '-12-01 00:00:00'; - $end = ($year + 1) . '-01-01 00:00:00'; + $start = $year.'-12-01 00:00:00'; + $end = ($year + 1).'-01-01 00:00:00'; } return $query->where([ diff --git a/app/Models/Bookmark.php b/app/Models/Bookmark.php index 37027e40..1c5ae6e4 100644 --- a/app/Models/Bookmark.php +++ b/app/Models/Bookmark.php @@ -4,18 +4,17 @@ declare(strict_types=1); namespace App\Models; +use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; +#[Fillable(['url', 'name', 'content'])] class Bookmark extends Model { use HasFactory; - /** @var array */ - protected $fillable = ['url', 'name', 'content']; - /** @var array */ protected $casts = [ 'syndicates' => 'array', @@ -26,10 +25,10 @@ class Bookmark extends Model return $this->belongsToMany('App\Models\Tag'); } - protected function local_uri(): Attribute + protected function localUri(): Attribute { return Attribute::get( - get: fn () => config('app.url') . '/bookmarks/' . $this->id, + get: fn () => config('app.url').'/bookmarks/'.$this->id, ); } } diff --git a/app/Models/Contact.php b/app/Models/Contact.php index 6f193f41..55ec12a8 100644 --- a/app/Models/Contact.php +++ b/app/Models/Contact.php @@ -4,28 +4,26 @@ declare(strict_types=1); namespace App\Models; +use Illuminate\Database\Eloquent\Attributes\Fillable; +use Illuminate\Database\Eloquent\Attributes\Table; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +#[Table('contacts')] +#[Fillable(['nick', 'name', 'homepage', 'twitter', 'facebook'])] class Contact extends Model { use HasFactory; - /** @var string */ - protected $table = 'contacts'; - - /** @var array */ - protected $fillable = ['nick', 'name', 'homepage', 'twitter', 'facebook']; - protected function photo(): Attribute { $photo = '/assets/profile-images/default-image'; if (array_key_exists('homepage', $this->attributes) && ! empty($this->attributes['homepage'])) { $host = parse_url($this->attributes['homepage'], PHP_URL_HOST); - if (file_exists(public_path() . '/assets/profile-images/' . $host . '/image')) { - $photo = '/assets/profile-images/' . $host . '/image'; + if (file_exists(public_path().'/assets/profile-images/'.$host.'/image')) { + $photo = '/assets/profile-images/'.$host.'/image'; } } diff --git a/app/Models/Like.php b/app/Models/Like.php index f9ac3bcb..44f25b91 100644 --- a/app/Models/Like.php +++ b/app/Models/Like.php @@ -5,20 +5,19 @@ declare(strict_types=1); namespace App\Models; use App\Traits\FilterHtml; +use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Arr; use Mf2; +#[Fillable(['url'])] class Like extends Model { use FilterHtml; use HasFactory; - /** @var array */ - protected $fillable = ['url']; - protected function url(): Attribute { return Attribute::set( diff --git a/app/Models/Media.php b/app/Models/Media.php index b25e889a..f6c237d2 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -4,22 +4,20 @@ declare(strict_types=1); namespace App\Models; +use Illuminate\Database\Eloquent\Attributes\Fillable; +use Illuminate\Database\Eloquent\Attributes\Table; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Support\Str; +#[Table('media_endpoint')] +#[Fillable(['token', 'path', 'type', 'image_widths'])] class Media extends Model { use HasFactory; - /** @var string */ - protected $table = 'media_endpoint'; - - /** @var array */ - protected $fillable = ['token', 'path', 'type', 'image_widths']; - public function notes(): BelongsToMany { return $this->belongsToMany(Note::class) @@ -35,7 +33,7 @@ class Media extends Model return $attributes['path']; } - return config('app.url') . '/storage/' . $attributes['path']; + return config('app.url').'/storage/'.$attributes['path']; } ); } @@ -80,7 +78,7 @@ class Media extends Model $basename = $this->getBasename($path); $extension = $this->getExtension($path); - return config('app.url') . '/storage/' . $basename . '-' . $size . '.' . $extension; + return config('app.url').'/storage/'.$basename.'-'.$size.'.'.$extension; } private function getBasename(string $path): string @@ -91,7 +89,7 @@ class Media extends Model array_pop($filenameParts); return ltrim(array_reduce($filenameParts, static function ($carry, $item) { - return $carry . '.' . $item; + return $carry.'.'.$item; }, ''), '.'); } diff --git a/app/Models/MicropubClient.php b/app/Models/MicropubClient.php index 669c7284..f6c70ac2 100644 --- a/app/Models/MicropubClient.php +++ b/app/Models/MicropubClient.php @@ -4,20 +4,18 @@ declare(strict_types=1); namespace App\Models; +use Illuminate\Database\Eloquent\Attributes\Fillable; +use Illuminate\Database\Eloquent\Attributes\Table; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; +#[Table('clients')] +#[Fillable(['client_url', 'client_name'])] class MicropubClient extends Model { use HasFactory; - /** @var string */ - protected $table = 'clients'; - - /** @var array */ - protected $fillable = ['client_url', 'client_name']; - public function notes(): HasMany { return $this->hasMany('App\Models\Note', 'client_id', 'client_url'); diff --git a/app/Models/Note.php b/app/Models/Note.php index 91f4b8a1..5bf2ad71 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -6,9 +6,12 @@ namespace App\Models; use App\CommonMark\Generators\MentionGenerator; use App\CommonMark\Renderers\MentionRenderer; -use Codebird\Codebird; -use Exception; +use App\Observers\NoteObserver; use GuzzleHttp\Client; +use Illuminate\Database\Eloquent\Attributes\Fillable; +use Illuminate\Database\Eloquent\Attributes\Hidden; +use Illuminate\Database\Eloquent\Attributes\ObservedBy; +use Illuminate\Database\Eloquent\Attributes\Table; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -31,6 +34,10 @@ use Normalizer; use Spatie\CommonMarkHighlighter\FencedCodeRenderer; use Spatie\CommonMarkHighlighter\IndentedCodeRenderer; +#[Table('notes')] +#[Fillable(['note', 'in_reply_to', 'client_id'])] +#[Hidden(['searchable'])] +#[ObservedBy(NoteObserver::class)] class Note extends Model { use HasFactory; @@ -61,16 +68,6 @@ class Note extends Model /** @var string */ protected $table = 'notes'; - /** @var array */ - protected $fillable = [ - 'note', - 'in_reply_to', - 'client_id', - ]; - - /** @var array */ - protected $hidden = ['searchable']; - public function tags(): BelongsToMany { return $this->belongsToMany(Tag::class); @@ -126,7 +123,7 @@ class Note extends Model public function getNoteAttribute(?string $value): ?string { if ($value === null && $this->place !== null) { - $value = '📍: ' . $this->place->name . ''; + $value = '📍: '.$this->place->name.''; } // if $value is still null, just return null @@ -150,13 +147,13 @@ class Note extends Model foreach ($this->media as $media) { if ($media->type === 'image') { - $note .= PHP_EOL . ''; + $note .= PHP_EOL.''; } if ($media->type === 'audio') { - $note .= PHP_EOL . '
HTML; - $html = str_replace('href=""', 'href="' . config('app.url') . '/notes/A"', $html); + $html = str_replace('href=""', 'href="'.config('app.url').'/notes/A"', $html); $mock = new MockHandler([ new Response(200, ['X-Foo' => 'Bar'], $html), ]); diff --git a/tests/Unit/Jobs/ProcessMediaJobTest.php b/tests/Unit/Jobs/ProcessMediaJobTest.php index 29eb780c..da9f070c 100644 --- a/tests/Unit/Jobs/ProcessMediaJobTest.php +++ b/tests/Unit/Jobs/ProcessMediaJobTest.php @@ -20,18 +20,18 @@ class ProcessMediaJobTest extends TestCase $job = new ProcessMedia('file.txt'); $job->handle($manager); - $this->assertFileDoesNotExist(storage_path('app/media/') . 'file.txt'); + $this->assertFileDoesNotExist(storage_path('app/media/').'file.txt'); } #[Test] public function small_images_are_not_resized(): void { $manager = app()->make(ImageManager::class); - Storage::disk('local')->put('media/aaron.png', file_get_contents(__DIR__ . '/../../aaron.png')); + Storage::disk('local')->put('media/aaron.png', file_get_contents(__DIR__.'/../../aaron.png')); $job = new ProcessMedia('aaron.png'); $job->handle($manager); - $this->assertFileDoesNotExist(storage_path('app/media/') . 'aaron.png'); + $this->assertFileDoesNotExist(storage_path('app/media/').'aaron.png'); // Tidy up files created by the job Storage::disk('local')->delete('public/media/aaron.png'); @@ -51,7 +51,7 @@ class ProcessMediaJobTest extends TestCase Storage::disk('public')->assertExists('media/test-image-small.jpg'); Storage::disk('public')->assertExists('media/test-image-medium.jpg'); - $this->assertFileDoesNotExist(storage_path('app/media/') . 'test-image.jpg'); + $this->assertFileDoesNotExist(storage_path('app/media/').'test-image.jpg'); // Tidy up files created by the job Storage::disk('public')->delete('media/test-image.jpg'); diff --git a/tests/Unit/Jobs/ProcessWebMentionJobTest.php b/tests/Unit/Jobs/ProcessWebMentionJobTest.php index 549dee60..5eb98d9e 100644 --- a/tests/Unit/Jobs/ProcessWebMentionJobTest.php +++ b/tests/Unit/Jobs/ProcessWebMentionJobTest.php @@ -27,8 +27,8 @@ class ProcessWebMentionJobTest extends TestCase protected function tearDown(): void { $fs = new FileSystem; - if ($fs->exists(storage_path() . '/HTML/https')) { - $fs->deleteDirectory(storage_path() . '/HTML/https'); + if ($fs->exists(storage_path().'/HTML/https')) { + $fs->deleteDirectory(storage_path().'/HTML/https'); } parent::tearDown(); } @@ -64,7 +64,7 @@ class ProcessWebMentionJobTest extends TestCase I liked a note. HTML; - $html = str_replace('href="', 'href="' . config('app.url'), $html); + $html = str_replace('href="', 'href="'.config('app.url'), $html); $mock = new MockHandler([ new Response(200, [], $html), ]); @@ -117,7 +117,7 @@ class ProcessWebMentionJobTest extends TestCase 'source' => $source, 'type' => 'in-reply-to', // phpcs:ignore Generic.Files.LineLength.TooLong - 'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"content": [{"html": "Updated reply", "value": "Updated reply"}], "in-reply-to": ["' . $note->uri . '"]}}], "rel-urls": []}', + 'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"content": [{"html": "Updated reply", "value": "Updated reply"}], "in-reply-to": ["'.$note->uri.'"]}}], "rel-urls": []}', ]); } @@ -142,7 +142,7 @@ class ProcessWebMentionJobTest extends TestCase $source = 'https://example.org/reply/1'; $webmention = new WebMention; $webmention->source = $source; - $webmention->target = config('app.url') . '/notes/E'; + $webmention->target = config('app.url').'/notes/E'; $webmention->type = 'in-reply-to'; $webmention->save(); @@ -179,7 +179,7 @@ class ProcessWebMentionJobTest extends TestCase $source = 'https://example.org/reply/1'; $webmention = new WebMention; $webmention->source = $source; - $webmention->target = config('app.url') . '/notes/E'; + $webmention->target = config('app.url').'/notes/E'; $webmention->type = 'like-of'; $webmention->save(); @@ -207,7 +207,7 @@ class ProcessWebMentionJobTest extends TestCase I liked a note. HTML; - $html = str_replace('href="', 'href="' . config('app.url'), $html); + $html = str_replace('href="', 'href="'.config('app.url'), $html); $mock = new MockHandler([ new Response(200, [], $html), ]); @@ -248,7 +248,7 @@ class ProcessWebMentionJobTest extends TestCase $source = 'https://example.org/reply/1'; $webmention = new WebMention; $webmention->source = $source; - $webmention->target = config('app.url') . '/notes/E'; + $webmention->target = config('app.url').'/notes/E'; $webmention->type = 'repost-of'; $webmention->save(); diff --git a/tests/Unit/Jobs/SaveProfileImageJobTest.php b/tests/Unit/Jobs/SaveProfileImageJobTest.php index 67d441fa..f9b92bb3 100644 --- a/tests/Unit/Jobs/SaveProfileImageJobTest.php +++ b/tests/Unit/Jobs/SaveProfileImageJobTest.php @@ -18,9 +18,9 @@ class SaveProfileImageJobTest extends TestCase { protected function tearDown(): void { - if (file_exists(public_path() . '/assets/profile-images/example.org/image')) { - unlink(public_path() . '/assets/profile-images/example.org/image'); - rmdir(public_path() . '/assets/profile-images/example.org'); + if (file_exists(public_path().'/assets/profile-images/example.org/image')) { + unlink(public_path().'/assets/profile-images/example.org/image'); + rmdir(public_path().'/assets/profile-images/example.org'); } parent::tearDown(); } @@ -77,7 +77,7 @@ class SaveProfileImageJobTest extends TestCase $job = new SaveProfileImage($mf); $job->handle($authorship); - $this->assertFileExists(public_path() . '/assets/profile-images/example.org/image'); + $this->assertFileExists(public_path().'/assets/profile-images/example.org/image'); } #[Test] @@ -103,8 +103,8 @@ class SaveProfileImageJobTest extends TestCase $job = new SaveProfileImage($mf); $job->handle($authorship); $this->assertFileEquals( - public_path() . '/assets/profile-images/default-image', - public_path() . '/assets/profile-images/example.org/image' + public_path().'/assets/profile-images/default-image', + public_path().'/assets/profile-images/example.org/image' ); } @@ -133,7 +133,7 @@ class SaveProfileImageJobTest extends TestCase $job = new SaveProfileImage($mf); $job->handle($authorship); - $this->assertFileExists(public_path() . '/assets/profile-images/example.org/image'); + $this->assertFileExists(public_path().'/assets/profile-images/example.org/image'); } #[Test] @@ -164,6 +164,6 @@ class SaveProfileImageJobTest extends TestCase $job = new SaveProfileImage($mf); $job->handle($authorship); - $this->assertFileExists(public_path() . '/assets/profile-images/example.org/image'); + $this->assertFileExists(public_path().'/assets/profile-images/example.org/image'); } } diff --git a/tests/Unit/Jobs/SaveScreenshotJobTest.php b/tests/Unit/Jobs/SaveScreenshotJobTest.php index f8066bbd..a407e3d3 100644 --- a/tests/Unit/Jobs/SaveScreenshotJobTest.php +++ b/tests/Unit/Jobs/SaveScreenshotJobTest.php @@ -7,6 +7,7 @@ namespace Tests\Unit\Jobs; use App\Jobs\SaveScreenshot; use App\Models\Bookmark; use GuzzleHttp\Client; +use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Handler\MockHandler; use GuzzleHttp\HandlerStack; use GuzzleHttp\Middleware; @@ -27,7 +28,7 @@ class SaveScreenshotJobTest extends TestCase $guzzleMock = new MockHandler([ new Response(201, ['Content-Type' => 'application/json'], '{"data":{"id":"68d52633-e170-465e-b13e-746c97d01ffb","job_id":null,"status":"finished","credits":null,"code":null,"message":null,"percent":100,"operation":"capture-website","engine":"chrome","engine_version":"107","result":null,"created_at":"2023-01-07T21:05:48+00:00","started_at":null,"ended_at":null,"retry_of_task_id":null,"copy_of_task_id":null,"user_id":61485254,"priority":-10,"host_name":null,"storage":"ceph-fra","depends_on_task_ids":[],"links":{"self":"https:\/\/api.cloudconvert.com\/v2\/tasks\/68d52633-e170-465e-b13e-746c97d01ffb"}}}'), new Response(201, ['Content-Type' => 'application/json'], '{"data":{"id":"27f33137-cc03-4468-aba4-1e1aa8c096fb","job_id":null,"status":"finished","credits":null,"code":null,"message":null,"percent":100,"operation":"export\/url","result":null,"created_at":"2023-01-07T21:10:02+00:00","started_at":null,"ended_at":null,"retry_of_task_id":null,"copy_of_task_id":null,"user_id":61485254,"priority":-10,"host_name":null,"storage":"ceph-fra","depends_on_task_ids":["68d52633-e170-465e-b13e-746c97d01ffb"],"links":{"self":"https:\/\/api.cloudconvert.com\/v2\/tasks\/27f33137-cc03-4468-aba4-1e1aa8c096fb"}}}'), - new Response(200, ['Content-Type' => 'image/png'], fopen(__DIR__ . '/../../theverge.com.png', 'rb')), + new Response(200, ['Content-Type' => 'image/png'], fopen(__DIR__.'/../../theverge.com.png', 'rb')), ]); $guzzleHandler = HandlerStack::create($guzzleMock); $guzzleClient = new Client(['handler' => $guzzleHandler]); @@ -45,7 +46,7 @@ class SaveScreenshotJobTest extends TestCase } // Retry connection exceptions - if ($exception instanceof \GuzzleHttp\Exception\ConnectException) { + if ($exception instanceof ConnectException) { return true; } @@ -82,7 +83,7 @@ class SaveScreenshotJobTest extends TestCase $bookmark->refresh(); $this->assertEquals('68d52633-e170-465e-b13e-746c97d01ffb', $bookmark->screenshot); - Storage::disk('public')->assertExists('/assets/img/bookmarks/' . $bookmark->screenshot . '.png'); + Storage::disk('public')->assertExists('/assets/img/bookmarks/'.$bookmark->screenshot.'.png'); } #[Test] @@ -92,7 +93,7 @@ class SaveScreenshotJobTest extends TestCase $guzzleMock = new MockHandler([ new Response(201, ['Content-Type' => 'application/json'], '{"id":1,"data":{"id":"68d52633-e170-465e-b13e-746c97d01ffb","job_id":null,"status":"waiting","credits":null,"code":null,"message":null,"percent":100,"operation":"capture-website","engine":"chrome","engine_version":"107","result":null,"created_at":"2023-01-07T21:05:48+00:00","started_at":null,"ended_at":null,"retry_of_task_id":null,"copy_of_task_id":null,"user_id":61485254,"priority":-10,"host_name":null,"storage":"ceph-fra","depends_on_task_ids":[],"links":{"self":"https:\/\/api.cloudconvert.com\/v2\/tasks\/68d52633-e170-465e-b13e-746c97d01ffb"}}}'), new Response(201, ['Content-Type' => 'application/json'], '{"id":2,"data":{"id":"27f33137-cc03-4468-aba4-1e1aa8c096fb","job_id":null,"status":"waiting","credits":null,"code":null,"message":null,"percent":100,"operation":"export\/url","result":null,"created_at":"2023-01-07T21:10:02+00:00","started_at":null,"ended_at":null,"retry_of_task_id":null,"copy_of_task_id":null,"user_id":61485254,"priority":-10,"host_name":null,"storage":"ceph-fra","depends_on_task_ids":["68d52633-e170-465e-b13e-746c97d01ffb"],"links":{"self":"https:\/\/api.cloudconvert.com\/v2\/tasks\/27f33137-cc03-4468-aba4-1e1aa8c096fb"}}}'), - new Response(200, ['Content-Type' => 'image/png'], fopen(__DIR__ . '/../../theverge.com.png', 'rb')), + new Response(200, ['Content-Type' => 'image/png'], fopen(__DIR__.'/../../theverge.com.png', 'rb')), ]); $guzzleHandler = HandlerStack::create($guzzleMock); $guzzleClient = new Client(['handler' => $guzzleHandler]); @@ -115,7 +116,7 @@ class SaveScreenshotJobTest extends TestCase } // Retry connection exceptions - if ($exception instanceof \GuzzleHttp\Exception\ConnectException) { + if ($exception instanceof ConnectException) { return true; } @@ -152,7 +153,7 @@ class SaveScreenshotJobTest extends TestCase $bookmark->refresh(); $this->assertEquals('68d52633-e170-465e-b13e-746c97d01ffb', $bookmark->screenshot); - Storage::disk('public')->assertExists('/assets/img/bookmarks/' . $bookmark->screenshot . '.png'); + Storage::disk('public')->assertExists('/assets/img/bookmarks/'.$bookmark->screenshot.'.png'); // Also assert we made the correct number of requests $this->assertCount(2, $container); // However with retries there should be more than 4 responses for the 2 requests diff --git a/tests/Unit/Jobs/SendWebMentionJobTest.php b/tests/Unit/Jobs/SendWebMentionJobTest.php index 7bfd24a1..29973328 100644 --- a/tests/Unit/Jobs/SendWebMentionJobTest.php +++ b/tests/Unit/Jobs/SendWebMentionJobTest.php @@ -29,7 +29,7 @@ class SendWebMentionJobTest extends TestCase { $url = 'https://example.org/webmention'; $mock = new MockHandler([ - new Response(200, ['Link' => '<' . $url . '>; rel="webmention"']), + new Response(200, ['Link' => '<'.$url.'>; rel="webmention"']), ]); $handler = HandlerStack::create($mock); $client = new Client(['handler' => $handler]); diff --git a/tests/Unit/Jobs/SyndicateNoteToBlueskyJobTest.php b/tests/Unit/Jobs/SyndicateNoteToBlueskyJobTest.php index e225cbf2..b90b621b 100644 --- a/tests/Unit/Jobs/SyndicateNoteToBlueskyJobTest.php +++ b/tests/Unit/Jobs/SyndicateNoteToBlueskyJobTest.php @@ -25,7 +25,7 @@ class SyndicateNoteToBlueskyJobTest extends TestCase $faker = Factory::create(); $randomNumber = $faker->randomNumber(); $mock = new MockHandler([ - new Response(201, ['Location' => 'https://bsky.app/profile/jonnybarnes.uk/' . $randomNumber]), + new Response(201, ['Location' => 'https://bsky.app/profile/jonnybarnes.uk/'.$randomNumber]), ]); $handler = HandlerStack::create($mock); $client = new Client(['handler' => $handler]); @@ -35,7 +35,7 @@ class SyndicateNoteToBlueskyJobTest extends TestCase $job->handle($client); $this->assertDatabaseHas('notes', [ - 'bluesky_url' => 'https://bsky.app/profile/jonnybarnes.uk/' . $randomNumber, + 'bluesky_url' => 'https://bsky.app/profile/jonnybarnes.uk/'.$randomNumber, ]); } @@ -49,7 +49,7 @@ class SyndicateNoteToBlueskyJobTest extends TestCase $container = []; $history = Middleware::history($container); $mock = new MockHandler([ - new Response(201, ['Location' => 'https://bsky.app/profile/jonnybarnes.uk/' . $randomNumber]), + new Response(201, ['Location' => 'https://bsky.app/profile/jonnybarnes.uk/'.$randomNumber]), ]); $handler = HandlerStack::create($mock); $handler->push($history); @@ -60,7 +60,7 @@ class SyndicateNoteToBlueskyJobTest extends TestCase $job->handle($client); $this->assertDatabaseHas('notes', [ - 'bluesky_url' => 'https://bsky.app/profile/jonnybarnes.uk/' . $randomNumber, + 'bluesky_url' => 'https://bsky.app/profile/jonnybarnes.uk/'.$randomNumber, ]); $expectedRequestContent = '{"type":["h-entry"],"properties":{"content":["This is a **test**"]}}'; diff --git a/tests/Unit/Jobs/SyndicateNoteToMastodonJobTest.php b/tests/Unit/Jobs/SyndicateNoteToMastodonJobTest.php index 47ecdd97..64c0cc90 100644 --- a/tests/Unit/Jobs/SyndicateNoteToMastodonJobTest.php +++ b/tests/Unit/Jobs/SyndicateNoteToMastodonJobTest.php @@ -25,7 +25,7 @@ class SyndicateNoteToMastodonJobTest extends TestCase $faker = Factory::create(); $randomNumber = $faker->randomNumber(); $mock = new MockHandler([ - new Response(201, ['Location' => 'https://mastodon.example/@jonny/' . $randomNumber]), + new Response(201, ['Location' => 'https://mastodon.example/@jonny/'.$randomNumber]), ]); $handler = HandlerStack::create($mock); $client = new Client(['handler' => $handler]); @@ -35,7 +35,7 @@ class SyndicateNoteToMastodonJobTest extends TestCase $job->handle($client); $this->assertDatabaseHas('notes', [ - 'mastodon_url' => 'https://mastodon.example/@jonny/' . $randomNumber, + 'mastodon_url' => 'https://mastodon.example/@jonny/'.$randomNumber, ]); } @@ -49,7 +49,7 @@ class SyndicateNoteToMastodonJobTest extends TestCase $container = []; $history = Middleware::history($container); $mock = new MockHandler([ - new Response(201, ['Location' => 'https://mastodon.example/@jonny/' . $randomNumber]), + new Response(201, ['Location' => 'https://mastodon.example/@jonny/'.$randomNumber]), ]); $handler = HandlerStack::create($mock); $handler->push($history); @@ -60,7 +60,7 @@ class SyndicateNoteToMastodonJobTest extends TestCase $job->handle($client); $this->assertDatabaseHas('notes', [ - 'mastodon_url' => 'https://mastodon.example/@jonny/' . $randomNumber, + 'mastodon_url' => 'https://mastodon.example/@jonny/'.$randomNumber, ]); $expectedRequestContent = '{"type":["h-entry"],"properties":{"content":["This is a **test**"]}}'; diff --git a/tests/Unit/MediaTest.php b/tests/Unit/MediaTest.php index 675f761d..baf48500 100644 --- a/tests/Unit/MediaTest.php +++ b/tests/Unit/MediaTest.php @@ -7,6 +7,7 @@ namespace Tests\Unit; use App\Models\Media; use App\Models\Note; use Illuminate\Foundation\Testing\RefreshDatabase; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; use Tests\TestCase; @@ -38,4 +39,68 @@ class MediaTest extends TestCase $this->assertEquals($absoluteUrl, $media->url); } + + #[Test] + public function local_paths_get_storage_url_prepended(): void + { + $media = new Media; + $media->path = 'photo.jpg'; + + $this->assertEquals(config('app.url').'/storage/photo.jpg', $media->url); + } + + #[Test] + public function medium_url_returns_resized_path(): void + { + $media = new Media; + $media->path = 'photo.jpg'; + + $this->assertEquals(config('app.url').'/storage/photo-medium.jpg', $media->mediumurl); + } + + #[Test] + public function small_url_returns_resized_path(): void + { + $media = new Media; + $media->path = 'photo.jpg'; + + $this->assertEquals(config('app.url').'/storage/photo-small.jpg', $media->smallurl); + } + + #[Test] + public function size_url_handles_dotted_basename(): void + { + $media = new Media; + $media->path = 'file.name.png'; + + $this->assertEquals(config('app.url').'/storage/file.name-medium.png', $media->mediumurl); + } + + /** + * @dataProvider mimeTypeProvider + */ + #[DataProvider('mimeTypeProvider')] + public function mimetype_returns_correct_mime_for_extension(string $path, string $expected): void + { + $media = new Media; + $media->path = $path; + + $this->assertEquals($expected, $media->mimetype); + } + + public static function mimeTypeProvider(): array + { + return [ + ['photo.gif', 'image/gif'], + ['photo.jpeg', 'image/jpeg'], + ['photo.jpg', 'image/jpeg'], + ['photo.png', 'image/png'], + ['photo.svg', 'image/svg+xml'], + ['photo.tiff', 'image/tiff'], + ['photo.webp', 'image/webp'], + ['video.mp4', 'video/mp4'], + ['video.mkv', 'video/mkv'], + ['file.bin', 'application/octet-stream'], + ]; + } } diff --git a/tests/Unit/MicropubUpdateDataTest.php b/tests/Unit/MicropubUpdateDataTest.php new file mode 100644 index 00000000..46eabdb9 --- /dev/null +++ b/tests/Unit/MicropubUpdateDataTest.php @@ -0,0 +1,110 @@ + 'application/json', + ], json_encode([ + 'token_data' => ['me' => 'https://example.com'], + 'url' => 'https://example.com/notes/1', + 'replace' => ['content' => ['new content']], + 'add' => ['syndication' => ['https://twitter.com']], + 'delete' => ['category' => ['old-tag']], + ], JSON_THROW_ON_ERROR)); + + $dto = UpdateData::fromRequest($request); + + $this->assertEquals(['me' => 'https://example.com'], $dto->tokenData); + $this->assertEquals('https://example.com/notes/1', $dto->updateUrl); + $this->assertEquals(['content' => ['new content']], $dto->updateReplace); + $this->assertEquals(['syndication' => ['https://twitter.com']], $dto->updateAdd); + $this->assertEquals(['category' => ['old-tag']], $dto->updateDelete); + } + + #[Test] + public function from_request_parses_form_encoded_body(): void + { + $request = Request::create('/micropub', 'POST', [ + 'token_data' => ['me' => 'https://example.com'], + 'url' => 'https://example.com/notes/1', + 'replace' => ['content' => ['new content']], + 'add' => ['syndication' => ['https://twitter.com']], + 'delete' => ['category' => ['old-tag']], + ]); + + $dto = UpdateData::fromRequest($request); + + $this->assertEquals(['me' => 'https://example.com'], $dto->tokenData); + $this->assertEquals('https://example.com/notes/1', $dto->updateUrl); + $this->assertEquals(['content' => ['new content']], $dto->updateReplace); + $this->assertEquals(['syndication' => ['https://twitter.com']], $dto->updateAdd); + $this->assertEquals(['category' => ['old-tag']], $dto->updateDelete); + } + + /** + * @throws JsonException + */ + #[Test] + public function from_request_nullable_fields_default_to_null(): void + { + $request = Request::create('/micropub', 'POST', [], [], [], [ + 'CONTENT_TYPE' => 'application/json', + ], json_encode([ + 'token_data' => ['me' => 'https://example.com'], + 'url' => 'https://example.com/notes/1', + ], JSON_THROW_ON_ERROR)); + + $dto = UpdateData::fromRequest($request); + + $this->assertNull($dto->updateReplace); + $this->assertNull($dto->updateAdd); + $this->assertNull($dto->updateDelete); + } + + #[Test] + public function from_array_maps_all_fields(): void + { + $dto = UpdateData::fromArray([ + 'token_data' => ['me' => 'https://example.com'], + 'update_url' => 'https://example.com/notes/1', + 'update_replace' => ['content' => ['updated']], + 'update_add' => ['category' => ['new-tag']], + 'update_delete' => ['syndication' => ['https://old.example.com']], + ]); + + $this->assertEquals(['me' => 'https://example.com'], $dto->tokenData); + $this->assertEquals('https://example.com/notes/1', $dto->updateUrl); + $this->assertEquals(['content' => ['updated']], $dto->updateReplace); + $this->assertEquals(['category' => ['new-tag']], $dto->updateAdd); + $this->assertEquals(['syndication' => ['https://old.example.com']], $dto->updateDelete); + } + + #[Test] + public function from_array_nullable_fields_default_to_null(): void + { + $dto = UpdateData::fromArray([ + 'token_data' => ['me' => 'https://example.com'], + ]); + + $this->assertNull($dto->updateUrl); + $this->assertNull($dto->updateReplace); + $this->assertNull($dto->updateAdd); + $this->assertNull($dto->updateDelete); + } +} diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php index 330d93fe..0778ce2a 100644 --- a/tests/Unit/NotesTest.php +++ b/tests/Unit/NotesTest.php @@ -31,7 +31,7 @@ class NotesTest extends TestCase public function get_note_attribute_method_calls_sub_methods(): void { // phpcs:ignore - $expected = '

Having a at the local. 🍺

' . PHP_EOL; + $expected = '

Having a at the local. 🍺

'.PHP_EOL; $note = Note::factory([ 'note' => 'Having a #beer at the local. 🍺', ])->create(); @@ -53,7 +53,7 @@ class NotesTest extends TestCase t -

' . PHP_EOL; +

'.PHP_EOL; Contact::factory()->create([ 'nick' => 'tantek', 'name' => 'Tantek Çelik', @@ -98,7 +98,7 @@ class NotesTest extends TestCase Facebook -

' . PHP_EOL; +

'.PHP_EOL; $this->assertEquals($expected, $note->note); } @@ -108,7 +108,7 @@ class NotesTest extends TestCase #[Test] public function twitter_link_is_created_when_no_contact_found(): void { - $expected = '

Hi @bob

' . PHP_EOL; + $expected = '

Hi @bob

'.PHP_EOL; $note = Note::factory()->create([ 'note' => 'Hi @bob', ]); @@ -312,7 +312,7 @@ class NotesTest extends TestCase $note->media()->save($media); $expected = 'A nice image -'; +'; $this->assertEquals($expected, $note->content); } @@ -329,7 +329,7 @@ class NotesTest extends TestCase $note->media()->save($media); $expected = 'A nice video -