diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml index 4fa080b..2aa5315 100644 --- a/.github/workflows/recipe.yaml +++ b/.github/workflows/recipe.yaml @@ -17,25 +17,35 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4' ,'8.0'] - sylius: ["~1.8.0", "~1.9.0", "~1.10.0", "~1.11.0"] + php: ['7.4', '8.0', '8.1'] + sylius: ['~1.8.0', '~1.9.0', '~1.10.0', '~1.11.0', '~1.12.0'] exclude: - - php: 8.0 - sylius: "~1.8.0" - - php: 8.0 - sylius: "~1.9.0" - - php: 7.4 - sylius: "~1.11.0" + - php: '8.0' + sylius: '~1.8.0' + - php: '8.0' + sylius: '~1.9.0' + - php: '8.1' + sylius: '~1.8.0' + - php: '8.1' + sylius: '~1.9.0' + - php: '7.4' + sylius: '~1.11.0' + - php: '7.4' + sylius: '~1.12.0' steps: - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: gd, intl, json + ini-values: date.timezone=UTC + + - name: Set project php-version run: | - sudo update-alternatives --set php /usr/bin/php${{ matrix.php }} - echo "date.timezone=UTC" >> /tmp/timezone.ini - sudo mv /tmp/timezone.ini /etc/php/${{ matrix.php }}/cli/conf.d/timezone.ini echo ${{ matrix.php }} > .php-version - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: plugin @@ -48,7 +58,7 @@ jobs: - run: mkdir -p /home/runner/{.composer/cache,.config/composer} - - uses: actions/cache@v1 + - uses: actions/cache@v3 id: cache-composer with: path: /home/runner/.composer/cache @@ -83,7 +93,7 @@ jobs: - name: Require plugin without install working-directory: ./sylius run: | - composer require --no-install --no-update monsieurbiz/sylius-cms-page-plugin="*@dev" + composer require --no-install --no-scripts monsieurbiz/sylius-cms-page-plugin="*@dev" - name: Composer install working-directory: ./sylius diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index ad925f0..78a624c 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -13,18 +13,23 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0'] + php: ['7.4', '8.0', '8.1'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: gd, intl, json + ini-values: date.timezone=UTC + + - name: Set project php-version run: | - sudo update-alternatives --set php /usr/bin/php${{ matrix.php }} - echo "date.timezone=UTC" | sudo tee /etc/php/${{ matrix.php }}/cli/conf.d/timezone.ini - echo "${{ matrix.php }}" > .php-version + echo ${{ matrix.php }} > .php-version - - uses: actions/cache@v1 + - uses: actions/cache@v3 id: cache-composer with: path: /home/runner/.composer/cache @@ -39,7 +44,7 @@ jobs: - name: Composer Github Auth run: composer config -g github-oauth.github.com ${{ github.token }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install PHP dependencies run: composer update --prefer-dist diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f266e87..f7934f1 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.0'] + php: ['8.0', '8.1'] env: SYMFONY_ARGS: --no-tls @@ -22,23 +22,29 @@ jobs: DOCKER_INTERACTIVE_ARGS: -t steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 with: node-version: '14' - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: gd, intl, json + ini-values: date.timezone=UTC + + - name: Set project php-version run: | - sudo update-alternatives --set php /usr/bin/php${{ matrix.php }} - echo "date.timezone=UTC" | sudo tee /etc/php/${{ matrix.php }}/cli/conf.d/timezone.ini - echo "${{ matrix.php }}" > .php-version + echo ${{ matrix.php }} > .php-version - name: Install symfony CLI run: | curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | sudo -E bash sudo apt install symfony-cli - - uses: actions/cache@v1 + - uses: actions/cache@v3 id: cache-composer with: path: /home/runner/.composer/cache diff --git a/.php-version.dist b/.php-version.dist index cc40bca..b8eb026 100644 --- a/.php-version.dist +++ b/.php-version.dist @@ -1 +1 @@ -8.0 +8.1 diff --git a/Makefile b/Makefile index b4d0e8e..b3bfd0b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .DEFAULT_GOAL := help SHELL=/bin/bash APP_DIR=tests/Application -SYLIUS_VERSION=1.11.0 +SYLIUS_VERSION=1.12.0 SYMFONY=cd ${APP_DIR} && symfony COMPOSER=symfony composer CONSOLE=${SYMFONY} console diff --git a/composer.json b/composer.json index 1ea971c..c1aa6f3 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": "~7.4|~8.0", - "sylius/sylius": ">=1.8 <1.12", + "sylius/sylius": ">=1.8 <1.13", "gedmo/doctrine-extensions": "^2.4.12 || ^3.0", "monsieurbiz/sylius-rich-editor-plugin": "^2.0" }, @@ -30,7 +30,7 @@ "mikey179/vfsstream": "^1.6", "mockery/mockery": "^1.4", "pamil/prophecy-common": "^0.1", - "phpspec/phpspec": "^6.1", + "phpspec/phpspec": "^6.1|^7.2", "phpstan/phpstan": "^0.12.57", "phpstan/phpstan-doctrine": "^0.12.19", "phpstan/phpstan-webmozart-assert": "^0.12.7", @@ -56,16 +56,13 @@ "cache:clear": "symfony-cmd", "assets:install %PUBLIC_DIR%": "symfony-cmd" }, - "phpcs": "php-cs-fixer fix --using-cache=false", + "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=false", "phpstan": "phpstan analyse -c phpstan.neon src/", "phpmd": "phpmd --exclude Migrations/* src/ ansi phpmd.xml", "phpunit": "phpunit", "phpspec": "phpspec run" }, "extra": { - "symfony": { - "require": "^4.4" - }, "branch-alias": { "dev-master": "1.0-dev" } diff --git a/src/Context/LastChanceLocaleContext.php b/src/Context/LastChanceLocaleContext.php index 72ff0f3..3efab39 100644 --- a/src/Context/LastChanceLocaleContext.php +++ b/src/Context/LastChanceLocaleContext.php @@ -34,8 +34,7 @@ public function __construct( public function getLocaleCode(): string { - $request = $this->requestStack->getMasterRequest(); - if (null === $request) { + if (null === $request = $this->requestStack->getMainRequest()) { throw new LocaleNotFoundException('Main request not found, therefore no locale found…'); } $pathInfo = $request->getPathInfo(); diff --git a/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php b/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php index 5449c2f..ff66a4e 100644 --- a/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php +++ b/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php @@ -34,7 +34,7 @@ public function load(array $config, ContainerBuilder $container): void /** * @inheritdoc */ - public function getAlias() + public function getAlias(): string { return str_replace('monsieur_biz', 'monsieurbiz', parent::getAlias()); } diff --git a/src/Entity/PageTranslation.php b/src/Entity/PageTranslation.php index 46b5926..174db42 100644 --- a/src/Entity/PageTranslation.php +++ b/src/Entity/PageTranslation.php @@ -52,13 +52,6 @@ class PageTranslation extends AbstractTranslation implements PageTranslationInte */ protected $metaDescription; - /** - * Redeclared for annotations. - * - * @var string|null - */ - protected $locale; - public function getId(): ?int { return $this->id; diff --git a/src/Resources/config/routing/shop.yaml b/src/Resources/config/routing/shop.yaml index dc4d89b..e8d65b6 100644 --- a/src/Resources/config/routing/shop.yaml +++ b/src/Resources/config/routing/shop.yaml @@ -3,7 +3,7 @@ monsieurbiz_cms_page_show: path: /{slug} methods: [GET] defaults: - _controller: monsieurbiz_cms_page.controller.page:showAction + _controller: monsieurbiz_cms_page.controller.page::showAction _sylius: template: "@MonsieurBizSyliusCmsPagePlugin/Shop/Page/show.html.twig" repository: diff --git a/src/Routing/RequestContext.php b/src/Routing/RequestContext.php index fb0805a..e18a605 100644 --- a/src/Routing/RequestContext.php +++ b/src/Routing/RequestContext.php @@ -65,7 +65,7 @@ public function __construct( public function checkPageSlug(Request $request): bool { - if ($request !== $this->requestStack->getMasterRequest()) { + if ($request !== $this->requestStack->getMainRequest()) { return false; }