Patch 2 #1
Open
Patch 2 #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix: remove pimcore headers for external requests * Update bundles/AdminBundle/Resources/public/js/pimcore/helpers.js * Fix: use vanilla JS * Fix: extend helper * Rename function * Fix: Code Smell --------- Co-authored-by: Sebastian Blank <blank@data-factory.net>
…ore#15738) * Update Imagick.php Fixing problem "Imagick::compositeImage(): Argument pimcore#3 ($x) must be of type int, float given". It appears when creating thumbnail template with "Add Overlay (Imagick)" and "Origin: center" * Update lib/Image/Adapter/Imagick.php Co-authored-by: Jacob Dreesen <jacob@hdreesen.de> --------- Co-authored-by: Bohdan Fil <37467703+djbodya@users.noreply.github.com> Co-authored-by: Bernhard Rusch <brusch@users.noreply.github.com> Co-authored-by: Jacob Dreesen <jacob@hdreesen.de>
Correct type in "Event API and Event Manger"
Correct type in "Event API and Event Manger" (cherry picked from commit 4b94038)
…array (pimcore#15702) * Fix: Cannot assign null to property Areablock::$currentIndex of type array * Make $blockStarted nullable
…make it explicit.
# Conflicts: # models/DataObject/ClassDefinition/Data/BooleanSelect.php # models/DataObject/ClassDefinition/Data/Slider.php # models/Document/Editable/Areablock.php
# Conflicts: # bundles/AdminBundle/Controller/Admin/WorkflowController.php # bundles/AdminBundle/Resources/config/security_services.yaml # bundles/AdminBundle/Resources/public/css/ext-modifications.css # bundles/AdminBundle/Resources/public/js/pimcore/functions.js # bundles/AdminBundle/Resources/public/js/pimcore/helpers.js # bundles/AdminBundle/Resources/public/js/pimcore/object/tags/geo/abstract.js # bundles/AdminBundle/Resources/public/js/pimcore/object/tags/geopoint.js # bundles/AdminBundle/Resources/public/js/pimcore/settings/targeting/conditions.js # bundles/AdminBundle/Security/Authenticator/AdminSessionAuthenticator.php # bundles/CoreBundle/DependencyInjection/ConfigurationHelper.php
…core#15735) * Fix Pimcore ignores the constant PIMCORE_CONFIGURATION_DIRECTORY - resolves pimcore#15534 * Fix Pimcore ignores the constant PIMCORE_CONFIGURATION_DIRECTORY - add bc layer * Docs changes
…re#15724) * fix document preview links * add some notes that * Update models/Document.php Co-authored-by: JiaJia Ji <kingjia90@gmail.com> --------- Co-authored-by: Divesh Pahuja <divesh.pahuja@pimcore.com>
) * disable cache when rebuilding classes, fix db being used to populate options when on cli * Apply phpdoc fixes from code review Co-authored-by: Sebastian Blank <blank@data-factory.net> * Apply suggestions from code review Co-authored-by: Sebastian Blank <blank@data-factory.net> * make init private, avoid the OR condition on inAdmin --------- Co-authored-by: Sebastian Blank <blank@data-factory.net>
- Change allowed method to POST
) * Fix: set invalid text * Update bundles/CoreBundle/Resources/translations/en.extended.json Co-authored-by: Sebastian Blank <blank@data-factory.net> * Update bundles/AdminBundle/Resources/public/js/pimcore/object/classes/data/datetime.js Co-authored-by: Sebastian Blank <blank@data-factory.net> --------- Co-authored-by: Sebastian Blank <blank@data-factory.net>
* Definitions: Set correct types for Pimcore 11 * Add migration * Fix: Index should be a bool * Fix test class * Fix php docs * Fix PhpDoc of Areablock::$currentIndex * Fix PhpDoc of Areablock::$blockStarted
* Fix: index attribute of Data should be a boolean * Fix wrong SAMPLE_USER_DATA
…or fields - resolves pimcore#15751
…core#16072) * [Elements]: Add '$params' parameter to ElementInterface::getById * [Elements]: Add commented '$params' parameter to ElementInterface::getById This is in preparation for Pimcore 12. * Apply php-cs-fixer changes * Apply php-cs-fixer changes Co-authored-by: Divesh Pahuja <divesh.pahuja@pimcore.com> --------- Co-authored-by: Brainshaker95 <Brainshaker95@users.noreply.github.com> Co-authored-by: Divesh Pahuja <divesh.pahuja@pimcore.com>
An error occures in the factory method, when
elseif (self::getDefaultPageType() != null) {
$type = self::getDefaultPageType();
}
is checked, but _defaultPageType is not initialized
…imcore#16025) * Extend allowedAttributes list in link editable by config * Fix Typo * Fix Typo * Update models/Document/Editable/Link.php Co-authored-by: robertSt7 <104770750+robertSt7@users.noreply.github.com> * Revert symfony config changes and remove the allowed list * Remove unused config * Make Sonar Cloud happy --------- Co-authored-by: robertSt7 <104770750+robertSt7@users.noreply.github.com>
…ore#16091) * Deprecate the property Pimcore\Navigation\Page::defaultPageType * Replace getter with the property
# Conflicts: # lib/Navigation/Page.php
Changed $data parameter type to mixed to match other getDataFor.. functions
* Class_exists autoloads classes if not explicitly set to false * Include interfaces/traits and remove class_exists Co-authored-by: cipribucur <ciprian.bucur@pimcore.com> --------- Co-authored-by: cipribucur <ciprian.bucur@pimcore.com>
* [Docs] Refactor v11.1 upgrade notes * Update doc/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md Co-authored-by: Manon Cassier <127942915+mcassier31@users.noreply.github.com> * Update doc/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md Co-authored-by: Manon Cassier <127942915+mcassier31@users.noreply.github.com> * Update doc/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md Co-authored-by: Manon Cassier <127942915+mcassier31@users.noreply.github.com> --------- Co-authored-by: robertSt7 <104770750+robertSt7@users.noreply.github.com> Co-authored-by: Manon Cassier <127942915+mcassier31@users.noreply.github.com>
* [HtmlSanitizer] Sanitize data only on save - related to pimcore#15740 * [HtmlSanitizer] Sanitize data only on save - related to pimcore#15740 * Review changes: sanitize translations only on html content * Review changes * Review changes * Update models/DataObject/ClassDefinition/Data/Wysiwyg.php Co-authored-by: Bernhard Rusch <brusch@users.noreply.github.com> --------- Co-authored-by: Bernhard Rusch <brusch@users.noreply.github.com>
# Conflicts: # doc/03_Documents/01_Editables/40_WYSIWYG.md # models/DataObject/ClassDefinition/Data/Select.php # models/Translation/Dao.php # tests/Model/DataObject/ObjectTest.php
aryaantony92
pushed a commit
that referenced
this pull request
Oct 19, 2023
* Update Video.php Pimcore\Model\Asset\Video::getThumbnailConfig(): Argument #1 ($config) must be of type Pimcore\Model\Asset\Video\Thumbnail\Config|string, null given, called in /var/www/html/vendor/pimcore/pimcore/models/Document/Editable/Video.php on line 492 File: /var/www/html/vendor/pimcore/pimcore/models/Asset/Video.php Line: 73 * Update Video.php strpos(): Argument #1 ($haystack) must be of type string, int given File: /var/www/html/vendor/pimcore/pimcore/models/Document/Editable/Video.php Line: 938 some values arent strings
aryaantony92
pushed a commit
that referenced
this pull request
Oct 19, 2023
…when uploading video (pimcore#15621) * Fix: Ceil():Argument #1 ($num) must be of type int|float, null given when uploading video * Fix wrong php doc. * move ceil to getDurationString() * Remove unnecessary int cast * Make getDurationString non static
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes in this pull request
Resolves #
Additional info