From 26a2b4bd9e70c489c3be1a1bd16fd3e4db4d2d06 Mon Sep 17 00:00:00 2001 From: Elizabeth Danzberger Date: Thu, 15 Aug 2024 15:13:44 -0400 Subject: [PATCH 1/3] feat(template): make template handling more generic to support other field types Signed-off-by: Elizabeth Danzberger --- cypress/e2e/templates.spec.js | 7 ++-- .../document_template_with_fields.odt | Bin 196830 -> 197764 bytes cypress/support/commands.js | 34 +++++++++++++++--- lib/Service/TemplateFieldService.php | 28 +++++++++------ 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/cypress/e2e/templates.spec.js b/cypress/e2e/templates.spec.js index 10669c8fb9..5d237b5926 100644 --- a/cypress/e2e/templates.spec.js +++ b/cypress/e2e/templates.spec.js @@ -108,7 +108,7 @@ describe('Create templates with fields', () => { cy.login(randUser) cy.visit('/apps/files') - + // Create a templates folder cy.get('.files-list__header div[menu-title="New"] button') .should('be.visible') @@ -126,8 +126,9 @@ describe('Create templates with fields', () => { it('Create a document from a template with fields', () => { const fields = [ - { alias: 'Name', content: 'Nextcloud' }, - { alias: 'Favorite app', content: 'richdocuments' } + { type: 'rich-text', alias: 'Name', content: 'Nextcloud' }, + { type: 'rich-text', alias: 'Favorite app', content: 'richdocuments' }, + { type: 'checkbox', alias: 'Uses Nextcloud at home', checked: true }, ] cy.visit('/apps/files') diff --git a/cypress/fixtures/templates/document_template_with_fields.odt b/cypress/fixtures/templates/document_template_with_fields.odt index fb56a3adaa18608f64bd528296e12d5e15f90fbf..5083b1b6496e7af61dd0ec838b4c63a4256aa82f 100644 GIT binary patch delta 25636 zcmZ^~1B~F!vo<=mZQHhO+qUiB*tW659ec;N?H%vf+QH83_rCX>f6jMq?(L*gm42!^ zm2@ZdbanS`2ts%a0-}mMI0Oa=2n+~FXE;U*q8#|YLXR|y<_in~{{Mo~TtM0XgXMny zzc73-cIf|};vYNGETm5`xc}vh4@R2Og7shiod1fnT~NONNB(1u>EZ0`U}oyZ{9m!a zz`*<)OPVGaF|f^p2K4unxh(ppS#G+TedOMVhx8g2{{*l9c?!w6$i>`BldM7TyJ7F3 z(neOJRn`ePP97eE(>jv<&n)yL>*qn#IC-z%fB}luu441KgImOOK4#g@o?_7Fi+OYI zpSyc!;teNhw;oy@BVt!tbkcc@IC>POQ7UXR(pxHMTA)TTw@|6_+?LfcpeX3WyV@pZ zB#Es+=SGkjZfjhyXcp^Sh%s4W5`3`ITj}tgB&io|)2~;FbF~TU3MYq8K7@P_*`(KH zhwQWrY}($)2?tHWLC#~ujQkO?#^qeA8@7`hkDR^P{11o-4XcMm)RH7y+Ot*pa{SPVS9J4sff0M+p3o>XuzCiO)6v2yRR;h7Q*M?R5^lv0CA%Mr|$y&waDYj*Uwbeq&0!E2mw%2jPYKQ@Uto-pWjDnQHbmP*(y zzW*EA3potIxI4vDfG8Zb%7{ghd?S`!Iu9x-)j1F4W=mUs#K<^&X6yukR|E7&jM6!^ z!mGl7@7AMs%C9d%O@%+Dqt;N;BzJNZgFt$>YCG*1>X@sS#4q{yk10DOabeQ1@zr%@ z)yJ+{^9BDVYwCpQHn&6IJ|%e~_+^C-It4ZbJ9*+G^Uy73#|y1~>CZs(g+hij^7CjhCG z7cH2m&>D^EU~6y;Y2)3K4!M>!@#(!!?paKx<1+if;pnO*1TRy^13YhY8j|cgo6jh} z!}Robhv7#(pLz&)`*aa&FZL^W5^IB5z6qr0-4D}up)*$=QwE_{0_Uh|KQY1R)-g;`(7By9GeBI zwmW{RHe(vZ#L#JjF3{90NT`Of-IF^jSYRpp!i00Hpjlg;u#%FX^^1`g&Ek_OuWbnm zIn_+=x_Pjgn_w^?7%tB$N`Rr1f42Ja<#Pb8d@WqD)6ys7`(Lv~;xS^c@&>|m0%BBJ zbk9ZCl+A>lYOE-(xO>M5NYsK-IUmJd0*o8*$(VbyV8s;X6~>PalgnXIyk3&^Sx24? z3>qZxp9YidCK%zFQwST9q%*X&n!kR^V^ZfA=uMfHXW+flsBmChi`fRrx z?VPWztbRast%?QFEl(2Q=I)x}3};MJYooDV-n2v27$9&%IcY$3B*yE(e~PJEp(c}1 zK4U1XPD!z=WHzba_ym668eez${nW@DTsphuC;XN9w)vZgTlC86;A|GnY_-#yQ5i$e zUOvix!epL+bJKk!!6~+zt$Xs2y7>n)xe0Xx4IebGJ7%hJYRbG)yG>!8^Qrlx0HL*Fj2+4ONZ~=J2V`Urh1~xeOz*W65OPAyv%wi9yG8_UDnXwfI}M$FAX#@ zb#Hxq>#F5HtziD{?0=a0&3v+r(fVGGkk>1hl@iq2t;0S|z$kJ{h`UPHF6pia9sNit zD`c?HNs)+9LwGpj;~rBy_UsKx{30X&FZQgNKbX2F{pB7y!?@-P!H-rXpHd{-8-^*n z?}L@EqJ-Hk*tY7MtEk8n6n7N&ai%vssZ!s!T8}6Hqdki8?a- z5>AYJqaPVH`?QW2oh3$&%fpV4lz7iEy;oiq!*(o6vT3`ti=Fy2;6pZ#*@uuG^?9=B zX>;)RRO^RU+xJ-ZjfE?q-GW{(B5p*Ps;hwYXPtIm7(Ni$a1(jFwFSGwLE@#eO6r1X zQIPGVcPhm;ULN$hP|`j+_**}H@3!+DuFcj<)R)^9E#STwOYJbknT*eA8K?WtncuB( zB%3Ykg+%j})%+voI)@_2g#@7~`tt*%=s@56F0|9#@a|{srowh&aPkPmVgk-am#2{F zdXlt0$uKZ!YFy3i_EF*3w9)yzpQt*ego3u+!s{#FidcNnhFHZaBNfV-6vhdF*Fdh3 zA*~%E)?(?byEfME4cLXW#fP;8{0k@&)aG$F>Y4l;8|(`FcYqFQ?c!g{OCFs|?#8XC zrOkow9xs0()+uR68ZFS^Jr6ch0v-Dyfrs#s-8Aob+2>B=rWvmOnagj`686uU{e&K& zL*$nIXULW_*9yH5DvzDg1$Mnhj3bt)?8#5~XBFDf99U1^V_rUHx*2|A>g+*i{}uAN zVn9T|xGgJBVLN?K=;TWaHhj@s0v$8>lgppud+tAIa^rg#ddt4)wqv&DfNcPI2>kxq zI&q3)|Ey&FMlYqQTulCB8HhYi?|Nfj^*k=rigNRuz1hgATQF<)(QC9nKeS4af??VU zwP_kK=P>#KsZGKqb=1t5-LU?~QYCd)LC-VKCP3lCBi_a;JaNW{h8+8zi&bFWIkPae z(&-dzjKrlZ>^a8CEVQZ*Il-Sw4J7X8`uo$woFP!&eVe^6=d(&9s?gF`QdcTd5#H5R zG&I*q;xZTHPmIp@_=x{evwf*k+9a<&T2?fa;E6cd*7+?7 zj}gRQDPaEGP)Hs4;BnB+|Bd!Th67}_;&EHkTy$dm@|t(QMR1L&sAbzjv>3}q0YI}W{iUW+aGQ3;9EKK{d6!faI>-WeDs$MB<-WYvSF~

4eblU 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 C@aC@o delta 24580 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 jwQJP>U}FxubsfaNwFt9kzew$q6H diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 7f8c31f41e..39e2ba55fa 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -311,9 +311,21 @@ Cypress.Commands.add('submitTemplateFields', (fields) => { cy.get('.template-field-modal__buttons').as('templateFillerButtons') for (const field of fields) { - cy.get('@templateFiller') - .find(`input[placeholder="${field.alias}"]`) - .type(field.content) + switch (field.type) { + case 'rich-text': + cy.get('@templateFiller') + .find(`input[placeholder="${field.alias}"]`) + .type(field.content) + break + case 'checkbox': + cy.get('@templateFiller') + .find('span.checkbox-radio-switch__text').contains(field.alias) + .click() + break + default: + expect.fail('Using a field type not yet supported') + break + } } // Submit the template fields @@ -332,11 +344,23 @@ Cypress.Commands.add('verifyTemplateFields', (fields, fileId) => { method: 'GET', url: Cypress.env('baseUrl') + apiEndpoint + fileId + '?format=json', headers: { - requesttoken + requesttoken, }, }).then(({ body }) => { for (const index in body.ocs.data) { - expect(body.ocs.data[index].content).to.equal(fields[index].content) + const field = body.ocs.data[index] + + switch (field.type) { + case 'rich-text': + expect(field.content).to.equal(fields[index].content) + break + case 'checkbox': + expect(field.checked).to.equal(fields[index].checked) + break + default: + expect.fail('Using a field type not yet supported') + break + } } }) }) diff --git a/lib/Service/TemplateFieldService.php b/lib/Service/TemplateFieldService.php index d9cfad8d38..f0d6a03e38 100644 --- a/lib/Service/TemplateFieldService.php +++ b/lib/Service/TemplateFieldService.php @@ -14,6 +14,7 @@ use OCP\Files\Node; use OCP\Files\NotFoundException; use OCP\Files\Template\Field; +use OCP\Files\Template\FieldFactory; use OCP\Files\Template\FieldType; use OCP\Http\Client\IClientService; use OCP\ICacheFactory; @@ -94,16 +95,23 @@ public function extractFields(Node|int $file): array { continue; } - $fields[] = [ - new Field( - $index, - $attr['content'], - $fieldType, - $attr['alias'], - $attr['id'], - $attr['tag'] - ) - ]; + $field = FieldFactory::createField($index, $fieldType); + $field->id = $attr['id']; + $field->tag = $attr['tag']; + $field->alias = $attr['alias']; + + switch ($fieldType) { + case FieldType::RichText: + $field->setValue($attr['content']); + break; + case FieldType::CheckBox: + $field->setValue($attr['Checked'] === 'true'); + break; + default: + break; + } + + $fields[] = [$field]; } $fields = array_merge([], ...$fields); From fe8a3637061cca062536e0987b7bed872ccee51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 28 Aug 2024 12:37:16 +0200 Subject: [PATCH 2/3] chore(ocp): Update nextcloud/ocp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- composer.lock | 296 +++++++++++++++++++++++++++----------------------- 1 file changed, 162 insertions(+), 134 deletions(-) diff --git a/composer.lock b/composer.lock index f5400aba7d..f80ba9d5a3 100644 --- a/composer.lock +++ b/composer.lock @@ -132,16 +132,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -149,11 +149,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -179,7 +180,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -187,7 +188,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nextcloud/coding-standard", @@ -236,12 +237,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "b0127d6fd2932bf1fdffe334ae59fdd6c8272029" + "reference": "7dc8227f9725eae5cddaa40c0f91a5b0cba8878e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/b0127d6fd2932bf1fdffe334ae59fdd6c8272029", - "reference": "b0127d6fd2932bf1fdffe334ae59fdd6c8272029", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/7dc8227f9725eae5cddaa40c0f91a5b0cba8878e", + "reference": "7dc8227f9725eae5cddaa40c0f91a5b0cba8878e", "shasum": "" }, "require": { @@ -273,20 +274,20 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2024-08-14T08:51:54+00:00" + "time": "2024-08-28T09:54:31+00:00" }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", "shasum": "" }, "require": { @@ -297,7 +298,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -329,9 +330,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-07-01T20:03:41+00:00" }, { "name": "phar-io/manifest", @@ -453,16 +454,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.62.0", + "version": "v3.63.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae" + "reference": "27db669308f957ad1909e8c4aa4b957e4cfbc6c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/7a91d5ce45c486f5b445d95901228507a02f60ae", - "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/27db669308f957ad1909e8c4aa4b957e4cfbc6c9", + "reference": "27db669308f957ad1909e8c4aa4b957e4cfbc6c9", "shasum": "" }, "require": { @@ -499,41 +500,41 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.62.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.63.1" }, - "time": "2024-08-07T17:03:46+00:00" + "time": "2024-08-26T14:03:48+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.31", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -542,7 +543,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -571,7 +572,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/9.2.31" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -579,7 +580,7 @@ "type": "github" } ], - "time": "2024-03-02T06:37:42+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -824,45 +825,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.19", + "version": "9.6.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" + "reference": "49d7820565836236411f5dc002d16dd689cde42f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f", + "reference": "49d7820565836236411f5dc002d16dd689cde42f", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.31", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -907,7 +908,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20" }, "funding": [ { @@ -923,7 +924,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:35:58+00:00" + "time": "2024-07-10T11:45:39+00:00" }, { "name": "psalm/phar", @@ -1167,19 +1168,24 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "c9920ef42818bc65373cec1acc26bdee7a487e72" + "reference": "f6f9a938afd75c2344952b0566983700829c7440" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c9920ef42818bc65373cec1acc26bdee7a487e72", - "reference": "c9920ef42818bc65373cec1acc26bdee7a487e72", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f6f9a938afd75c2344952b0566983700829c7440", + "reference": "f6f9a938afd75c2344952b0566983700829c7440", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.2.13", + "admidio/admidio": "<4.3.10", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<2.2", + "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6", + "aimeos/ai-admin-jsonadm": "<2020.10.13|>=2021.04.1,<2021.10.6|>=2022.04.1,<2022.10.3|>=2023.04.1,<2023.10.4|==2024.04.1", + "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.22|>=2022.04.1,<2022.10.13|>=2023.04.1,<2023.10.15|>=2024.04.1,<2024.04.7", + "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9", + "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7", "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", "airesvsg/acf-to-rest-api": "<=3.1", "akaunting/akaunting": "<2.1.13", @@ -1204,12 +1210,13 @@ "athlon1600/php-proxy": "<=5.1", "athlon1600/php-proxy-app": "<=3", "austintoddj/canvas": "<=3.4.2", - "automad/automad": "<=1.10.9", + "auth0/wordpress": "<=4.6", + "automad/automad": "<2.0.0.0-alpha5", "automattic/jetpack": "<9.8", "awesome-support/awesome-support": "<=6.0.7", "aws/aws-sdk-php": "<3.288.1", "azuracast/azuracast": "<0.18.3", - "backdrop/backdrop": "<1.24.2", + "backdrop/backdrop": "<1.27.3|>=1.28,<1.28.2", "backpack/crud": "<3.4.9", "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", @@ -1224,12 +1231,13 @@ "bcosca/fatfree": "<3.7.2", "bedita/bedita": "<4", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<2.9.5", + "billz/raspap-webgui": "<=3.1.4", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "blueimp/jquery-file-upload": "==6.4.4", "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", "bolt/core": "<=4.2", + "born05/craft-twofactorauthentication": "<3.3.4", "bottelet/flarepoint": "<2.2.1", "bref/bref": "<2.1.17", "brightlocal/phpwhois": "<=4.2.5", @@ -1245,6 +1253,7 @@ "cardgate/magento2": "<2.0.33", "cardgate/woocommerce": "<=3.1.15", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", + "cart2quote/module-quotation-encoded": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", "catfan/medoo": "<1.7.5", "causal/oidc": "<2.1", @@ -1254,14 +1263,14 @@ "chriskacerguis/codeigniter-restserver": "<=2.7.1", "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", "ckeditor/ckeditor": "<4.24", - "cockpit-hq/cockpit": "<=2.6.3|==2.7", + "cockpit-hq/cockpit": "<2.7|==2.7", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<3.1.9", "codeigniter4/framework": "<4.4.7", "codeigniter4/shield": "<1.0.0.0-beta8", "codiad/codiad": "<=2.8.4", - "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7", - "concrete5/concrete5": "<9.2.8", + "composer/composer": "<1.10.27|>=2,<2.2.24|>=2.3,<2.7.7", + "concrete5/concrete5": "<9.3.3", "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4", @@ -1272,7 +1281,7 @@ "contao/managed-edition": "<=1.5", "corveda/phpsandbox": "<1.3.5", "cosenary/instagram": "<=2.3", - "craftcms/cms": "<4.6.2", + "craftcms/cms": "<4.6.2|>=5.0.0.0-beta1,<=5.2.2", "croogo/croogo": "<4", "cuyz/valinor": "<0.12", "czproject/git-php": "<4.0.3", @@ -1282,7 +1291,7 @@ "datatables/datatables": "<1.10.10", "david-garcia/phpwhois": "<=4.3.1", "dbrisinajumi/d2files": "<1", - "dcat/laravel-admin": "<=2.1.3.0-beta", + "dcat/laravel-admin": "<=2.1.3", "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", "desperado/xml-bundle": "<=0.1.7", @@ -1293,11 +1302,11 @@ "doctrine/common": "<2.4.3|>=2.5,<2.5.1", "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4", "doctrine/doctrine-bundle": "<1.5.2", - "doctrine/doctrine-module": "<=0.7.1", + "doctrine/doctrine-module": "<0.7.2", "doctrine/mongodb-odm": "<1.0.2", "doctrine/mongodb-odm-bundle": "<3.0.1", - "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<=19", + "doctrine/orm": ">=1,<1.2.4|>=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", + "dolibarr/dolibarr": "<19.0.2", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2", @@ -1307,7 +1316,7 @@ "ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2", "ecodev/newsletter": "<=4", "ectouch/ectouch": "<=2.7.2", - "egroupware/egroupware": "<16.1.20170922", + "egroupware/egroupware": "<23.1.20240624", "elefant/cms": "<2.0.7", "elgg/elgg": "<3.3.24|>=4,<4.0.5", "elijaa/phpmemcacheadmin": "<=1.3", @@ -1325,16 +1334,16 @@ "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev", "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26|>=3.3,<3.3.39", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.35", "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", - "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev", + "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev|>=3.3,<3.3.40", "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15", "ezsystems/ezplatform-user": ">=1,<1.0.1", "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31", - "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.06,<=2019.03.5.1", + "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", "ezyang/htmlpurifier": "<4.1.1", @@ -1348,6 +1357,7 @@ "filp/whoops": "<2.1.13", "fineuploader/php-traditional-server": "<=1.2.2", "firebase/php-jwt": "<6", + "fisharebest/webtrees": "<=2.1.18", "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2", "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6", "flarum/core": "<1.8.5", @@ -1368,32 +1378,33 @@ "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2", "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", - "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", + "friendsofsymfony/user-bundle": ">=1,<1.3.5", "friendsofsymfony1/swiftmailer": ">=4,<5.4.13|>=6,<6.2.5", - "friendsofsymfony1/symfony1": ">=1.1,<1.15.19", + "friendsofsymfony1/symfony1": ">=1.1,<1.5.19", "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6", "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3", - "froxlor/froxlor": "<=2.1.1", + "froxlor/froxlor": "<=2.2.0.0-RC3", "frozennode/administrator": "<=5.0.12", "fuel/core": "<1.8.1", "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", - "getgrav/grav": "<1.7.45", + "getformwork/formwork": "<1.13.1|==2.0.0.0-beta1", + "getgrav/grav": "<1.7.46", "getkirby/cms": "<4.1.1", "getkirby/kirby": "<=2.5.12", "getkirby/panel": "<2.5.14", "getkirby/starterkit": "<=3.7.0.2", "gilacms/gila": "<=1.15.4", - "gleez/cms": "<=1.2|==2", + "gleez/cms": "<=1.3|==2", "globalpayments/php-sdk": "<2", "gogentooss/samlbase": "<1.2.7", "google/protobuf": "<3.15", "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", "gree/jose": "<2.2.1", "gregwar/rst": "<1.0.3", - "grumpydictator/firefly-iii": "<6.1.7", + "grumpydictator/firefly-iii": "<6.1.17", "gugoan/economizzer": "<=0.9.0.0-beta1", "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5", "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5", @@ -1407,8 +1418,9 @@ "hov/jobfair": "<1.0.13|>=2,<2.0.2", "httpsoft/http-message": "<1.0.12", "hyn/multi-tenant": ">=5.6,<5.7.2", - "ibexa/admin-ui": ">=4.2,<4.2.3", + "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6.0.0-beta1,<4.6.9", "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2", + "ibexa/fieldtype-richtext": ">=4.6,<4.6.10", "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", "ibexa/post-install": "<=1.0.4", "ibexa/solr": ">=4.5,<4.5.4", @@ -1417,7 +1429,7 @@ "idno/known": "<=1.3.1", "ilicmiljan/secure-props": ">=1.2,<1.2.2", "illuminate/auth": "<5.5.10", - "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", + "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<6.18.31|>=7,<7.22.4", "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", @@ -1427,9 +1439,11 @@ "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3", "in2code/ipandlanguageredirect": "<5.1.2", "in2code/lux": "<17.6.1|>=18,<24.0.2", + "in2code/powermail": "<7.5|>=8,<8.5|>=9,<10.9|>=12,<12.4", "innologi/typo3-appointments": "<2.0.6", "intelliants/subrion": "<4.2.2", "inter-mediator/inter-mediator": "==5.5", + "ipl/web": "<0.10.1", "islandora/islandora": ">=2,<2.4.1", "ivankristianto/phpwhois": "<=4.3", "jackalope/jackalope-doctrine-dbal": "<1.7.4", @@ -1450,11 +1464,12 @@ "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", "juzaweb/cms": "<=3.4", + "jweiland/events2": "<8.3.8|>=9,<9.0.6", "kazist/phpwhois": "<=4.2.6", "kelvinmo/simplexrd": "<3.1.1", "kevinpapst/kimai2": "<1.16.7", "khodakhah/nodcms": "<=3", - "kimai/kimai": "<2.13", + "kimai/kimai": "<2.16", "kitodo/presentation": "<3.2.3|>=3.3,<3.3.4", "klaviyo/magento2-extension": ">=1,<3", "knplabs/knp-snappy": "<=1.4.2", @@ -1469,9 +1484,9 @@ "laravel/fortify": "<1.11.1", "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75", "laravel/laravel": ">=5.4,<5.4.22", - "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", + "laravel/socialite": ">=1,<2.0.10", "latte/latte": "<2.10.8", - "lavalite/cms": "<=9", + "lavalite/cms": "<=9|==10.1", "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5", "league/commonmark": "<0.18.3", "league/flysystem": "<1.1.4|>=2,<2.1.1", @@ -1487,15 +1502,15 @@ "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", "luyadev/yii-helpers": "<1.2.1", - "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5", + "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch8|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch6|==2.4.7", "magento/core": "<=1.9.4.5", "magento/magento1ce": "<1.9.4.3-dev", "magento/magento1ee": ">=1,<1.14.4.3-dev", - "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2", + "magento/product-community-edition": "<2.4.4.0-patch9|>=2.4.5,<2.4.5.0-patch8|>=2.4.6,<2.4.6.0-patch6|>=2.4.7,<2.4.7.0-patch1", "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<2.26.1", + "mantisbt/mantisbt": "<2.26.2", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.4.12|>=5.0.0.0-alpha,<5.0.4", @@ -1511,7 +1526,7 @@ "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2,<2.0.1", "microsoft/microsoft-graph-beta": "<2.0.1", "microsoft/microsoft-graph-core": "<2.0.2", - "microweber/microweber": "<=2.0.4", + "microweber/microweber": "<=2.0.16", "mikehaertl/php-shellcommand": "<1.6.1", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", @@ -1520,7 +1535,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<=4.3.3", + "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1", "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "movingbytes/social-network": "<=1.2.1", @@ -1538,8 +1553,8 @@ "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", "neos/media-browser": "<7.3.19|>=8,<8.0.16|>=8.1,<8.1.11|>=8.2,<8.2.11|>=8.3,<8.3.9", - "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2", - "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", + "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2", + "neos/swiftmailer": "<5.4.5", "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15", "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", @@ -1547,6 +1562,7 @@ "nonfiction/nterchange": "<4.1.1", "notrinos/notrinos-erp": "<=0.7", "noumo/easyii": "<=0.9", + "novaksolutions/infusionsoft-php-sdk": "<1", "nukeviet/nukeviet": "<4.5.02", "nyholm/psr7": "<1.6.1", "nystudio107/craft-seomatic": "<3.4.12", @@ -1556,14 +1572,14 @@ "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", "october/october": "<=3.4.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.2", + "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15", "omeka/omeka-s": "<4.0.3", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": ">=1,<1.9.3|>=2,<2.1.5", "open-web-analytics/open-web-analytics": "<1.7.4", - "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev", + "opencart/opencart": ">=0", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<20.5", + "openmage/magento-lts": "<20.10.1", "opensolutions/vimbadmin": "<=3.0.15", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", @@ -1573,12 +1589,14 @@ "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", "oro/customer-portal": ">=4.1,<=4.1.13|>=4.2,<=4.2.10|>=5,<=5.0.11|>=5.1,<=5.1.3", "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<=5.0.12|>=5.1,<=5.1.3", + "oveleon/contao-cookiebar": "<1.16.3|>=2,<2.1.3", "oxid-esales/oxideshop-ce": "<4.5", "oxid-esales/paymorrow-module": ">=1,<1.0.2|>=2,<2.0.1", "packbackbooks/lti-1-3-php-library": "<5", "padraic/humbug_get_contents": "<1.1.2", "pagarme/pagarme-php": "<3", "pagekit/pagekit": "<=1.0.18", + "paragonie/ecc": "<2.0.1", "paragonie/random_compat": "<2", "passbolt/passbolt_api": "<4.6.2", "paypal/adaptivepayments-sdk-php": "<=3.9.2", @@ -1593,6 +1611,7 @@ "personnummer/personnummer": "<3.0.2", "phanan/koel": "<5.1.4", "phenx/php-svg-lib": "<0.5.2", + "php-censor/php-censor": "<2.0.13|>=2.1,<2.1.5", "php-mod/curl": "<2.3.2", "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", "phpems/phpems": ">=6,<=6.1.3", @@ -1612,13 +1631,13 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.3.4", + "pimcore/admin-ui-classic-bundle": "<=1.5.1", "pimcore/customer-management-framework-bundle": "<4.0.6", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", "pimcore/ecommerce-framework-bundle": "<1.0.10", "pimcore/perspective-editor": "<1.5.1", - "pimcore/pimcore": "<11.2.3", + "pimcore/pimcore": "<11.2.4", "pixelfed/pixelfed": "<0.11.11", "plotly/plotly.js": "<2.25.2", "pocketmine/bedrock-protocol": "<8.0.2", @@ -1630,21 +1649,22 @@ "prestashop/blockwishlist": ">=2,<2.1.1", "prestashop/contactform": ">=1.0.1,<4.3", "prestashop/gamification": "<2.3.2", - "prestashop/prestashop": "<8.1.4", + "prestashop/prestashop": "<8.1.6", "prestashop/productcomments": "<5.0.2", "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", "prestashop/ps_linklist": "<3.1", - "privatebin/privatebin": "<1.4", - "processwire/processwire": "<=3.0.210", + "privatebin/privatebin": "<1.4|>=1.5,<1.7.4", + "processwire/processwire": "<=3.0.229", "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.7", + "pterodactyl/panel": "<1.11.6", "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", "ptrofimov/beanstalk_console": "<1.7.14", "pubnub/pubnub": "<6.1", "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6.0-beta", + "pxlrbt/filament-excel": "<2.3.3", "pyrocms/pyrocms": "<=3.9.1", "qcubed/qcubed": "<=3.1.1", "quickapps/cms": "<=2.0.0.0-beta2", @@ -1672,24 +1692,25 @@ "serluck/phpwhois": "<=4.2.6", "sfroemken/url_redirect": "<=1.2.1", "sheng/yiicms": "<=1.2", - "shopware/core": "<6.5.8.8-dev|>=6.6.0.0-RC1-dev,<6.6.1", - "shopware/platform": "<6.5.8.8-dev|>=6.6.0.0-RC1-dev,<6.6.1", + "shopware/core": "<=6.5.8.12|>=6.6,<=6.6.5", + "shopware/platform": "<=6.5.8.12|>=6.6,<=6.6.5", "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<6.2.3", + "shopware/shopware": "<=5.7.17", "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", - "shopxo/shopxo": "<2.2.6", + "shopxo/shopxo": "<=6.1", "showdoc/showdoc": "<2.10.4", "silverstripe-australia/advancedreports": ">=1,<=2", "silverstripe/admin": "<1.13.19|>=2,<2.1.8", "silverstripe/assets": ">=1,<1.11.1", "silverstripe/cms": "<4.11.3", - "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", + "silverstripe/comments": ">=1.3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.13.39|>=5,<5.1.11", + "silverstripe/framework": "<5.2.16", "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.8.2|>=4,<4.3.7|>=5,<5.1.3", "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", "silverstripe/recipe-cms": ">=4.5,<4.5.3", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", + "silverstripe/reports": "<5.2.3", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4|>=2.1,<2.1.2", "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1", "silverstripe/subsites": ">=2,<2.6.1", @@ -1709,21 +1730,24 @@ "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1", "slim/slim": "<2.6", "slub/slub-events": "<3.0.3", - "smarty/smarty": "<3.1.48|>=4,<4.3.1", - "snipe/snipe-it": "<=6.2.2", + "smarty/smarty": "<4.5.3|>=5,<5.1.1", + "snipe/snipe-it": "<6.4.2", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", "spatie/browsershot": "<3.57.4", + "spatie/image-optimizer": "<1.7.3", "spipu/html2pdf": "<5.2.8", "spoon/library": "<1.4.1", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", - "ssddanbrown/bookstack": "<22.02.3", - "statamic/cms": "<4.46", + "ssddanbrown/bookstack": "<24.05.1", + "statamic/cms": "<4.46|>=5.3,<5.6.2", "stormpath/sdk": "<9.9.99", - "studio-42/elfinder": "<2.1.62", + "studio-42/elfinder": "<=2.1.64", + "studiomitte/friendlycaptcha": "<0.1.4", "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", + "sulu/form-bundle": ">=2,<2.5.3", "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", @@ -1735,8 +1759,8 @@ "sylius/grid-bundle": "<1.10.1", "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1", "sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", - "sylius/sylius": "<=1.12.13", - "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", + "sylius/sylius": "<1.12.19|>=1.13.0.0-alpha1,<1.13.4", + "symbiote/silverstripe-multivaluefield": ">=3,<3.1", "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", "symbiote/silverstripe-seed": "<6.0.3", "symbiote/silverstripe-versionedfiles": "<=2.0.3", @@ -1787,22 +1811,23 @@ "thorsten/phpmyfaq": "<3.2.2", "tikiwiki/tiki-manager": "<=17.1", "timber/timber": ">=0.16.6,<1.23.1|>=1.24,<1.24.1|>=2,<2.1", - "tinymce/tinymce": "<7", + "tinymce/tinymce": "<7.2", "tinymighty/wiki-seo": "<1.2.2", "titon/framework": "<9.9.99", "tobiasbg/tablepress": "<=2.0.0.0-RC1", - "topthink/framework": "<6.0.14", + "topthink/framework": "<6.0.17|>=6.1,<6.1.5|>=8,<8.0.4", "topthink/think": "<=6.1.1", "topthink/thinkphp": "<=3.2.3", - "torrentpier/torrentpier": "<=2.4.1", + "torrentpier/torrentpier": "<=2.4.3", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", - "tribalsystems/zenario": "<=9.4.59197", + "tribalsystems/zenario": "<9.5.60602", "truckersmp/phpwhois": "<=4.3.1", "ttskch/pagination-service-provider": "<1", + "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2", "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3", "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", - "typo3/cms-core": "<=8.7.56|>=9,<=9.5.45|>=10,<=10.4.42|>=11,<=11.5.34|>=12,<=12.4.10|==13", + "typo3/cms-core": "<=8.7.56|>=9,<=9.5.47|>=10,<=10.4.44|>=11,<=11.5.36|>=12,<=12.4.14|>=13,<=13.1", "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1", "typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1", "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", @@ -1824,17 +1849,20 @@ "uvdesk/core-framework": "<=1.1.1", "vanilla/safecurl": "<0.9.2", "verbb/comments": "<1.5.5", + "verbb/formie": "<2.1.6", "verbb/image-resizer": "<2.0.9", "verbb/knock-knock": "<1.2.8", "verot/class.upload.php": "<=2.1.6", "villagedefrance/opencart-overclocked": "<=1.11.1", "vova07/yii2-fileapi-widget": "<0.1.9", "vrana/adminer": "<4.8.1", + "vufind/vufind": ">=2,<9.1.1", "waldhacker/hcaptcha": "<2.1.2", "wallabag/tcpdf": "<6.2.22", "wallabag/wallabag": "<2.6.7", "wanglelecc/laracms": "<=1.0.3", - "web-auth/webauthn-framework": ">=3.3,<3.3.4", + "web-auth/webauthn-framework": ">=3.3,<3.3.4|>=4.5,<4.9", + "web-auth/webauthn-lib": ">=4.5,<4.9", "web-feet/coastercms": "==5.5", "webbuilders-group/silverstripe-kapost-bridge": "<0.4", "webcoast/deferred-image-processing": "<1.0.2", @@ -1848,14 +1876,14 @@ "winter/wn-dusk-plugin": "<2.1", "winter/wn-system-module": "<1.2.4", "wintercms/winter": "<=1.2.3", - "woocommerce/woocommerce": "<6.6", + "woocommerce/woocommerce": "<6.6|>=8.8,<8.8.5|>=8.9,<8.9.3", "wp-cli/wp-cli": ">=0.12,<2.5", "wp-graphql/wp-graphql": "<=1.14.5", "wp-premium/gravityforms": "<2.4.21", "wpanel/wpanel4-cms": "<=4.3.1", "wpcloud/wp-stateless": "<3.2", "wpglobus/wpglobus": "<=1.9.6", - "wwbn/avideo": "<=12.4", + "wwbn/avideo": "<14.3", "xataface/xataface": "<3", "xpressengine/xpressengine": "<3.0.15", "yab/quarx": "<2.4.5", @@ -1864,7 +1892,7 @@ "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": "<1.1.29", - "yiisoft/yii2": "<2.0.38", + "yiisoft/yii2": "<2.0.49.4-dev", "yiisoft/yii2-authclient": "<2.2.15", "yiisoft/yii2-bootstrap": "<2.0.4", "yiisoft/yii2-dev": "<2.0.43", @@ -1891,7 +1919,7 @@ "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3", "zendframework/zend-mail": "<2.4.11|>=2.5,<2.7.2", "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1", - "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4", + "zendframework/zend-session": ">=2,<2.2.9|>=2.3,<2.3.4", "zendframework/zend-validator": ">=2.3,<2.3.6", "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1", "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6", @@ -1949,7 +1977,7 @@ "type": "tidelift" } ], - "time": "2024-04-26T17:04:41+00:00" + "time": "2024-08-28T08:05:44+00:00" }, { "name": "sebastian/cli-parser", From 9d42fc3a11d91a676f0538f2b16700e0c016743b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 28 Aug 2024 12:37:52 +0200 Subject: [PATCH 3/3] fix: Adapt pdf service to new field api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Service/PdfService.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Service/PdfService.php b/lib/Service/PdfService.php index 0e7a1d9cb3..261cfc2cfd 100644 --- a/lib/Service/PdfService.php +++ b/lib/Service/PdfService.php @@ -9,7 +9,7 @@ use mikehaertl\pdftk\Pdf; use OCP\Files\Node; -use OCP\Files\Template\Field; +use OCP\Files\Template\FieldFactory; use OCP\Files\Template\FieldType; use Psr\Log\LoggerInterface; @@ -34,12 +34,14 @@ public function extractFields(Node $file): array { continue; } - $templateFields[] = new Field( + $templateField = FieldFactory::createField( (string)$index, - $field['FieldValue'], $fieldType, - alias: $field['FieldName'], ); + $templateField->setValue($field['FieldValue']); + $templateField->alias = $field['FieldName']; + + $templateFields[] = $templateField; $index++; } return $templateFields;