Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
571 commits
Select commit Hold shift + click to select a range
a13eb99
Restructed workflows
bluvulture Sep 13, 2024
c1ed3a0
Revert "Extended example usage (#17587)"
bluvulture Sep 13, 2024
658d9ca
Merge pull request #17586 from pimcore/composer_checks
bluvulture Sep 13, 2024
29d0142
[Bug] Fix mandatory check geopoint (#17607)
mattamon Sep 13, 2024
38d3131
Added secrets inherit
bluvulture Sep 13, 2024
e3bbf12
Revert "[BUG-15513] Wrong logic with image thumbnail when using Focal…
kingjia90 Sep 13, 2024
da36989
[Task]: Insert right autoload path in testing docs (#17603)
sl0wlydeadly Sep 13, 2024
c0a812e
Added monthly minor outdated check
bluvulture Sep 13, 2024
3d8735d
Update composer-checks-outdated-monthly.yaml
bluvulture Sep 16, 2024
2ffdb40
Merge pull request #17608 from pimcore/composer_checks_update
bluvulture Sep 16, 2024
29db084
Deprecate key_value_table.html.twig (#17614)
markus-moser Sep 16, 2024
67819dd
[Improvement]: Added grid preview for field collections (#17510)
fashxp Sep 18, 2024
84e5a66
Merge remote-tracking branch 'origin/11.3' into 11.x
kingjia90 Sep 18, 2024
e1def14
Update composer-checks-vulnerabilities.yaml
bluvulture Sep 18, 2024
867600b
[Bug]: Typecast value passed to `str_starts_with` to `string` (#17250)
AlternateIf Sep 19, 2024
16a601a
[Bug] Maintenance email logger filter_priority uses null as default v…
lukmzig Sep 20, 2024
8b1dd69
Merge branch '11.3' into 11.x
lukmzig Sep 20, 2024
ef202e1
Migration to rebuild classes was renamed and updated (#17636)
DanielLaranjeira063 Sep 20, 2024
44cdb3a
PhpStan Version Upgrade September (#17658)
kingjia90 Sep 26, 2024
37fa329
[Improvement]: Add Tests to confirm the pimcore_placeholder compatibi…
michalananapps Sep 26, 2024
a8d6054
Add target resolution to redirect model (#16901)
dweiss96 Sep 27, 2024
8d2a2cf
[Docs] Add upgrade notes for twig deprecations (#17662)
markus-moser Sep 30, 2024
0503a3a
Update license to make a list out of the last three links
mattamon Sep 17, 2024
4ae37aa
Merge remote-tracking branch 'origin/11.3' into 11.x
mattamon Oct 1, 2024
5d8434c
Update sync-changes-scheduled.yml
herbertroth Oct 2, 2024
b91c14f
[Task]: Fix the minor branch usages (#17671)
kingjia90 Oct 2, 2024
9613a2e
Merge remote-tracking branch 'origin/11.4' into 11.x
kingjia90 Oct 2, 2024
21b4dcb
Merge branch '11.x' into vulnerabilities_ignore_list
bluvulture Oct 2, 2024
f277df7
Merge pull request #17637 from pimcore/vulnerabilities_ignore_list
bluvulture Oct 2, 2024
4701af3
[Task]: Fix composer .x-dev alias (#17672)
kingjia90 Oct 2, 2024
ba7cd09
[Task]: Change external links from http to https (#17674)
kingjia90 Oct 3, 2024
6a40b74
Merge remote-tracking branch 'origin/11.4' into 11.x
kingjia90 Oct 3, 2024
f0245d7
[Docs]: Add mention of getCount() method in Document PHP API Document…
hethehe Oct 3, 2024
40d5554
[Docs] improve classification store example (#17678)
fashxp Oct 3, 2024
84d9f9f
Fix fallback mechanism for ICU translations (#17057)
dolmit-tanel-paaro Oct 4, 2024
51752cb
Fix Task setCid and setCtype methods (#17660)
mhgtlc Oct 4, 2024
15080bb
Merge remote-tracking branch 'origin/11.4' into 11.x
kingjia90 Oct 4, 2024
8a843a1
[Bug, EC]: Visual mandatory flag on Classification Store group when a…
kingjia90 Oct 8, 2024
0a3bd0d
[Bug]: Fix domain name validation (#17685)
kingjia90 Oct 8, 2024
1d1c3e1
[Bug]: Fix Site Additional domain validation issues (#17698)
kingjia90 Oct 8, 2024
f0620ff
[Bugfix] Fix typo in @param phpdoc (#17708)
dennzo Oct 10, 2024
3ec9bd3
Update composer.json
kingjia90 Oct 11, 2024
2c42dd3
Revert accidental change
kingjia90 Oct 11, 2024
56f8f15
[Readme] Add instructions for multiple applications on same domain (#…
Oct 11, 2024
4c3a006
[Bug]: Fix type error in NumericRange constructor when using decimals
Brainshaker95 Oct 17, 2024
d8da787
Fix duplicate relations on event listeners save (#17408)
cuca24 Oct 18, 2024
159fe18
Fix: Invalid site domain validation for domains with umlauts (ä, ö, ü…
blankse Oct 18, 2024
c9984f9
[Docs]: Remove version constraint of league/flysystem-aws-s3-v3 (#17739)
cngJo Oct 21, 2024
02298c3
[Events] Add Deprecation to remove context from ResolveUploadTargetEv…
martineiber Oct 21, 2024
5046f03
[Bug]: Fix QuantityRangeValue validation failed on empty field (#17743)
kingjia90 Oct 21, 2024
66c2bcd
QuantityValueRange: Call to a member function getMinimum() on null (#…
blankse Oct 21, 2024
fec1c09
[Improvement]: Add `versionCount` index to element and versions table…
kingjia90 Oct 22, 2024
814b698
[Bug]: copyRecursive fails on copying a folder with emails (#17758)
lukmzig Oct 23, 2024
eca112d
[Bug]: Fix unique constraint issue when updating advanced many-to-man…
kingjia90 Oct 25, 2024
e9dda3b
[Docs] Improve TinyMCE bundle documentation (#17709)
podarcis Oct 25, 2024
35b0536
[Bug]: Merge conflict mistake in Installer mark_migrations_as_done (#…
kingjia90 Oct 25, 2024
60a58bd
[Task]: PhpStan Version Upgrade October (#17779)
kingjia90 Oct 28, 2024
ab4ec3f
fix: layout can be null (#17780)
lukmzig Oct 28, 2024
322366f
Merge branch '11.4' into 11.x
lukmzig Oct 28, 2024
f488445
[Bug,EC] Video Editable HTML Output ampersand (#17787)
kingjia90 Oct 30, 2024
a0b78a4
[Bug]: Fix `php: ../../magick/exception.c:1121: ThrowMagickExceptionL…
kingjia90 Oct 30, 2024
4bdfaa0
Revert native type changes in navigation container (#17048)
GALPR Oct 31, 2024
3db8e53
Update 01_Image_Thumbnails.md
DanielLaranjeira063 Oct 15, 2024
7dc5d68
Update PageSnippet to respect pretty url if site is using
BlackbitDevs Nov 5, 2024
4ca9bac
[Bug]: Fix classification store group table type with no width issue …
kingjia90 Nov 6, 2024
221b605
[Improvement]: Add common search interface (#17789)
lukmzig Nov 7, 2024
08493c7
Introduce new block syntax (#17792)
martineiber Nov 7, 2024
ca36ce3
getUrl() should return pretty url for Page documents which have a pre…
Nov 7, 2024
f03d291
[Docs]: Fix link about Cron Job to right paragraph (#17806)
kingjia90 Nov 7, 2024
a46de00
Optimize Asset Document ImageThumbnail generation
dpfaffenbauer Nov 4, 2024
89d5fe7
[Bug]: Error from Migrations - call on null $this->container (#17804)
kingjia90 Nov 8, 2024
518a14d
Image processing: possibility to configure the image adapter (#17807)
brusch Nov 13, 2024
1617198
Add brickprefix to avoid ambiguity (#17815)
mattamon Nov 14, 2024
5856c3a
fix block syntax (#17832)
fashxp Nov 14, 2024
b37f036
Fix: Documents are not copied completely (#17805)
blankse Nov 15, 2024
d76a5ac
Add fix for phpredis BC break by using a newer symfony cache version …
alexz707 Nov 15, 2024
ee9bc5b
Merge remote-tracking branch 'origin/11.4' into 11.x
alexz707 Nov 15, 2024
1e2991a
PhpStan Version Upgrade November (#17802)
kingjia90 Nov 17, 2024
bec5106
Index for workspaces permission list (#17834)
mattamon Nov 18, 2024
ba5b5bc
Revert "Index for workspaces permission list (#17834)" (#17844)
kingjia90 Nov 18, 2024
9a7827c
[Bug] Get values must be static (#17714)
mattamon Nov 19, 2024
c3beefe
[Bug] Missing dependencies for Generic execution engine bundle (#17829)
mattamon Nov 19, 2024
072e65c
Merge remote-tracking branch 'upstream/11.x' into pretty-url-for-site
Nov 20, 2024
dc192f2
Fix getDefaultValue example (#17848)
blankse Nov 21, 2024
7e9a8a9
[Task]: Followup #17344, replace index name with columns (#17856)
kingjia90 Nov 21, 2024
b9468c5
Improvement index for workspaces permission list (#17847)
mattamon Nov 22, 2024
e55b9c0
Impovement #17696 Upgrade dependencies where possible without BC brea…
michalananapps Nov 22, 2024
982c81b
Fix return type on getDataForQueryResource for CalculatedValue (#17762)
cancan101 Nov 22, 2024
1baab2d
fix: add `id` attribute to valid elements (#17817)
rubanooo Nov 22, 2024
b55d3a4
Scheduled deletion events are moved to the recycle bin, editors do no…
R-O-BIN Nov 22, 2024
e9b6fc0
[Improvement]: Added possibility to configure which metadata to be us…
kingjia90 Nov 26, 2024
f86a396
[Doc]: Improve docs about config location button being grayed out (#1…
kingjia90 Nov 26, 2024
a9d6eb3
[Improvement]: Add checks for setting QuantityValue values and units …
kingjia90 Nov 28, 2024
50db514
[Docs]: Add upgrade note about `QuantityValue` invalid unit (#17876)
kingjia90 Nov 28, 2024
789f26f
[Improvement]: Upgrade dependencies (#17864)
kingjia90 Nov 29, 2024
b0b17d4
[Improvement]: Replace Request::get with explicit input sources (#17873)
kingjia90 Dec 2, 2024
528ceb9
Fix error on update in upsert with missing primaryKey "auto_id" (#17133)
Kayphonie Dec 2, 2024
679e2f2
Merge remote-tracking branch 'origin/11.4' into 11.x
kingjia90 Dec 2, 2024
1b6a562
Improvement: Add elements to html_sanitizer (#17849)
robertSt7 Dec 3, 2024
b6768a1
[Task]: Deprecate TinyMCE (#17884)
robertSt7 Dec 3, 2024
11cefcd
Fixing regression caused by #17873 in TemplateResolver (#17892)
brusch Dec 4, 2024
3020392
Add new branch to sync.
herbertroth Dec 5, 2024
3872839
ElementListener: Fix variable variable "$$versionId" (#17907)
blankse Dec 9, 2024
a3c4cde
Fix: EncryptedField getDataForGrid return typehint is defined as arra…
blankse Dec 10, 2024
15a79fa
Merge remote-tracking branch 'origin/11.4' into 11.x
robertSt7 Dec 10, 2024
baf54a3
TinyMCE Bundle shouldn't be a recommended bundle anymore (#17895)
brusch Dec 10, 2024
b8f7406
Merge remote-tracking branch 'origin/11.4' into 11.5
kingjia90 Dec 10, 2024
fcedfd3
Merge remote-tracking branch 'origin/11.5' into 11.x
kingjia90 Dec 10, 2024
6440882
[Doc] Fix: Multiple Pimcore 11.5 Upgrade Notes (#17911)
blankse Dec 10, 2024
800a367
Remove excess `*` from PHPDoc (#17903)
jdreesen Dec 10, 2024
3189ee9
Fix cleanup bricks and fieldcollections tables task (#17891)
matthiashamacher Dec 12, 2024
d717baf
Fix: change sorting column from `path` to `key` to ensure correct ord…
peterheider Dec 13, 2024
954424b
Update sync-changes-scheduled.yml
herbertroth Dec 16, 2024
6ee99d5
Update sync-changes-scheduled.yml
herbertroth Dec 16, 2024
6fa6aeb
[Bug]: Frontend::getSiteIdForDocument returns wrong id / wrong docume…
simon-matt-oetztal Dec 17, 2024
31aae7b
[Bug]: Frontend::getSiteIdForDocument returns wrong id / wrong docume…
simon-matt-oetztal Nov 27, 2024
78a015d
Merge remote-tracking branch 'origin/11.4' into 11.5
alexz707 Dec 17, 2024
125ddde
Merge remote-tracking branch 'origin/11.5' into 11.x
alexz707 Dec 17, 2024
3b1b770
Update sync-changes-scheduled.yml
alexz707 Dec 17, 2024
daf48c4
Update sync-changes-scheduled.yml sync of 11.4 completed
alexz707 Dec 17, 2024
539fb72
Switch sync to latest version.
herbertroth Dec 17, 2024
f729700
use 11.5 for sync temporary.
herbertroth Dec 17, 2024
25c7931
Video Editable: Passing an invalid allowedTypes config should throw a…
blankse Dec 18, 2024
a76e414
add mimetype to list of system types. (#17941)
cancan101 Dec 20, 2024
92aa27f
Task: switch from 11.4 to 11.5
robertSt7 Dec 20, 2024
17d8964
fix implicit float to int conversion on image crop (#17946)
JakobBruening Jan 7, 2025
72c34ad
PhpStan Version Upgrade December (#17960)
kingjia90 Jan 7, 2025
4f2bbcc
[Bug]: "Preview not available: PDF is being scanned" after update to …
robertSt7 Jan 8, 2025
b8c7f34
"safer" json_decode (#17921)
kingjia90 Jan 8, 2025
c7f1481
Update pull-request-checklist.yaml
robertSt7 Jan 8, 2025
5e2d588
Merge remote-tracking branch 'origin/11.5' into 11.x
robertSt7 Jan 8, 2025
93f5823
add row-level lock for object data query
solverat Oct 30, 2024
b8004c9
[Asset] Rollback files on failure (#17850)
brusch Jan 10, 2025
cf380cd
Update sync-changes-scheduled.yml
herbertroth Jan 14, 2025
7a232e6
Update composer-checks-vulnerabilities.yaml
herbertroth Jan 14, 2025
bf1081a
Update composer-checks-outdated.yaml
herbertroth Jan 14, 2025
081e73f
Update composer-checks-outdated-monthly.yaml
herbertroth Jan 14, 2025
a3c7544
Update pull-request-checklist.yaml
herbertroth Jan 14, 2025
7861514
Set php 8.3 as min.
herbertroth Jan 14, 2025
15bd4f0
Update static analysis to 8.3 and 8.4
herbertroth Jan 14, 2025
276b779
Update composer.json
herbertroth Jan 14, 2025
627a5c1
Fix deprecated implicitly nullable via default value null.
herbertroth Jan 15, 2025
7a50d23
Update stale.yaml
herbertroth Jan 15, 2025
5bf18b8
Merge pull request #17982 from pimcore/update-php-min-version
herbertroth Jan 15, 2025
5e054a7
fix deprecations (#17985)
alexz707 Jan 15, 2025
f5f4721
update composer checks to 8.4 (#17991)
alexz707 Jan 16, 2025
2439722
temporary fix doctrine migrations (#17996)
alexz707 Jan 17, 2025
c492fab
Merge remote-tracking branch 'origin/11.5' into 12.x
alexz707 Jan 17, 2025
6c72686
add conflicts (#18005)
alexz707 Jan 21, 2025
3c6946c
Merge remote-tracking branch 'origin/11.5' into 12.x
alexz707 Jan 21, 2025
14e0f2a
PhpStan Version Upgrade January (#18006)
kingjia90 Jan 21, 2025
8462b49
Update stale.yaml
bluvulture Jan 22, 2025
d67add7
Merge pull request #18009 from pimcore/stale_fix
bluvulture Jan 22, 2025
ca25fd2
Remove unused qrcode lib from composer.
herbertroth Jan 24, 2025
8069dbf
Merge pull request #18018 from pimcore/remove-qr-code-from-composer
herbertroth Jan 24, 2025
1d46997
Fix typos in WYSIWYG docs (#18015)
m0nken Jan 24, 2025
81875a9
[Bug]: DataObject\AbstractObject reads doHideUnpublished from Documen…
kingjia90 Jan 27, 2025
b02925d
Bugfix: Undefined array key for Block field (#18023)
alicjanez Jan 27, 2025
cbd654b
[Bug]: NotificationService is wrongly marked as internal (#18020)
kingjia90 Jan 28, 2025
a382624
[Asset] Document conversion adapters: fixed temp file path and some o…
brusch Jan 28, 2025
14b20e6
support pretty url for document which belong to a site
Jan 28, 2025
2f62f3a
support pretty url for document which belong to a site
Jan 28, 2025
daabc0a
[Task] Adding studio-preview-parameter to get preview from version (#…
mattamon Jan 29, 2025
e421936
Apply php-cs-fixer changes
mattamon Jan 29, 2025
63dbbb3
Simplify detection of lcms delegate in Imagick. (#17939)
cancan101 Jan 30, 2025
022248b
support pretty url for document which belong to a site
Feb 4, 2025
13318d0
Fix: Custom reports fail to load on dashboard (#18055)
blankse Feb 5, 2025
b8114c3
Fix: wordcount plugin (#18062)
robertSt7 Feb 5, 2025
a04c669
Check if group config exists (#18069)
torqdev Feb 7, 2025
bb5d416
Apply php-cs-fixer changes
kingjia90 Feb 7, 2025
a35a6dd
[Bug]: CSV Export tweaks (#18033)
kingjia90 Feb 10, 2025
f20a124
[Task]: Update protected asset doc to cover cache buster urls (#18074)
kingjia90 Feb 10, 2025
019ab11
[Bug] Inheritance returns object references for getters (#18073)
mcop1 Feb 11, 2025
6e128e4
Added is_array check (#18082)
mcop1 Feb 12, 2025
b440ea2
Merge remote-tracking branch 'origin/11.5' into 12.x
mcop1 Feb 12, 2025
5ed0299
[Docs] Removed tbd page from docs (#18086)
brusch Feb 12, 2025
fc0549b
Changed runner to ubuntu-latest
bluvulture Feb 12, 2025
a5fa469
Changed runner to ubuntu-22.04
bluvulture Feb 12, 2025
a279c03
Merge pull request #18087 from pimcore/codeception_update
bluvulture Feb 12, 2025
4ca9b3f
Extract TinymceBundle into it's own package (#18077)
robertSt7 Feb 13, 2025
723c1ed
Fixed ExtJS chart warning in console - resovles https://github.com/pi…
brusch Feb 13, 2025
4a889de
add nesbot/carbon to composer, adapt to new version (#18050)
alexz707 Feb 13, 2025
6e1089a
Apply php-cs-fixer changes
alexz707 Feb 13, 2025
e7293d4
[Bug] Add object as fallback if no version is available (#18083)
mattamon Feb 13, 2025
5100a45
Added Inspire Banner
fashxp Feb 14, 2025
d57a38a
Modify conflicts for doctrine-migrations-bundle
herbertroth Feb 17, 2025
4c168cd
[Task] Remove the deprecated option to pass null to the `Pimcore\Mode…
mattamon Feb 17, 2025
d2a6862
[Task] Remove DataObject\Link - __unserialize (#18101)
mattamon Feb 17, 2025
d346650
Remove getThumbnailConfig (#18102)
mattamon Feb 17, 2025
a96f8c9
Remove deprecated class (#18103)
mattamon Feb 17, 2025
16b3282
[Task] Remove the deprecated method Tool::getCachedSymfonyEnvironment…
mattamon Feb 17, 2025
5bdcdb7
Remove deprecated property $_defaultPageType (#18105)
mattamon Feb 17, 2025
b05f3c2
[Task] AbstractPimcoreBundle: remove deprecations and BC layer (#18106)
mattamon Feb 17, 2025
475b377
Removed deprecated option generator (#18108)
mattamon Feb 17, 2025
c9d7ef0
[Mail] Do not set fallback from address (#18109)
mattamon Feb 17, 2025
aeffdb6
Remove template (#18114)
mattamon Feb 17, 2025
62b6913
[Task][Events] ResolveUploadTargetEvent remove context property. (#18…
mattamon Feb 18, 2025
45be0a6
Apply php-cs-fixer changes
mattamon Feb 18, 2025
0e1624f
[Task] Add deprecation message for return type ?object (#18112)
mattamon Feb 18, 2025
86562cb
Merge remote-tracking branch 'origin/11.5' into 12.x
mattamon Feb 18, 2025
cc02e32
[Task] Inconsistent Return Type of Workflow/Manager getWorkflowIfExis…
mattamon Feb 18, 2025
c5d282a
Apply php-cs-fixer changes
mattamon Feb 18, 2025
7bce190
Change installer sequence (#18045)
mattamon Feb 18, 2025
d8dc67c
Merge remote-tracking branch 'origin/11.5' into 12.x
mattamon Feb 18, 2025
d9850d7
Update major version (#18116)
mcop1 Feb 18, 2025
4eaff74
UrlSlug: Fix return/param types
blankse Feb 17, 2025
3fbc8a6
[Task]ElementInterface implementations should allow only int for $id …
mattamon Feb 18, 2025
7032a73
[Select Options] Admin only restriction (#17861)
kjkooistra-youwe Feb 18, 2025
c714f38
Remove pimcore 10 compatibility layer
mattamon Feb 18, 2025
e3bae63
Apply php-cs-fixer changes
mattamon Feb 18, 2025
449eb1b
Fix event size
mattamon Feb 19, 2025
a16a275
[Custom Reports] Option for deactivating column settings (#17546)
fashxp Feb 19, 2025
39bb2e7
Apply php-cs-fixer changes
robertSt7 Feb 19, 2025
c86be2f
[Docs]: Specify the difference between currentIndex and current in pi…
kingjia90 Feb 19, 2025
8ce5e6d
Update Docker image to PHP 8.3 in test environment
herbertroth Feb 20, 2025
1477e85
Phpstan upgrade February(#18130)
kingjia90 Feb 20, 2025
89586d0
[Bug]: Fix regression, `else` part is unreachable on validlanguages a…
kingjia90 Feb 20, 2025
685b1b2
[Improvement] Add LogLevel enum for easier handling of log priority f…
mcop1 Feb 21, 2025
969b417
Apply php-cs-fixer changes
mcop1 Feb 21, 2025
ee19f9c
[Improvement] Log level configuration for `ApplicationLogger` (#18133)
mcop1 Feb 21, 2025
b1666b8
Apply php-cs-fixer changes
mcop1 Feb 21, 2025
c27a252
[Bug]: Fix regression with expandGridColumnForExport (#18132)
kingjia90 Feb 24, 2025
110b51f
[Improvement] Translatable log levels (#18143)
mcop1 Feb 24, 2025
89a3bea
Apply php-cs-fixer changes
mcop1 Feb 24, 2025
ff50333
Fix: ManyToOneRelation with display mode "inline search" shows only o…
blankse Feb 24, 2025
0e71e15
Fix: When quantity value is removed data objects disappears (#18056)
blankse Feb 24, 2025
04d0c7f
[Task]: Remove Chromium (Headless) Support (#17795)
kingjia90 Feb 25, 2025
e48e2d3
Apply php-cs-fixer changes
kingjia90 Feb 25, 2025
d270235
[GenericExecutionEngine] Support environment variable replacement for…
fashxp Feb 25, 2025
ba36458
Fix PhpDocs (#18042)
blankse Feb 25, 2025
59a89fa
Merge remote-tracking branch 'origin/11.5' into 12.x
kingjia90 Feb 25, 2025
b76ecee
Merge remote-tracking branch 'origin/11.5' into 12.x
kingjia90 Feb 25, 2025
75ab1ac
fix dock block for getPreviewConfig method of PreviewGeneratorInterfa…
lukmzig Feb 26, 2025
dbb640c
Merge branch '11.5' into 12.x
lukmzig Feb 26, 2025
43c1912
[Task]: Require PHPStan v2.0 (#18034)
blankse Feb 26, 2025
c77809f
Apply php-cs-fixer changes
kingjia90 Feb 26, 2025
c721a42
[Task] [Data Objects] Password data-type: remove support for algorith…
mcop1 Feb 27, 2025
39721dd
Pass the transition itself into notification service rather than the …
cancan101 Mar 6, 2025
87e4d53
Apply php-cs-fixer changes
mattamon Mar 6, 2025
152440d
[Improvement] Consistently use symfony/mime to get MIME type of asset…
mcop1 Mar 6, 2025
efe5816
Apply php-cs-fixer changes
mcop1 Mar 6, 2025
17c13af
fix getById being not an int
fashxp Mar 6, 2025
0acdc0e
Revert "fix getById being not an int"
fashxp Mar 6, 2025
c005b19
[Improvement] adding result of gotenberg availability to cache (#17956)
Alanin Mar 10, 2025
404c9cb
Removed bc layer (#18182)
mcop1 Mar 10, 2025
ed6b9cc
PimcoreWordExportBundle bundle is export only (#18173)
cancan101 Mar 10, 2025
7d275e0
Added note for getVersionDependentDatabaseColumnName (#18189)
mcop1 Mar 11, 2025
637ec57
Update models/Document/PageSnippet.php
BlackbitDevs Apr 30, 2025
21951e1
Update models/Document/PageSnippet.php
BlackbitDevs Apr 30, 2025
e75bb7f
Merge remote-tracking branch 'origin/12.x' into pretty-url-for-site
Apr 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!--

Before working on a contribution, you must determine on which branch you need to work:
- Bug fix: choose the latest maintenance branch `11.2`
- Bug fix: choose the latest maintenance branch `11.5`
- Feature/Improvement: choose `11.x`

> All bug fixes merged into the latest maintenance branch are also merged to the current dev branch (`11.x`) on a regular basis.

## Please make sure your PR complies with all of the following points:
- [ ] Read and accept our [contributing guidelines](/CONTRIBUTING.md) before you submit a PR.
- [ ] Features need to be proper documented in `doc/`
- [ ] Bugfixes need a short guide how to reproduce them -> target branch is the oldest supported maintenance branch, e.g. `11.2` (see Readme.md for the list of supported versions)
- [ ] Bugfixes need a short guide how to reproduce them -> target branch is the oldest supported maintenance branch, e.g. `11.4` (see Readme.md for the list of supported versions)
- [ ] Meet all coding standards (see PhpStan actions)

**Don't submit a PR if it doesn't comply, it'll be closed without a comment!**
Expand Down
3 changes: 0 additions & 3 deletions .github/ci/files/config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,4 @@
"Pimcore\\Bundle\\ApplicationLoggerBundle\\PimcoreApplicationLoggerBundle" => [
"all" => TRUE
],
"Pimcore\\Bundle\\TinymceBundle\\PimcoreTinymceBundle" => [
"all" => TRUE
],
];
17 changes: 10 additions & 7 deletions .github/ci/files/config/packages/html_sanitizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ framework:
html_sanitizer:
sanitizers:
pimcore.wysiwyg_sanitizer:
max_input_length: -1
allow_attributes:
pimcore_type: '*'
pimcore_id: '*'
Expand All @@ -10,7 +11,7 @@ framework:
allow_elements:
span: [ 'class', 'style', 'id' ]
div: [ 'class', 'style', 'id' ]
p: [ 'class', 'style', 'id' ]
p: [ 'class', 'style', 'id', 'dir', 'data-cell' ]
strong: 'class'
em: 'class'
h1: [ 'class', 'id' ]
Expand All @@ -19,14 +20,15 @@ framework:
h4: [ 'class', 'id' ]
h5: [ 'class', 'id' ]
h6: [ 'class', 'id' ]
a: [ 'class', 'id', 'href', 'target', 'title', 'rel', 'style' ]
table: [ 'class', 'style', 'cellspacing', 'cellpadding', 'border', 'width', 'height', 'id' ]
colgroup: 'class'
col: [ 'class', 'style', 'id' ]
thead: [ 'class', 'id' ]
tbody: [ 'class', 'id' ]
tr: [ 'class', 'id' ]
td: [ 'class', 'id' ]
th: [ 'class', 'id', 'scope' ]
thead: [ 'class', 'id', 'style' ]
tbody: [ 'class', 'id', 'style' ]
tr: [ 'class', 'id', 'style', 'colspan', 'rowspan' ]
td: [ 'class', 'id', 'style', 'colspan', 'rowspan', 'data-row', 'width', 'height' ]
th: [ 'class', 'id', 'scope', 'style', 'colspan', 'rowspan', 'width', 'height' ]
ul: [ 'class', 'style', 'id' ]
li: [ 'class', 'style', 'id' ]
ol: [ 'class', 'style', 'id' ]
Expand All @@ -40,7 +42,8 @@ framework:
s: [ 'class', 'id' ]
iframe: [ 'frameborder', 'height', 'longdesc', 'name', 'sandbox', 'scrolling', 'src', 'title', 'width' ]
br: ''
img: [ 'alt', 'style', 'src' ]
img: [ 'class', 'alt', 'style', 'src' ]
hr: ''
pimcore.translation_sanitizer:
allow_attributes:
pimcore_type: '*'
Expand Down
3 changes: 2 additions & 1 deletion .github/ci/files/public/index_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use Symfony\Component\Debug\Debug;
use Symfony\Component\HttpFoundation\Request;

include __DIR__ . "/../vendor/autoload_runtime.php";
include __DIR__ . "/../vendor/autoload.php";

define('PIMCORE_PROJECT_ROOT', __DIR__ . '/..');
define('APP_ENV', 'test');
Expand All @@ -43,3 +43,4 @@
$response->send();

$kernel->terminate($request, $response);

3 changes: 2 additions & 1 deletion .github/ci/scripts/symfony-require-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ composer require --no-update \
symfony/security-core:${SYMFONY_VERSION} \
symfony/security-http:${SYMFONY_VERSION} \
symfony/serializer:${SYMFONY_VERSION} \
symfony/string:${SYMFONY_VERSION} \
symfony/templating:${SYMFONY_VERSION} \
symfony/translation:${SYMFONY_VERSION} \
symfony/twig-bridge:${SYMFONY_VERSION} \
Expand All @@ -45,4 +46,4 @@ composer require --no-update \
symfony/var-dumper:${SYMFONY_VERSION} \
symfony/web-profiler-bundle:${SYMFONY_VERSION} \
symfony/workflow:${SYMFONY_VERSION} \
symfony/yaml:${SYMFONY_VERSION}
symfony/yaml:${SYMFONY_VERSION}
14 changes: 14 additions & 0 deletions .github/workflows/cla-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: CLA check

on:
issue_comment:
types: [created]
pull_request_target:
types: [opened, closed, synchronize]

jobs:
cla-workflow:
uses: pimcore/workflows-collection-public/.github/workflows/reusable-cla-check.yaml@v1.3.0
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
secrets:
CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}
11 changes: 4 additions & 7 deletions .github/workflows/codeception.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name: "Codeception Tests"

on:
workflow_dispatch:
schedule:
- cron: '0 3 * * *'
pull_request:
Expand Down Expand Up @@ -35,19 +36,15 @@ permissions:
jobs:
codeception-tests:
name: "Codeception tests"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
include:
- { php-version: 8.3, database: "mariadb:11.2", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.3, database: "mariadb:10.3", dependencies: lowest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.2, database: "mariadb:10.5", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: true, storage: local, symfony: "6.4.x-dev", composer-options: "" }
- { php-version: 8.1, database: "mariadb:10.7", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.1, database: "mysql:8.0", dependencies: lowest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.1, database: "percona:8.0", dependencies: lowest, experimental: false, storage: minio, symfony: "", composer-options: "" }
- { php-version: 8.4, database: "mariadb:10.5", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
- { php-version: 8.4, database: "mariadb:10.11", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }

services:
minio:
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/composer-checks-outdated-monthly.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: "Composer outdated check - monthly minor check"

on:
workflow_dispatch:
schedule:
- cron: '0 7 1 * *'

permissions:
contents: read

jobs:
composer-checks:
uses: pimcore/workflows-collection-public/.github/workflows/reusable-composer-checks.yaml@main
strategy:
fail-fast: false
matrix:
include:
- { php-version: 8.4, branch: 12.x }
- { php-version: 8.3, branch: 11.5 }
with:
php-version: ${{ matrix.php-version }}
branch: ${{ matrix.branch }}
ignore-list: "public"
version-type: "-m"
secrets: inherit
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

name: "Composer Audit & Outdated"
name: "Composer outdated check"

on:
workflow_dispatch:
schedule:
- cron: '0 7 * * 5'

permissions:
contents: read
Expand All @@ -14,8 +15,10 @@ jobs:
fail-fast: false
matrix:
include:
- { php-version: 8.1, branch: 10.6 }
- { php-version: 8.2, branch: 11.x }
- { php-version: 8.4, branch: 12.x }
- { php-version: 8.3, branch: 11.5 }
with:
php-version: ${{ matrix.php-version }}
branch: ${{ matrix.branch }}
ignore-list: "public"
secrets: inherit
25 changes: 25 additions & 0 deletions .github/workflows/composer-checks-vulnerabilities.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: "Composer vulnerabilities check"

on:
workflow_dispatch:
schedule:
- cron: '0 7 * * *'

permissions:
contents: read

jobs:
composer-checks:
uses: pimcore/workflows-collection-public/.github/workflows/reusable-composer-vulnerabilities.yaml@main
strategy:
fail-fast: false
matrix:
include:
- { php-version: 8.4, branch: 12.x }
- { php-version: 8.3, branch: 11.5 }
with:
php-version: ${{ matrix.php-version }}
branch: ${{ matrix.branch == 'default' && github.event.repository.default_branch || matrix.branch }}
private-repo: ${{ github.event.repository.private }}
ignore-list: "public"
secrets: inherit
25 changes: 0 additions & 25 deletions .github/workflows/lts-repo-sync.yaml

This file was deleted.

26 changes: 9 additions & 17 deletions .github/workflows/php-cs-fixer.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: "PHP-CS-Fixer"

on:
Expand All @@ -8,21 +7,14 @@ on:
- "[0-9]+.x"

permissions:
contents: read
contents: write

jobs:
php-cs-fixer:
permissions:
contents: write # for stefanzweifel/git-auto-commit-action to push code in repo
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}

- name: PHP-CS-Fixer
uses: docker://oskarstark/php-cs-fixer-ga:latest

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply php-cs-fixer changes
php-style:
uses: pimcore/workflows-collection-public/.github/workflows/reusable-php-cs-fixer.yaml@main
secrets:
PHP_CS_FIXER_GITHUB_TOKEN: ${{ secrets.PHP_CS_FIXER_GITHUB_TOKEN }}
with:
head_ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
config_file: .php-cs-fixer.dist.php
5 changes: 2 additions & 3 deletions .github/workflows/pull-request-checklist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
env:
MESSAGE: |
### Review Checklist
- [ ] Target branch (`11.2` for bug fixes, others `11.x`)
- [ ] Target branch (`11.5` for bug fixes, others `12.x`)
- [ ] Tests (if it's testable code, there should be a test for it - [get help](https://pimcore.com/docs/pimcore/current/Development_Documentation/Development_Tools_and_Details/Testing/Core_Tests.html))
- [ ] Docs (every functionality needs to be documented, [see here](https://github.com/pimcore/pimcore/tree/11.x/doc))
- [ ] Docs (every functionality needs to be documented, [see here](https://github.com/pimcore/pimcore/tree/12.x/doc))
- [ ] [Migration](https://pimcore.com/docs/pimcore/current/Development_Documentation/Development_Tools_and_Details/Migrations.html) incl. `install.sql` (e.g. if the database schema changes, ...)
- [ ] Upgrade notes (deprecations, important information, migration hints, ...)
- [ ] Label
Expand All @@ -32,4 +32,3 @@ jobs:
repo: context.repo.repo,
body: `${MESSAGE}`
})

35 changes: 3 additions & 32 deletions .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,8 @@ on:

permissions:
contents: read
issues: write

jobs:
stale:
permissions:
issues: write
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
days-before-issue-stale: 20
days-before-issue-close: -1
days-before-pr-stale: -1
days-before-pr-close: -1
exempt-all-milestones: true
exempt-issue-labels: 'Pimcore:Priority,Pimcore:Backlog,Pimcore:ToDo'
remove-stale-when-updated: false
stale-issue-label: 'PR Welcome'
operations-per-run: 200
stale-issue-message: >
Thanks a lot for reporting the issue.
We did not consider the issue as "Pimcore:Priority", "Pimcore:ToDo" or "Pimcore:Backlog",
so we're not going to work on that anytime soon.
Please create a pull request to fix the issue if this is a bug report.
We'll then review it as quickly as possible.
If you're interested in contributing a feature, please contact us
first here before creating a pull request. We'll then decide whether
we'd accept it or not.
Thanks for your understanding.
close-issue-message: >
Closed due to inactivity (365 days).
Please feel free to continue the discussion or provide the missing information on this issue,
we'll then reopen it if necessary.
Thanks a lot!

call-stale-workflow:
uses: pimcore/workflows-collection-public/.github/workflows/stale.yml@main
9 changes: 3 additions & 6 deletions .github/workflows/static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ jobs:
include:
- { php-version: "8.3", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.3", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.2", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.2", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.2", dependencies: "highest", experimental: true, symfony: "6.4.x-dev", composer-options: "" }
- { php-version: "8.1", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.1", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.4", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
- { php-version: "8.4", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }

steps:
- name: "Checkout code"
Expand Down Expand Up @@ -88,7 +85,7 @@ jobs:

- name: "Upload baseline file"
if: ${{ failure() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: phpstan-baseline.neon
path: phpstan-baseline.neon
6 changes: 3 additions & 3 deletions .github/workflows/sync-changes-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:

jobs:
sync-branches:
uses: pimcore/workflows-collection-public/.github/workflows/reusable-sync-changes.yaml@v1.0.0
uses: pimcore/workflows-collection-public/.github/workflows/reusable-sync-changes.yaml@main
if: github.repository == 'pimcore/pimcore'
strategy:
fail-fast: false
matrix:
ref: [{'base': '11.x', 'destination': '11.x'}, {'base': '11.2', 'destination': '11.2'}]
ref: [{'base': '12.x', 'destination': '12.x'}, {'base': '11.5', 'destination': '11.5'}]
with:
base_ref: ${{ matrix.ref.base }}
ref_name: ${{ matrix.ref.destination }}
Expand All @@ -20,4 +20,4 @@ jobs:
secrets:
SYNC_TOKEN: ${{ secrets.SYNC_TOKEN }}
GIT_NAME: ${{ secrets.GIT_NAME }}
GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
Loading