Skip to content

Commit

Permalink
Merge branch 'release/2.7.0' into master-sw65
Browse files Browse the repository at this point in the history
  • Loading branch information
thijsMemoICT committed Aug 21, 2024
2 parents ce14b85 + 217b06a commit 7fbdaae
Show file tree
Hide file tree
Showing 58 changed files with 8,105 additions and 7,326 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ build/*
!build/build-zip.sh
vendor/
.idea
.reports

12 changes: 12 additions & 0 deletions .php_cs.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

return PhpCsFixer\Config::create()
->setUsingCache(false)
->setRules([
'array_syntax' => ['syntax' => 'short'],
'ordered_imports' => true,
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude([])
->in(__DIR__ . '/src'));
12 changes: 6 additions & 6 deletions phpstan.neon → .phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
parameters:
level: 4

bootstrapFiles:
- %currentWorkingDirectory%/vendor/autoload.php
paths:
- %currentWorkingDirectory%/custom/plugins/ErgonodeIntegrationShopware/src

- ./src
ignoreErrors:
- '#apcu_#'
- '#ioncube_#'
- '#opcache_#'
- '#imagettftext#'
- '#class Redis#'
- '#Constant STARTTIME#'

reportUnmatchedIgnoredErrors: false
tipsOfTheDay: false
treatPhpDocTypesAsCertain: false

services:
- class: Ergonode\IntegrationShopware\Tests\PHPStan\Rules\StrictTypeRule
tags:
- phpstan.rules.rule
23 changes: 0 additions & 23 deletions Jenkinsfile

This file was deleted.

19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,27 @@ removed. This means that all mappings will be lost and next synchronization will

### Testing

In Shopware root run:
In plugin root you can use the make commando and then the test you want to perform:

`php /var/www/html/vendor/phpunit/phpunit/phpunit --configuration /var/www/html/custom/plugins/ErgonodeIntegrationShopware/phpunit.xml`
`make phpstan`
`make phpunit`
`make phpmd`

### Building ZIP

To build Store package execute:

`bash <PLUGIN_DIR>/build/build-zip.sh`
`make release`

NOTE: The script uses absolute paths. It does not matter in which directory it is executed.
NOTE: The make file is used from the plugin root.

### Cache

In order to cache Ergonode GQL API requests you need to change the parameter `ergonode_integration.use_gql_cache`
in `src/Resources/config/parameters.yml` to `true` and
use `Ergonode\IntegrationShopware\Api\Client\ErgonodeGqlClientInterface` in your
classes instead of concrete `Ergonode\IntegrationShopware\Api\Client\ErgonodeGqlClient` class. Cached client class is
`Ergonode\IntegrationShopware\Api\Client\CachedErgonodeGqlClient`.
`Ergonode\IntegrationShopware\Api\Client\CachedErgonodeGqlClient`.

More cache config options can be found in
`src/Resources/config/packages/cache.yml`.
Expand All @@ -111,3 +113,10 @@ In order to clear cache pool run `bin/console cache:pool:clear ergonode_gql_requ
Available cache pools:
- ergonode_gql_request_cache
- ergonode_attribute_mapping_cache

## Plugin version compatibility
| Shopware | Plugin |
|------------------|-------------|
| 6.6 from 6.6.0.0 | Version 3.x |
| 6.5 from 6.5.0.0 | Version 2.x |
| 6.4 from 6.4.0.0 | Version 1.x |
51 changes: 0 additions & 51 deletions build/build-zip.sh

This file was deleted.

10 changes: 0 additions & 10 deletions build/composer-dist/composer.json

This file was deleted.

Loading

0 comments on commit 7fbdaae

Please sign in to comment.