From 97777ff11cc8a38825778eaa5d80025be0f605d7 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Fri, 8 Nov 2024 13:36:00 +0100 Subject: [PATCH 1/6] [Shop] Adjust changed in Sylius Twig Hooks --- .../config/app/twig_hooks/shop/order/summary.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Resources/config/app/twig_hooks/shop/order/summary.yaml b/src/Resources/config/app/twig_hooks/shop/order/summary.yaml index 831fa607..eea19a29 100644 --- a/src/Resources/config/app/twig_hooks/shop/order/summary.yaml +++ b/src/Resources/config/app/twig_hooks/shop/order/summary.yaml @@ -1,18 +1,18 @@ sylius_twig_hooks: hooks: - 'sylius_shop.account.order.show.content.summary': + 'sylius_shop.account.order.show.content.main.summary': invoices: component: 'sylius_invoicing:invoice:list' props: order: '@=_context.order' priority: 350 - 'sylius_shop.account.order.show.content.summary.invoices': + 'sylius_shop.account.order.show.content.main.summary.invoices': card: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card.html.twig' priority: 0 - 'sylius_shop.account.order.show.content.summary.invoices.card': + 'sylius_shop.account.order.show.content.main.summary.invoices.card': head: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/head.html.twig' priority: 100 @@ -20,12 +20,12 @@ sylius_twig_hooks: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body.html.twig' priority: 0 - 'sylius_shop.account.order.show.content.summary.invoices.card.body': + 'sylius_shop.account.order.show.content.main.summary.invoices.card.body': table: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body/table.html.twig' priority: 0 - 'sylius_shop.account.order.show.content.summary.invoices.card.body.table': + 'sylius_shop.account.order.show.content.main.summary.invoices.card.body.table': head: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body/table/head.html.twig' priority: 100 @@ -33,7 +33,7 @@ sylius_twig_hooks: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body/table/body.html.twig' priority: 0 - 'sylius_shop.account.order.show.content.summary.invoices.card.body.table.head': + 'sylius_shop.account.order.show.content.main.summary.invoices.card.body.table.head': number: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body/table/head/number.html.twig' priority: 200 @@ -44,7 +44,7 @@ sylius_twig_hooks: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body/table/head/actions.html.twig' priority: 0 - 'sylius_shop.account.order.show.content.summary.invoices.card.body.table.body': + 'sylius_shop.account.order.show.content.main.summary.invoices.card.body.table.body': number: template: '@SyliusInvoicingPlugin/shop/order/show/content/summary/invoices/card/body/table/body/number.html.twig' priority: 200 From ba77d35915a4b188a611919df3feedb405a23d9a Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Fri, 8 Nov 2024 13:49:58 +0100 Subject: [PATCH 2/6] [Composer] Bump dependencies --- composer.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index a66d97a7..0533d628 100644 --- a/composer.json +++ b/composer.json @@ -6,10 +6,10 @@ "license": "MIT", "require": { "php": "^8.2", - "knplabs/knp-snappy-bundle": "^1.8", - "ramsey/uuid": "^3.9 || ^4.0", - "sylius/grid-bundle": "^1.9", - "sylius/resource-bundle": "^1.9", + "knplabs/knp-snappy-bundle": "^1.10", + "ramsey/uuid": "^4.7", + "sylius/grid-bundle": "^1.13", + "sylius/resource-bundle": "^1.12", "sylius/sylius": "2.0.x-dev", "sylius/twig-hooks": "^0.5", "symfony/clock": "^6.4 || ^7.1", @@ -25,34 +25,34 @@ "symfony/routing": "^6.4 || ^7.1" }, "require-dev": { - "behat/behat": "^3.6.1", + "behat/behat": "^3.14", "dmore/behat-chrome-extension": "^1.4", "dmore/chrome-mink-driver": "^2.9", - "friends-of-behat/exclude-specifications-extension": "^0.2 || ^0.3", - "friends-of-behat/mink": "^1.8", - "friends-of-behat/mink-browserkit-driver": "^1.4", - "friends-of-behat/mink-debug-extension": "^2.0", - "friends-of-behat/mink-extension": "^2.4", + "friends-of-behat/exclude-specifications-extension": "^0.3", + "friends-of-behat/mink": "^1.11", + "friends-of-behat/mink-browserkit-driver": "^1.6", + "friends-of-behat/mink-debug-extension": "^2.1", + "friends-of-behat/mink-extension": "^2.7", "friends-of-behat/page-object-extension": "^0.3", - "friends-of-behat/suite-settings-extension": "^1.0", - "friends-of-behat/symfony-extension": "^2.1", - "friends-of-behat/variadic-extension": "^1.3", + "friends-of-behat/suite-settings-extension": "^1.1", + "friends-of-behat/symfony-extension": "^2.6", + "friends-of-behat/variadic-extension": "^1.6", "matthiasnoback/symfony-config-test": "^5.1", - "matthiasnoback/symfony-dependency-injection-test": "^5.0", - "phpspec/phpspec": "^7.2", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-doctrine": "^1.3", - "phpstan/phpstan-symfony": "^1.2", + "matthiasnoback/symfony-dependency-injection-test": "^5.1", + "phpspec/phpspec": "^7.5", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^1.12", + "phpstan/phpstan-doctrine": "^1.5", + "phpstan/phpstan-symfony": "^1.4", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "sylius-labs/coding-standard": "^4.2", + "sylius-labs/coding-standard": "^4.4", "symfony/browser-kit": "^6.4 || ^7.1", "symfony/debug-bundle": "^6.4 || ^7.1", "symfony/dotenv": "^6.4 || ^7.1", "symfony/intl": "^6.4 || ^7.1", - "symfony/webpack-encore-bundle": "^2.1", + "symfony/webpack-encore-bundle": "^2.2", "symfony/web-profiler-bundle": "^6.4 || ^7.1" }, "autoload": { From a8097308bfabc06dfa5d4a0c334e64f50f67ad3e Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Fri, 8 Nov 2024 13:56:46 +0100 Subject: [PATCH 3/6] [CI] Update build configuration --- .github/workflows/{build.yml => build.yaml} | 8 -------- 1 file changed, 8 deletions(-) rename .github/workflows/{build.yml => build.yaml} (95%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yaml similarity index 95% rename from .github/workflows/build.yml rename to .github/workflows/build.yaml index dbef781b..7758e76a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yaml @@ -36,14 +36,6 @@ jobs: mysql: "8.4" wkhtmltopdf: "0.12.6-1" state_machine_adapter: "winzou_state_machine" - - - php: "8.3" - symfony: "^7.1" - sylius: "2.0.x-dev" - node: "20.x" - mysql: "8.4" - wkhtmltopdf: false - state_machine_adapter: "winzou_state_machine" env: APP_ENV: test From ec1708142b0b16797eb58b326c5c21f911372f6a Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Mon, 18 Nov 2024 11:36:48 +0100 Subject: [PATCH 4/6] Clean up UPGRADE and CHANGELOG files --- CHANGELOG.md | 180 ------------------------------------------------- UPGRADE-2.0.md | 4 +- 2 files changed, 2 insertions(+), 182 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index af058332..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,180 +0,0 @@ -# CHANGELOG - -### v0.25.0 (2024-04-26) - -- [#300](https://github.com/Sylius/InvoicingPlugin/issues/300) [Maintenance] Remove wkhtmltopdf binary ([@coldic3](https://github.com/coldic3)) -- [#303](https://github.com/Sylius/InvoicingPlugin/issues/303) [Maintenance] PHP Attributes introduced ([@Rafikooo](https://github.com/Rafikooo)) -- [#304](https://github.com/Sylius/InvoicingPlugin/issues/304) [Maintenance] phpstan upgrade ([@Rafikooo](https://github.com/Rafikooo)) -- [#305](https://github.com/Sylius/InvoicingPlugin/issues/305) [Maintenance] Adjust Messenger env variables ([@GSadee](https://github.com/GSadee)) -- [#299](https://github.com/Sylius/InvoicingPlugin/issues/299) Loosen type check for user, to handle more types of users ([@j92](https://github.com/j92)) -- [#310](https://github.com/Sylius/InvoicingPlugin/issues/310) [Translation] Add missing German translations and update existing ones ([@shochdoerfer](https://github.com/shochdoerfer)) -- [#313](https://github.com/Sylius/InvoicingPlugin/issues/313) [Maintenance] Update copyrights ([@Wojdylak](https://github.com/Wojdylak)) -- [#312](https://github.com/Sylius/InvoicingPlugin/issues/312) Sylius 1.13 update ([@BartoszWojdalowicz](https://github.com/BartoszWojdalowicz)) -- [#314](https://github.com/Sylius/InvoicingPlugin/issues/314) [Maintenance] Enable symfony workflow tests ([@Wojdylak](https://github.com/Wojdylak)) -- [#308](https://github.com/Sylius/InvoicingPlugin/issues/308) [Admin][Translation] fix : use admin locale instead of invoice ([@BastienGoze](https://github.com/BastienGoze)) -- [#307](https://github.com/Sylius/InvoicingPlugin/issues/307) [Translation] fix french translation ([@BastienGoze](https://github.com/BastienGoze)) -- [#309](https://github.com/Sylius/InvoicingPlugin/issues/309) [PDF Template][Translation] Fix translation on pdf template ([@BastienGoze](https://github.com/BastienGoze)) -- [#316](https://github.com/Sylius/InvoicingPlugin/issues/316) Bump Sylius 1.13 to stable v1.13.0 version ([@GSadee](https://github.com/GSadee)) - -### v0.24.0 (2022-11-14) - -- [#290](https://github.com/Sylius/InvoicingPlugin/issues/290) Drop support for Sylius 1.10 ([@GSadee](https://github.com/GSadee)) -- [#291](https://github.com/Sylius/InvoicingPlugin/issues/291) [Behat][Invoice] Fix usage of method checking line items after last changes ([@GSadee](https://github.com/GSadee)) -- [#293](https://github.com/Sylius/InvoicingPlugin/issues/293) [Maintenance] Remove redundant configuration for not supported Sylius 1.10 ([@coldic3](https://github.com/coldic3)) -- [#295](https://github.com/Sylius/InvoicingPlugin/issues/295) [Maintenance] Drop support for Symfony 4.4 ([@coldic3](https://github.com/coldic3)) -- [#294](https://github.com/Sylius/InvoicingPlugin/issues/294) [Maintenance] Add support for Sylius 1.12 with Symfony 5.4 ([@coldic3](https://github.com/coldic3)) -- [#296](https://github.com/Sylius/InvoicingPlugin/issues/296) Add Symfony 6 support ([@coldic3](https://github.com/coldic3), [@GSadee](https://github.com/GSadee)) -- [#297](https://github.com/Sylius/InvoicingPlugin/issues/297) [Templates] Adjust to the new Sylius shop UI styles ([@coldic3](https://github.com/coldic3)) - -### v0.23.1 (2022-09-12) - -- [#291](https://github.com/Sylius/InvoicingPlugin/issues/291) [Behat][Invoice] Fix usage of method checking line items after last changes ([@GSadee](https://github.com/GSadee)) - -### v0.23.0 (2022-09-07) - -- [#282](https://github.com/Sylius/InvoicingPlugin/issues/282) Fix translation on pdf template ([@Orkin](https://github.com/Orkin)) -- [#284](https://github.com/Sylius/InvoicingPlugin/issues/284) Add directory purger before fixtures run ([@AdamKasp](https://github.com/AdamKasp)) -- [#285](https://github.com/Sylius/InvoicingPlugin/issues/285) [Maintenance] Allow flex plugin during plugin installation ([@lchrusciel](https://github.com/lchrusciel)) -- [#286](https://github.com/Sylius/InvoicingPlugin/issues/286) [Maintenance] Fix multi-environment .env files in test application ([@NoResponseMate](https://github.com/NoResponseMate)) -- [#287](https://github.com/Sylius/InvoicingPlugin/issues/287) Unit net price and discounted unit net price on the invoice ([@Rafikooo](https://github.com/Rafikooo), [@Zales0123](https://github.com/Zales0123)) -- [#207](https://github.com/Sylius/InvoicingPlugin/issues/207) Update console command definition to SF 4.4 standards ([@GSadee](https://github.com/GSadee)) -- [#289](https://github.com/Sylius/InvoicingPlugin/issues/289) Fix down method of migration that changes indexes ([@GSadee](https://github.com/GSadee)) - -### v0.22.0 (2022-04-27) - -- [#274](https://github.com/Sylius/InvoicingPlugin/issues/274) [Maintenance] Support PHP 8.1 ([@GSadee](https://github.com/GSadee)) -- [#275](https://github.com/Sylius/InvoicingPlugin/issues/275) [Maintenance] Add TwigToPdfGenerator ([@coldic3](https://github.com/coldic3)) -- [#277](https://github.com/Sylius/InvoicingPlugin/issues/277) [DependencyInjection] Move registering resources to prepend method ([@GSadee](https://github.com/GSadee)) -- [#278](https://github.com/Sylius/InvoicingPlugin/issues/278) Optional parameter to turn off the PDF generation ([@GSadee](https://github.com/GSadee)) -- [#279](https://github.com/Sylius/InvoicingPlugin/issues/279) [GitHub Actions] Include build with PDF generation disabled to the main workflow ([@GSadee](https://github.com/GSadee)) - -### v0.21.0 (2022-03-31) - -- [#271](https://github.com/Sylius/InvoicingPlugin/issues/271) [GitHub Actions] Configure workflow to run on the workflow_dispatch event ([@GSadee](https://github.com/GSadee)) -- [#272](https://github.com/Sylius/InvoicingPlugin/issues/272) Enable local file access in InvoicePdfFileGenerator ([@coldic3](https://github.com/coldic3)) - -### v0.20.0 (2022-02-17) - -- [#270](https://github.com/Sylius/InvoicingPlugin/issues/270) [Maintenance] Support stable Sylius v1.11.0 ([@GSadee](https://github.com/GSadee)) - -### v0.19.0 (2022-01-25) - -- [#249](https://github.com/Sylius/InvoicingPlugin/issues/249) Use PHP 7.4 syntax ([@GSadee](https://github.com/GSadee)) -- [#251](https://github.com/Sylius/InvoicingPlugin/issues/251) New PDF layout ([@kulczy](https://github.com/kulczy)) -- [#252](https://github.com/Sylius/InvoicingPlugin/issues/252) [Behat] Fix type of show page ([@GSadee](https://github.com/GSadee)) -- [#253](https://github.com/Sylius/InvoicingPlugin/issues/253) [Maintenance] Minor installation guide improvements ([@GSadee](https://github.com/GSadee)) -- [#255](https://github.com/Sylius/InvoicingPlugin/issues/255) Added missing french translations ([@Snowbaha](https://github.com/Snowbaha)) -- [#261](https://github.com/Sylius/InvoicingPlugin/issues/261) Drop support for Sylius 1.9 & Symfony 5.2 ([@GSadee](https://github.com/GSadee)) -- [#262](https://github.com/Sylius/InvoicingPlugin/issues/262) [PDF] Fix minor locale code typo ([@GSadee](https://github.com/GSadee)) -- [#256](https://github.com/Sylius/InvoicingPlugin/issues/256) Fix invoice payment state not updating when given order is paid () -- [#210](https://github.com/Sylius/InvoicingPlugin/issues/210) Minor admin ui redesign ([@dmitri](https://github.com/dmitri).[@perunov](https://github.com/perunov)@[@gmail](https://github.com/gmail).[@com](https://github.com/com)) -- [#258](https://github.com/Sylius/InvoicingPlugin/issues/258) fix: compare when name is the same but not variant ([@Snowbaha](https://github.com/Snowbaha)) -- [#266](https://github.com/Sylius/InvoicingPlugin/issues/266) Remove duplicated config for wkhtmltopdf ([@Zales0123](https://github.com/Zales0123)) -- [#263](https://github.com/Sylius/InvoicingPlugin/issues/263) resolve SYLIUS_INVOICING_LOGO_FILE () -- [#267](https://github.com/Sylius/InvoicingPlugin/issues/267) Drop support for PHP 7.4 ([@GSadee](https://github.com/GSadee)) -- [#269](https://github.com/Sylius/InvoicingPlugin/issues/269) Upgrade node in GitHub Actions builds ([@GSadee](https://github.com/GSadee)) -- [#268](https://github.com/Sylius/InvoicingPlugin/issues/268) Drop support for Symfony 5.3 ([@GSadee](https://github.com/GSadee)) - -### v0.18.1 (2021-09-15) - -- [#250](https://github.com/Sylius/InvoicingPlugin/issues/250) [Maintenance] Remove wrong return types ([@lchrusciel](https://github.com/lchrusciel)) - -### v0.18.0 (2021-08-27) - -- [#246](https://github.com/Sylius/InvoicingPlugin/issues/246) [Invoice] Add payment status ([@AdamKasp](https://github.com/AdamKasp), [@Tomanhez](https://github.com/Tomanhez), [@arti0090](https://github.com/arti0090)) -- [#247](https://github.com/Sylius/InvoicingPlugin/issues/247) Update knp snappy file ([@arti0090](https://github.com/arti0090)) -- [#201](https://github.com/Sylius/InvoicingPlugin/issues/201) Fix extended resource entities ([@Prometee](https://github.com/Prometee), [@lchrusciel](https://github.com/lchrusciel)) - -### v0.17.0 (2021-08-06) - -- [#233](https://github.com/Sylius/InvoicingPlugin/issues/233) Upgrade to stable Sylius 1.10 ([@GSadee](https://github.com/GSadee)) -- [#231](https://github.com/Sylius/InvoicingPlugin/issues/231) Save invoices on server during generation ([@Zales0123](https://github.com/Zales0123)) -- [#232](https://github.com/Sylius/InvoicingPlugin/issues/232) Do not require visibility in PHPSpec functions ([@Zales0123](https://github.com/Zales0123)) -- [#230](https://github.com/Sylius/InvoicingPlugin/issues/230) change information on WKHTMLTOPDF_PATH in README ([@DennisdeBest](https://github.com/DennisdeBest)) -- [#238](https://github.com/Sylius/InvoicingPlugin/issues/238) Extract wkhtmltopdf file path to env variable ([@GSadee](https://github.com/GSadee)) -- [#234](https://github.com/Sylius/InvoicingPlugin/issues/234) Rework invoice template on pdf and admin show page ([@Tomanhez](https://github.com/Tomanhez), [@GSadee](https://github.com/GSadee)) -- [#240](https://github.com/Sylius/InvoicingPlugin/issues/240) Remove unneeded TemporaryFilesystem service ([@GSadee](https://github.com/GSadee)) -- [#241](https://github.com/Sylius/InvoicingPlugin/issues/241) Add note to UPGRADE filem about removing TemporaryFilesystem ([@GSadee](https://github.com/GSadee)) - -### v0.16.1 (2021-06-23) - -- [#228](https://github.com/Sylius/InvoicingPlugin/issues/228) Fix sorting and filtering invoices by order in the grid ([@hurricane-voronin](https://github.com/hurricane-voronin)) - -### v0.16.0 (2021-06-18) - -- [#226](https://github.com/Sylius/InvoicingPlugin/issues/226) Relate Invoice with Order ([@Zales0123](https://github.com/Zales0123)) -- [#220](https://github.com/Sylius/InvoicingPlugin/issues/220) Polish translations & invoice download template update ([@mysiar](https://github.com/mysiar), [@GSadee](https://github.com/GSadee)) - -### v0.15.0 (2021-06-02) - -- [#221](https://github.com/Sylius/InvoicingPlugin/issues/221) unify usage of buses ([@SirDomin](https://github.com/SirDomin)) -- [#223](https://github.com/Sylius/InvoicingPlugin/issues/223) Drop support for Sylius 1.8 ([@GSadee](https://github.com/GSadee)) -- [#224](https://github.com/Sylius/InvoicingPlugin/issues/224) Add support for Sylius 1.10 + require PHP ^7.4 || ^8.0 ([@GSadee](https://github.com/GSadee)) -- [#225](https://github.com/Sylius/InvoicingPlugin/issues/225) Bring back easy-coding-standard + apply CS fixes ([@GSadee](https://github.com/GSadee)) - -### v0.14.0 (2021-03-18) - -- [#216](https://github.com/Sylius/InvoicingPlugin/issues/216) toggle doctrine migration ([@arti0090](https://github.com/arti0090)) -- [#217](https://github.com/Sylius/InvoicingPlugin/issues/217) Add gitkeep file to src/Migrations directory stays in code ([@arti0090](https://github.com/arti0090)) -- [#168](https://github.com/Sylius/InvoicingPlugin/issues/168) Define logo-file as parameter ([@BigBadBassMan](https://github.com/BigBadBassMan)) -- [#218](https://github.com/Sylius/InvoicingPlugin/issues/218) Remove twig errors configuration from test application ([@GSadee](https://github.com/GSadee)) - -### v0.13.0 (2021-03-04) - -- [#199](https://github.com/Sylius/InvoicingPlugin/issues/199) Bugfix | Update README file to use new route format ([@stloyd](https://github.com/stloyd)) -- [#202](https://github.com/Sylius/InvoicingPlugin/issues/202) Add translation in invoice PDF file ([@webdudi](https://github.com/webdudi), ) -- [#212](https://github.com/Sylius/InvoicingPlugin/issues/212) Upgrade to Sylius 1.9 ([@Tomanhez](https://github.com/Tomanhez)) -- [#213](https://github.com/Sylius/InvoicingPlugin/issues/213) Minor fix sylius version in composer 1.9RC to 1.9 ([@Tomanhez](https://github.com/Tomanhez)) - -### v0.12.0 (2020-11-16) - -- [#190](https://github.com/Sylius/InvoicingPlugin/issues/190) Add conflict to ^8.3.25 of symplify/package-builder to fix the build ([@Prometee](https://github.com/Prometee)) -- [#187](https://github.com/Sylius/InvoicingPlugin/issues/187) Use Sylius UI instead of Sonata event ([@Prometee](https://github.com/Prometee)) -- [#186](https://github.com/Sylius/InvoicingPlugin/issues/186) [Enhancement] Refactor and deprecate Invoice repository class ([@Prometee](https://github.com/Prometee)) -- [#191](https://github.com/Sylius/InvoicingPlugin/issues/191) Update upgrade to v0.12.0 ([@GSadee](https://github.com/GSadee)) -- [#193](https://github.com/Sylius/InvoicingPlugin/issues/193) Initialize GitHub Actions ([@pamil](https://github.com/pamil)) -- [#194](https://github.com/Sylius/InvoicingPlugin/issues/194) Test InvoicingPlugin via GitHub Actions ([@pamil](https://github.com/pamil)) -- [#195](https://github.com/Sylius/InvoicingPlugin/issues/195) Fix Doctrine/Migrations configuration ([@Zales0123](https://github.com/Zales0123)) -- [#188](https://github.com/Sylius/InvoicingPlugin/issues/188) allow override invoice shop billing data ([@jbcr](https://github.com/jbcr)) -- [#196](https://github.com/Sylius/InvoicingPlugin/issues/196) Bugfix | Update channel filter template to new Symfony format ([@stloyd](https://github.com/stloyd)) -- [#197](https://github.com/Sylius/InvoicingPlugin/issues/197) Bugfix | Update `admin_invoicing` routes to support new Symfony format ([@stloyd](https://github.com/stloyd)) - -### v0.11.0 (2020-09-22) - -- [#178](https://github.com/Sylius/InvoicingPlugin/issues/178) Fix failing InvoicingPlugin build ([@GSadee](https://github.com/GSadee), ) -- [#183](https://github.com/Sylius/InvoicingPlugin/issues/183) Allow for PHP 7.4 & upgrade static analysis ([@pamil](https://github.com/pamil)) -- [#175](https://github.com/Sylius/InvoicingPlugin/issues/175) Switch to Doctrine/Migrations 3.0-alpha ([@pamil](https://github.com/pamil)) -- [#184](https://github.com/Sylius/InvoicingPlugin/issues/184) Remove old migrations + upgrade Sylius to 1.8 ([@GSadee](https://github.com/GSadee)) -- [#185](https://github.com/Sylius/InvoicingPlugin/issues/185) [Docs] Update of UPGRADE file and installation instruction ([@lchrusciel](https://github.com/lchrusciel)) - -### v0.10.1 (2020-01-10) - -- [#167](https://github.com/Sylius/InvoicingPlugin/issues/167) Add missing migration ([@AdamKasp](https://github.com/AdamKasp)) - -### v0.10.0 (2019-12-06) - -- [#156](https://github.com/Sylius/InvoicingPlugin/issues/156) Change test server to Symfony server ([@AdamKasp](https://github.com/AdamKasp)) -- [#161](https://github.com/Sylius/InvoicingPlugin/issues/161) Remove embeddable and replace InvoicingChannel to Channel form Core ([@Tomanhez](https://github.com/Tomanhez)) -- [#165](https://github.com/Sylius/InvoicingPlugin/issues/165) fix(deps): loosen constraint for symfony/messenger ([@Gounlaf](https://github.com/Gounlaf), [@pamil](https://github.com/pamil)) - -### v0.9.0 (2019-10-17) - -- [#97](https://github.com/Sylius/InvoicingPlugin/issues/97) Make entities extendable ([@tautelis](https://github.com/tautelis), [@pamil](https://github.com/pamil)) -- [#124](https://github.com/Sylius/InvoicingPlugin/issues/124) Make invoices and credit memo grid consistent ([@bartoszpietrzak1994](https://github.com/bartoszpietrzak1994)) -- [#125](https://github.com/Sylius/InvoicingPlugin/issues/125) Passing invoice entity to invoice pdf file generator ([@bartoszpietrzak1994](https://github.com/bartoszpietrzak1994)) -- [#126](https://github.com/Sylius/InvoicingPlugin/issues/126) added invoice screenshot ([@doctorx32](https://github.com/doctorx32)) -- [#132](https://github.com/Sylius/InvoicingPlugin/issues/132) Customizations friendly improvements ([@bartoszpietrzak1994](https://github.com/bartoszpietrzak1994)) -- [#133](https://github.com/Sylius/InvoicingPlugin/issues/133) Enhanced conflict section ([@bartoszpietrzak1994](https://github.com/bartoszpietrzak1994)) -- [#134](https://github.com/Sylius/InvoicingPlugin/issues/134) Representative added to invoice shop billing data ([@bartoszpietrzak1994](https://github.com/bartoszpietrzak1994)) -- [#135](https://github.com/Sylius/InvoicingPlugin/issues/135) Fixed typo in service definition ([@kortwotze](https://github.com/kortwotze), [@GSadee](https://github.com/GSadee)) -- [#136](https://github.com/Sylius/InvoicingPlugin/issues/136) Minimise conflicts and require Messenger 4.3 ([@pamil](https://github.com/pamil)) -- [#137](https://github.com/Sylius/InvoicingPlugin/issues/137) Require Symfony ^4.2 and improve autoloading ([@pamil](https://github.com/pamil)) -- [#138](https://github.com/Sylius/InvoicingPlugin/issues/138) Allow to run PHPUnit without arguments and run Behat with strict mode on Travis CI ([@pamil](https://github.com/pamil)) -- [#139](https://github.com/Sylius/InvoicingPlugin/issues/139) Add missing migration ([@pamil](https://github.com/pamil), [@GSadee](https://github.com/GSadee)) -- [#140](https://github.com/Sylius/InvoicingPlugin/issues/140) Hotfix for TestOrderPlacedProducer ([@pamil](https://github.com/pamil)) -- [#141](https://github.com/Sylius/InvoicingPlugin/issues/141) A new way to test generating previous invoices ([@pamil](https://github.com/pamil)) -- [#146](https://github.com/Sylius/InvoicingPlugin/issues/146) [Admin] Unify order link in InvocingPlugin ([@Tomanhez](https://github.com/Tomanhez)) -- [#148](https://github.com/Sylius/InvoicingPlugin/issues/148) Fix GenerateInvoicesCommand selects order without number ([@tom10271](https://github.com/tom10271)) -- [#158](https://github.com/Sylius/InvoicingPlugin/issues/158) Update dependencies ([@pamil](https://github.com/pamil)) -- [#160](https://github.com/Sylius/InvoicingPlugin/issues/160) Add migrations for tests app ([@Tomanhez](https://github.com/Tomanhez)) -- [#162](https://github.com/Sylius/InvoicingPlugin/issues/162) Require GridBundle v1.7+ with embeddables support ([@pamil](https://github.com/pamil)) diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md index 9f5df2ff..d6b3e604 100644 --- a/UPGRADE-2.0.md +++ b/UPGRADE-2.0.md @@ -1,10 +1,10 @@ -### UPGRADE FROM 1.X TO 2.0 +# UPGRADE FROM 1.X TO 2.0 1. Support for Sylius 2.0 has been added, it is now the recommended Sylius version to use with InvoicingPlugin. 1. Support for Sylius 1.X has been dropped, upgrade your application to [Sylius 2.0](https://github.com/Sylius/Sylius/blob/2.0/UPGRADE-2.0.md). -1. Support for PHP has been increased to 8.2 +1. The minimum supported version of PHP has been increased to 8.2. 1. The `sylius_invoicing_plugin_admin_order_invoices_partial` and `sylius_invoicing_plugin_shop_order_invoices_partial` partials have been replaced by `Sylius\InvoicingPlugin\Twig\Component\Invoice\ListComponent` twig component. From 14530c6d1daa8737dd66e2b24f91d110451eeecc Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Mon, 18 Nov 2024 11:51:05 +0100 Subject: [PATCH 5/6] [Composer] Bump to stable Sylius 2.0 --- .github/workflows/build.yaml | 6 +++--- composer.json | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7758e76a..edf379c9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,17 +21,17 @@ jobs: matrix: php: ["8.2", "8.3"] symfony: ["^6.4", "^7.1"] - sylius: ["2.0.x-dev"] + sylius: ["~2.0.0"] node: ["20.x"] mysql: ["8.4"] wkhtmltopdf: ["0.12.6-1", false] - state_machine_adapter: [ "symfony_workflow" ] + state_machine_adapter: ["symfony_workflow"] include: - php: "8.3" symfony: "^7.1" - sylius: "2.0.x-dev" + sylius: "~2.0.0" node: "20.x" mysql: "8.4" wkhtmltopdf: "0.12.6-1" diff --git a/composer.json b/composer.json index 0533d628..1f5f3666 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "ramsey/uuid": "^4.7", "sylius/grid-bundle": "^1.13", "sylius/resource-bundle": "^1.12", - "sylius/sylius": "2.0.x-dev", + "sylius/sylius": "~2.0.0", "sylius/twig-hooks": "^0.5", "symfony/clock": "^6.4 || ^7.1", "symfony/config": "^6.4 || ^7.1", @@ -28,7 +28,6 @@ "behat/behat": "^3.14", "dmore/behat-chrome-extension": "^1.4", "dmore/chrome-mink-driver": "^2.9", - "friends-of-behat/exclude-specifications-extension": "^0.3", "friends-of-behat/mink": "^1.11", "friends-of-behat/mink-browserkit-driver": "^1.6", "friends-of-behat/mink-debug-extension": "^2.1", From 7d10e15f2ab37b637b10f62db4e4b1888371a4e1 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Mon, 18 Nov 2024 11:51:50 +0100 Subject: [PATCH 6/6] Remove unneeded SymfonyClockCompilerPass --- .../Compiler/SymfonyClockCompilerPass.php | 31 ------------------- src/SyliusInvoicingPlugin.php | 9 ------ 2 files changed, 40 deletions(-) delete mode 100644 src/DependencyInjection/Compiler/SymfonyClockCompilerPass.php diff --git a/src/DependencyInjection/Compiler/SymfonyClockCompilerPass.php b/src/DependencyInjection/Compiler/SymfonyClockCompilerPass.php deleted file mode 100644 index 4afc8c5c..00000000 --- a/src/DependencyInjection/Compiler/SymfonyClockCompilerPass.php +++ /dev/null @@ -1,31 +0,0 @@ -hasParameter('clock')) { - return; - } - - $container->setDefinition('clock', new Definition(Clock::class)); - } -} diff --git a/src/SyliusInvoicingPlugin.php b/src/SyliusInvoicingPlugin.php index a1ead044..10ad5c3d 100644 --- a/src/SyliusInvoicingPlugin.php +++ b/src/SyliusInvoicingPlugin.php @@ -14,19 +14,10 @@ namespace Sylius\InvoicingPlugin; use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait; -use Sylius\InvoicingPlugin\DependencyInjection\Compiler\SymfonyClockCompilerPass; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; /** @internal */ final class SyliusInvoicingPlugin extends Bundle { use SyliusPluginTrait; - - public function build(ContainerBuilder $container): void - { - parent::build($container); - - $container->addCompilerPass(new SymfonyClockCompilerPass()); - } }