Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JMS] allow v5 #2493

Merged
merged 6 commits into from
May 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ jobs:
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
jms: [ ^4.0, ^5.0 ]
dependencies: [ highest ]
exclude:
- php: 8.1
dependencies: lowest

services:
database:
Expand All @@ -55,7 +53,7 @@ jobs:
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}, JMS ${{ matrix.jms }}"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -85,17 +83,19 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: jms/serializer-bundle
run: composer require "jms/serializer-bundle:${{ matrix.jms }}" --no-update --no-scripts

- name: pimcore/pimcore
run: composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update

- if: matrix.dependencies == 'highest'
name: Install dependencies highest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader
run: composer update --no-progress --prefer-dist --optimize-autoloader

- if: matrix.dependencies == 'lowest'
name: Install dependencies lowest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
run: composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest

- name: Cache clear
run: bin/console cache:clear
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/behat_ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
jms: [ ^4.0, ^5.0 ]
dependencies: [ highest ]
exclude:
- php: 8.1
Expand All @@ -52,8 +53,7 @@ jobs:
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}, JMS ${{ matrix.jms }}"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -84,17 +84,19 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: jms/serializer-bundle
run: composer require "jms/serializer-bundle:${{ matrix.jms }}" --no-update --no-scripts

- name: pimcore/pimcore
run: composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update

- if: matrix.dependencies == 'highest'
name: Install dependencies highest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader
run: composer update --no-progress --prefer-dist --optimize-autoloader

- if: matrix.dependencies == 'lowest'
name: Install dependencies lowest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
run: composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest

- name: Cache clear
run: bin/console cache:clear
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/packages_bundles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ jobs:
pimcore: [ ~11.1.0, ~11.2.0 ]
dependencies: [ highest ]
package: "${{ fromJson(needs.list.outputs.packages) }}"
exclude:
- php: 8.1
dependencies: lowest

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -73,20 +70,22 @@ jobs:
run: composer validate --ansi --strict
working-directory: "src/CoreShop/${{ matrix.package }}"

- name: pimcore/pimcore
run: composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/CoreShop/${{ matrix.package }}"

- if: matrix.dependencies == 'highest'
name: Install dependencies highest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader
run: composer update --no-progress --prefer-dist --optimize-autoloader
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/CoreShop/${{ matrix.package }}"

- if: matrix.dependencies == 'lowest'
name: Install dependencies lowest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
run: composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/CoreShop/${{ matrix.package }}"
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/packages_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ jobs:
pimcore: [ ~11.1.0, ~11.2.0 ]
dependencies: [ highest ]
package: "${{ fromJson(needs.list.outputs.packages) }}"
exclude:
- php: 8.1
dependencies: lowest

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -73,20 +70,22 @@ jobs:
run: composer validate --ansi --strict
working-directory: "src/CoreShop/${{ matrix.package }}"

- name: pimcore/pimcore
run: composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/CoreShop/${{ matrix.package }}"

- if: matrix.dependencies == 'highest'
name: Install dependencies highest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader
run: composer update --no-progress --prefer-dist --optimize-autoloader
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/CoreShop/${{ matrix.package }}"

- if: matrix.dependencies == 'lowest'
name: Install dependencies lowest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
run: composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
env:
COMPOSER_ROOT_VERSION: dev-master
working-directory: "src/CoreShop/${{ matrix.package }}"
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,8 @@ jobs:
matrix:
php: [ 8.1, 8.2 ]
pimcore: [ ~11.1.0, ~11.2.0 ]
jms: [ ^4.0, ^5.0 ]
dependencies: [ highest ]
exclude:
- php: 8.1
dependencies: lowest

services:
database:
image: "mysql:8"
Expand All @@ -42,8 +39,7 @@ jobs:
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}, JMS ${{ matrix.jms }}"

steps:
- uses: actions/checkout@v4
Expand All @@ -69,17 +65,19 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: jms/serializer-bundle
run: composer require "jms/serializer-bundle:${{ matrix.jms }}" --no-update --no-scripts

- name: pimcore/pimcore
run: composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update

- if: matrix.dependencies == 'highest'
name: Install dependencies highest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader
run: composer update --no-progress --prefer-dist --optimize-autoloader

- if: matrix.dependencies == 'lowest'
name: Install dependencies lowest
run: |
composer req pimcore/pimcore:${{ matrix.pimcore }} --no-interaction --no-scripts --no-update
composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest
run: composer update --no-progress --prefer-dist --optimize-autoloader --prefer-lowest

- name: Validate YAML
run: bin/console lint:yaml src
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,5 @@ docs/build
docs/node_modules
docs/.docusaurus
node_modules
docker-compose.override.yaml
cache/
docker-compose.override.yaml
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"doctrine/orm": "^2.9",
"fakerphp/faker": "^1.16",
"gedmo/doctrine-extensions": "^3.11",
"jms/serializer-bundle": "^4.0",
"jms/serializer-bundle": "^4.0 | ^5.0",
"knplabs/knp-menu-bundle": "^3.1",
"laminas/laminas-stdlib": "^3.6",
"laminas/laminas-zendframework-bridge": "^1.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ CoreShop\Component\Customer\Model\Customer:
exclusion_policy: ALL
xml_root_name: customer
virtual_properties:
id:
serialized_name: id
exp: object.getId()
type: string
groups: [Detailed]
salutation:
serialized_name: salutation
exp: object.getSalutation()
Expand Down Expand Up @@ -37,4 +42,9 @@ CoreShop\Component\Customer\Model\Customer:
exp: object.getCustomerGroups()
type: array
groups: [Detailed]
creationDate:
serialized_name: creationDate
exp: object.getCreationDate()
type: int
groups: [Detailed]

Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,22 @@ services:
- '@translator'

CoreShop\Bundle\ResourceBundle\Serialization\Driver\PimcoreDataObjectDriver:
decorates: 'jms_serializer.metadata.annotation_driver'
decorates: 'jms_serializer.metadata_driver'
arguments:
- '@CoreShop\Bundle\ResourceBundle\Serialization\Driver\PimcoreDataObjectDriver.inner'

CoreShop\Bundle\ResourceBundle\EventListener\DeepCopySubscriber:
tags:
- { name: kernel.event_subscriber }

coreshop.jms_serializer.object_constructor:
class: JMS\Serializer\Construction\UnserializeObjectConstructor

CoreShop\Bundle\ResourceBundle\Serialization\VersionObjectConstructor:
decorates: 'jms_serializer.object_constructor'
arguments:
- '@CoreShop\Bundle\ResourceBundle\Serialization\VersionObjectConstructor.inner'
- '@jms_serializer.unserialize_object_constructor'
- '@coreshop.jms_serializer.object_constructor'

CoreShop\Component\Resource\Service\FolderCreationServiceInterface: '@CoreShop\Component\Resource\Service\FolderCreationService'
CoreShop\Component\Resource\Service\FolderCreationService:
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ResourceBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"require": {
"doctrine/orm": "^2.9",
"doctrine/doctrine-bundle": "^2.4",
"jms/serializer-bundle": "^4.0",
"jms/serializer-bundle": "^4.0 | ^5.0",
"stof/doctrine-extensions-bundle": "^1.6",
"coreshop/pimcore-bundle": "^4.0",
"coreshop/locale-bundle": "^4.0",
Expand Down