Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ezsystems/ezrecommendation-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.7
Choose a base ref
...
head repository: ezsystems/ezrecommendation-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.1
Choose a head ref

Commits on Nov 19, 2021

  1. Copy the full SHA
    7963fe8 View commit details

Commits on Dec 3, 2021

  1. Fixed errors reported by phpstan (#94)

    * Fixed errors reported by phpstan
    
    * Used Symfony\Component\Security\Core\Security in UserHelper
    ciastektk authored Dec 3, 2021
    Copy the full SHA
    37a8d52 View commit details

Commits on Dec 13, 2021

  1. Bumped PHP requirement

    konradoboza committed Dec 13, 2021
    Copy the full SHA
    6412147 View commit details

Commits on Dec 14, 2021

  1. IBX-1448: Prevented sending login when customer_id is empty (#93)

    * IBX-1448: Prevented sent login when customer_id is empty
    
    * moved to a new function get customerId, created test coverage
    
    * corrected phpstan
    
    * corrected phpstan
    
    * corrected phpstan, removed null return
    
    * moved getParameters to functions, changed phpdoc for Logger, corrected test and PHPStan
    
    * Added hasParameter before getParameter, cast to int for customerId, changed arguments in getNotificationUri function, adjust tests
    
    * Added check if siteAccess is not null, corrected phpStan
    
    * changed conditional to check $currentSiteAccess is null
    
    * moved RECOMMENDATION_SESSION_KEY to variable
    
    * Added arguments for $siteAccessService in LoginListener
    
    * Returned null if customerId is null
    
    * Corrected CS
    mateuszdebinski authored Dec 14, 2021
    Copy the full SHA
    6f05bfd View commit details

Commits on Jan 5, 2022

  1. adjusted CI

    konradoboza committed Jan 5, 2022
    Copy the full SHA
    6a80d05 View commit details
  2. adjusted dependencies

    konradoboza committed Jan 5, 2022
    Copy the full SHA
    92d58db View commit details

Commits on Jan 10, 2022

  1. fixed PHPStan errors

    konradoboza committed Jan 10, 2022
    Copy the full SHA
    d98356d View commit details
  2. cr remarks

    konradoboza committed Jan 10, 2022
    Copy the full SHA
    50f6746 View commit details
  3. Merge pull request #95 from ezsystems/bump-php-req

    Bumped PHP requirement
    adamwojs authored Jan 10, 2022
    Copy the full SHA
    cc5b18d View commit details

Commits on Jan 17, 2022

  1. [CI] Removed Travis (#96)

    mnocon authored Jan 17, 2022
    Copy the full SHA
    5fe4df5 View commit details

Commits on Jan 18, 2022

  1. Copy the full SHA
    4493467 View commit details
  2. Merge pull request #97 from ezsystems/fixed-get-parent-location-path-…

    …string
    
    IBX-1972: Fixed get parent location path string
    ciastektk authored Jan 18, 2022
    Copy the full SHA
    164c122 View commit details
  3. Copy the full SHA
    246fd5a View commit details
  4. Merge pull request #98 from ezsystems/ibx-1972-refactored-location-he…

    …lper
    
    IBX-1972: Refactored LocationHelper::getParentLocationPathString
    ciastektk authored Jan 18, 2022
    Copy the full SHA
    b7ccb43 View commit details

Commits on Feb 1, 2022

  1. Copy the full SHA
    77d4a6f View commit details

Commits on Feb 2, 2022

  1. Merge pull request #100 from ezsystems/1.1

    Upmerge from 1.1 branch
    ibexa-yuna authored Feb 2, 2022
    Copy the full SHA
    e491b3d View commit details

Commits on Feb 15, 2022

  1. Copy the full SHA
    aaef250 View commit details
  2. IBX-2306: Dropped useless code (#102)

    * Dropped ContentTypeController
    
    * Dropped run export action
    ciastektk authored Feb 15, 2022
    Copy the full SHA
    a94d9c5 View commit details

Commits on Feb 17, 2022

  1. IBX-2324: Added configuration parameter and RepositoryConfigResolver …

    …to allow use content remote id (#103)
    
    * Added repository.content.use_remote_id parameter
    
    * Added Ibexa\Personalization namespace
    
    * Added RepositoryConfigResolver
    
    * Update src/bundle/DependencyInjection/ConfigurationMapper.php
    
    Co-authored-by: Konrad Oboza <konrad.oboza@ez.no>
    
    Co-authored-by: Konrad Oboza <konrad.oboza@ez.no>
    ciastektk and Konrad Oboza authored Feb 17, 2022
    Copy the full SHA
    7ceee63 View commit details
  2. IBX-2330: Added usage remoteId in user tracker (#104)

    * Added repository.content.use_remote_id parameter
    
    * Added Ibexa\Personalization namespace
    
    * Added RepositoryConfigResolver
    
    * Update src/bundle/DependencyInjection/ConfigurationMapper.php
    
    Co-authored-by: Konrad Oboza <konrad.oboza@ez.no>
    
    * IBX-2330: Added usage remoteId in user tracker
    
    https://issues.ibexa.co/browse/IBX-2330
    
    Co-authored-by: Konrad Oboza <konrad.oboza@ez.no>
    ciastektk and Konrad Oboza authored Feb 17, 2022
    Copy the full SHA
    41d6c0a View commit details
  3. IBX-2332: Added remoteId support in RecommendationEventSubscriber to …

    …fetch recommendations (#105)
    
    * Added repository.content.use_remote_id parameter
    
    * Added Ibexa\Personalization namespace
    
    * Added RepositoryConfigResolver
    
    * Update src/bundle/DependencyInjection/ConfigurationMapper.php
    
    Co-authored-by: Konrad Oboza <konrad.oboza@ez.no>
    
    * IBX-2332: Added remoteId support in RecommendationEventSubscriber to fetch recommendations
    
    https://issues.ibexa.co/browse/IBX-2332
    
    Co-authored-by: Konrad Oboza <konrad.oboza@ez.no>
    ciastektk and Konrad Oboza authored Feb 17, 2022
    Copy the full SHA
    ee85d79 View commit details
  4. IBX-2334: Added remoteId support in export and update processes (#106)

    * Moved Export and Content Controllers to REST directory
    
    * Fixed download export file route
    
    * Added remoteId support for updated content url
    
    * Added remoteId support in export
    
    * Dropped useless ListParamConverter
    
    * Added ContentQueryType
    
    * Dropped useless property
    
    * Added usage of LoggerAwareInterface in ContentHelper
    
    * Removed redundand phpdoc
    
    * Added methods to get query based on remoteId or numeric id
    
    * Renamed methods to retrieve a query
    ciastektk authored Feb 17, 2022
    Copy the full SHA
    8e44b7b View commit details

Commits on Feb 18, 2022

  1. Copy the full SHA
    b9f4b72 View commit details

Commits on Mar 16, 2022

  1. Copy the full SHA
    3f7b2ff View commit details

Commits on Apr 28, 2022

  1. Copy the full SHA
    5ef4262 View commit details

Commits on May 5, 2022

  1. [CI] Removed secrets (#110)

    mnocon authored May 5, 2022
    Copy the full SHA
    717b37c View commit details

Commits on Dec 8, 2022

  1. IBX-4469: Fixed add content based parameters to request (#111)

    * Add content based parameters to request when contextItems is passed
    
    * Bumped phpstan version
    
    * Fixed errors reported by phpstan
    
    * Fixed cs
    ciastektk authored Dec 8, 2022
    Copy the full SHA
    6b0ef31 View commit details

Commits on May 16, 2023

  1. IBX-2597: Removing first Pesonalized block from page builder editor r…

    …emoves both previews (#113)
    
    * IBX-2597: Removing first Pesonalized block from page builder editor removes both previews
    
    * order of uses
    
    * [Composer] Added symfony/webpack-encore-bundle dependency
    
    * [PHPStan] Fixed phpstan errors
    
    * Changed visibilty of  property in Reco controller
    
    * Added calling reset second time
    
    ---------
    
    Co-authored-by: Tomasz Kryszan <tomasz.kryszan@ez.no>
    GrabowskiM and ciastektk authored May 16, 2023
    Copy the full SHA
    99498fa View commit details

Commits on May 18, 2023

  1. Copy the full SHA
    a74064f View commit details

Commits on Jun 6, 2024

  1. IBX-8357: Fixed item export (#115)

    * IBX-8357: Fixed item export
    
    * fix phpstan
    
    * Apply suggested change
    reithor authored Jun 6, 2024
    Copy the full SHA
    9637aed View commit details

Commits on Jun 7, 2024

  1. IBX-8019: Replaced LocationService::loadLocationChildren usages with …

    …`SearchService::findLocations` (#114)
    
    * IBX-8019: Replaced `LocationService::loadLocationChildren` usages with `SearchService::findLocations`
    
    * IBX-8019: Fixed LocationEventSubscriberTest to actually check NotificationService::sendNotification calls
    
    * IBX-8019: Fixed codestyle
    
    * IBX-8019: Added missing dependencies to TrashEventSubscriber
    
    * IBX-8019: Fixed TrashEventSubscriberTest to actually test EventNotificationService::sendNotification calls
    
    * IBX-8019: Aligned unit tests and PHPStan
    
    * IBX-8019: Used static PHPUnit invocations
    
    * IBX-8019: Used union instead of intersection types on MockObjects
    
    * IBX-8019: Regenerated PHPStan baseline
    webhdx authored Jun 7, 2024
    Copy the full SHA
    2516953 View commit details
Showing with 1,548 additions and 1,632 deletions.
  1. +27 −12 .github/workflows/ci.yml
  2. +10 −0 .github/workflows/pr-assign.yaml
  3. +13 −0 .github/workflows/release.yaml
  4. +0 −46 .github/workflows/release.yml
  5. +0 −44 .travis.yml
  6. +19 −14 composer.json
  7. +214 −474 phpstan-baseline.neon
  8. +5 −1 phpstan.neon
  9. +0 −106 src/bundle/Controller/ContentController.php
  10. +0 −152 src/bundle/Controller/ContentTypeController.php
  11. +110 −0 src/bundle/Controller/REST/ContentController.php
  12. +2 −44 src/bundle/Controller/{ → REST}/ExportController.php
  13. +19 −18 src/bundle/Controller/RecommendationController.php
  14. +11 −1 src/bundle/DependencyInjection/Configuration.php
  15. +8 −0 src/bundle/DependencyInjection/ConfigurationMapper.php
  16. +0 −54 src/bundle/ParamConverter/ExportRequestParamConverter.php
  17. +0 −52 src/bundle/ParamConverter/ListParamConverter.php
  18. +2 −0 src/bundle/Resources/config/default_settings.yaml
  19. +13 −16 src/bundle/Resources/config/routing_rest.yaml
  20. +2 −2 src/bundle/Resources/config/services.yaml
  21. +16 −0 src/bundle/Resources/config/services/config.yaml
  22. +5 −6 src/bundle/Resources/config/services/controllers.yaml
  23. +0 −16 src/bundle/Resources/config/services/converters.yaml
  24. +0 −8 src/bundle/Resources/config/services/credentials_checker.yaml
  25. +2 −0 src/bundle/Resources/config/services/events.yaml
  26. +9 −0 src/bundle/Resources/config/services/query_types.yaml
  27. +1 −1 src/bundle/Serializer/Normalizer/UserCollectionNormalizer.php
  28. +1 −1 src/bundle/Serializer/Normalizer/UserNormalizer.php
  29. +0 −22 src/bundle/Templating/Twig/Functions/AbstractFunction.php
  30. +58 −34 src/bundle/Templating/Twig/Functions/UserTracking.php
  31. +7 −2 src/lib/Authentication/ExportAuthenticator.php
  32. +1 −6 src/lib/Client/EzRecommendationClient.php
  33. +45 −0 src/lib/Config/Repository/RepositoryConfigResolver.php
  34. +17 −0 src/lib/Config/Repository/RepositoryConfigResolverInterface.php
  35. +79 −31 src/lib/Event/Listener/LoginListener.php
  36. +38 −5 src/lib/Event/Subscriber/AbstractRepositoryEventSubscriber.php
  37. +4 −8 src/lib/Event/Subscriber/LocationEventSubscriber.php
  38. +38 −29 src/lib/Event/Subscriber/RecommendationEventSubscriber.php
  39. +5 −1 src/lib/Event/Subscriber/RecommendationRandomContentEventSubscriber.php
  40. +13 −1 src/lib/Event/Subscriber/TrashEventSubscriber.php
  41. +17 −0 src/lib/Exception/BadAPIEndpointParameterException.php
  42. +1 −1 src/lib/Exporter/Exporter.php
  43. +11 −1 src/lib/Factory/EzRecommendationClientAPIFactory.php
  44. +2 −2 src/lib/Field/Value.php
  45. +41 −20 src/lib/Helper/ContentHelper.php
  46. +7 −55 src/lib/Helper/ContentTypeHelper.php
  47. +2 −24 src/lib/Helper/LocationHelper.php
  48. +17 −24 src/lib/Helper/UserHelper.php
  49. +0 −107 src/lib/Mapper/ExportRequestMapper.php
  50. +94 −0 src/lib/QueryType/ContentQueryType.php
  51. +1 −1 src/lib/SPI/Request.php
  52. +41 −10 src/lib/Service/ContentService.php
  53. +1 −1 src/lib/Service/EventNotificationService.php
  54. +0 −20 src/lib/Value/ExportRequest.php
  55. +72 −0 tests/lib/Config/Repository/RepositoryConfigResolverTest.php
  56. +61 −12 tests/lib/Event/Listener/LoginListenerTest.php
  57. +4 −4 tests/lib/Event/Subscriber/AbstractCoreEventSubscriberTest.php
  58. +12 −2 tests/lib/Event/Subscriber/AbstractRepositoryEventSubscriberTest.php
  59. +261 −112 tests/lib/Event/Subscriber/LocationEventSubscriberTest.php
  60. +100 −28 tests/lib/Event/Subscriber/TrashEventSubscriberTest.php
  61. +9 −1 tests/lib/Service/EventNotificationServiceTest.php
39 changes: 27 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -6,6 +6,31 @@ on:
pull_request:

jobs:
cs-fix:
name: Run code style check
runs-on: "ubuntu-20.04"
strategy:
matrix:
php:
- '8.0'
steps:
- uses: actions/checkout@v2

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
extensions: 'pdo_sqlite, gd'
tools: cs2pr

- uses: "ramsey/composer-install@v1"
with:
dependency-versions: "highest"

- name: Run code style check
run: composer run-script check-cs -- --format=checkstyle | cs2pr

tests:
name: Tests
runs-on: "ubuntu-20.04"
@@ -15,6 +40,8 @@ jobs:
php:
- '7.3'
- '7.4'
- '8.0'
- '8.1'

steps:
- uses: actions/checkout@v2
@@ -27,22 +54,10 @@ jobs:
extensions: pdo_sqlite, gd, zip
tools: cs2pr

- name: Add composer keys for private packagist
run: |
composer config http-basic.updates.ibexa.co $SATIS_NETWORK_KEY $SATIS_NETWORK_TOKEN
composer config github-oauth.github.com $TRAVIS_GITHUB_TOKEN
env:
SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}
SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}
TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }}

- uses: "ramsey/composer-install@v1"
with:
dependency-versions: "highest"
composer-options: "--prefer-dist --no-progress --no-suggest"

- name: Run PHPStan analysis
run: composer run-script phpstan

- name: Run code style check
run: composer run-script check-cs -- --format=checkstyle | cs2pr
10 changes: 10 additions & 0 deletions .github/workflows/pr-assign.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Assign Pull Request to maintainers

on:
pull_request_target:

jobs:
assign:
uses: ibexa/gh-workflows/.github/workflows/pr-assign.yml@main
secrets:
robot-token: ${{ secrets.EZROBOT_PAT }}
13 changes: 13 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Call Automatic Changelog Generator for tag Workflow

on:
push:
tags:
- 'v*'
- '!v*-alpha*'

jobs:
create_release_for_tag:
uses: ibexa/gh-workflows/.github/workflows/release_bundle.yml@main
secrets:
JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
46 changes: 0 additions & 46 deletions .github/workflows/release.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .travis.yml

This file was deleted.

33 changes: 19 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
@@ -10,36 +10,40 @@
}
],
"require": {
"php": "^7.3",
"ezsystems/ezplatform-kernel": "^1.0@dev",
"ezsystems/ezplatform-rest": "^1.0@dev",
"ezsystems/ezplatform-richtext": "^2.0@dev",
"ezsystems/ezplatform-content-forms": "^1.0@dev",
"ext-json": "*",
"php": "^7.3 || ^8.0",
"ezsystems/doctrine-dbal-schema": "^1.0@dev",
"ezsystems/ezplatform-content-forms": "^1.3@dev",
"ezsystems/ezplatform-kernel": "^1.3@dev",
"ezsystems/ezplatform-rest": "^1.0@dev",
"ezsystems/ezplatform-richtext": "^2.3@dev",
"guzzlehttp/guzzle": "~6.0",
"ramsey/uuid": "^3.9",
"symfony/framework-bundle": "^5.0",
"symfony/twig-bundle": "^5.0",
"guzzlehttp/guzzle": "~6.0",
"webmozart/assert": "^1.0",
"ramsey/uuid": "^3.9"
"symfony/webpack-encore-bundle": "^1.8",
"webmozart/assert": "^1.0"
},
"require-dev": {
"dg/bypass-finals": "^1.1",
"ezsystems/ezplatform-code-style": "^0.4",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^0.12.85",
"phpstan/phpstan-phpunit": "^0.12.18",
"ezsystems/ezplatform-http-cache": "^2.3@dev",
"phpstan/phpstan": "^1.2",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^8.5"
},
"autoload": {
"psr-4": {
"Ibexa\\Personalization\\": "src/lib/",
"EzSystems\\EzRecommendationClientBundle\\": "src/bundle/",
"EzSystems\\EzRecommendationClient\\": "src/lib/"
}
},
"autoload-dev": {
"psr-4": {
"EzSystems\\EzRecommendationClient\\Tests\\": "tests/lib/",
"Ibexa\\Tests\\PersonalizationClient\\": "tests/lib/"
"Ibexa\\Tests\\Personalization\\": "tests/lib/",
"EzSystems\\EzRecommendationClient\\Tests\\": "tests/lib/"
}
},
"scripts": {
@@ -54,6 +58,7 @@
}
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": false
}
}
Loading