Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OP-550 - Remove php 8.4 and symfony 6.4 support
Browse files Browse the repository at this point in the history
JanPalen committed Jan 9, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent aa51620 commit dbfa875
Showing 9 changed files with 33 additions and 156 deletions.
21 changes: 19 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "8.3" ]
symfony: [ "^6.4", "^7.0" ]
php: [ "8.2", "8.3" ]
symfony: [ "^7.1" ]
sylius: [ "^2.0" ]
node: [ "20.x" ]
mysql: [ "8.0" ]
@@ -155,10 +155,27 @@ jobs:
name: Run PHPSpec
run: vendor/bin/phpspec run --ansi -f progress --no-interaction

-
name: Set up JWT keys
run: |
mkdir -p tests/Application/config/jwt
openssl genpkey -algorithm RSA -out tests/Application/config/jwt/private.pem -aes256 -pass pass:key
openssl rsa -pubout -in config/jwt/private.pem -out tests/Application/config/jwt/public.pem -passin pass:key
chmod 600 tests/Application/config/jwt/private.pem tests/Application/config/jwt/public.pem
-
name: Run PHPUnit
run: vendor/bin/phpunit --colors=always

-
name: Upload Symfony log
uses: actions/upload-artifact@v4
if: failure()
with:
name: Symfony log aaaaaaa
path: tests/Application/var/log
if-no-files-found: ignore

-
name: Run Behat
run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
4 changes: 2 additions & 2 deletions .github/workflows/coding_standard.yml
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "8.3" ]
symfony: [ "^6.4", "^7.0" ]
php: [ "8.2", "8.3" ]
symfony: [ "^7.1" ]
sylius: [ "^2.0" ]
node: [ "20.x" ]

28 changes: 0 additions & 28 deletions UPGRADE-1.3.md

This file was deleted.

86 changes: 0 additions & 86 deletions UPGRADE-1.4.md

This file was deleted.

18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"description": "Product bundle for Sylius.",
"license": "MIT",
"require": {
"php": "^8.2",
"php": "~8.2.0 || ~8.3.0",
"sylius/sylius": "~2.0.0",
"dompdf/dompdf": "^2.0",
"sylius/twig-hooks": "^0.5",
@@ -31,7 +31,7 @@
"friends-of-behat/symfony-extension": "^2.6",
"friends-of-behat/variadic-extension": "^1.6",
"gedmo/doctrine-extensions": "^3.9",
"lchrusciel/api-test-case": "^4.1 || ^5.0",
"lchrusciel/api-test-case": "^5.3",
"league/flysystem-bundle": "^3.3",
"nelmio/alice": "^3.10",
"nyholm/psr7": "^1.8",
@@ -42,13 +42,13 @@
"sylius-labs/suite-tags-extension": "~0.2",
"sylius/mailer-bundle": "^1.8 || ^2.0@beta",
"sylius/sylius-rector": "^2.0",
"symfony/browser-kit": "^6.4 || ^7.1",
"symfony/debug-bundle": "^6.4 || ^7.1",
"symfony/dependency-injection": "^6.4 || ^7.1",
"symfony/dotenv": "^6.4 || ^7.1",
"symfony/http-client": "^6.4 || ^7.1",
"symfony/intl": "^6.4 || ^7.1",
"symfony/web-profiler-bundle": "^6.4 || ^7.1"
"symfony/browser-kit": "^7.1",
"symfony/debug-bundle": "^7.1",
"symfony/dependency-injection": "^7.1",
"symfony/dotenv": "^7.1",
"symfony/http-client": "^7.1",
"symfony/intl": "^7.1",
"symfony/web-profiler-bundle": "^7.1"
},
"autoload": {
"psr-4": {
10 changes: 1 addition & 9 deletions tests/Api/AdminJsonApiTestCase.php
Original file line number Diff line number Diff line change
@@ -11,19 +11,11 @@

namespace Tests\BitBag\SyliusProductBundlePlugin\Api;

use Composer\InstalledVersions;

abstract class AdminJsonApiTestCase extends JsonApiTestCase
{
public function getAuthToken(string $email, string $password): string
{
$syliusVersion = InstalledVersions::getVersion('sylius/sylius');

if (version_compare($syliusVersion, '1.13.0', '>=')) {
$endpoint = '/api/v2/admin/administrators/token';
} else {
$endpoint = '/api/v2/admin/authentication-token';
}
$endpoint = '/api/v2/admin/administrators/token';

$this->client->request(
'POST',
4 changes: 0 additions & 4 deletions tests/Application/Kernel.php
Original file line number Diff line number Diff line change
@@ -112,9 +112,5 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
private function getConfigurationDirectories(): iterable
{
yield $this->getProjectDir() . '/config';
$symfonyConfigDir = $this->getProjectDir() . '/config/symfony/' . BaseKernel::MAJOR_VERSION . '.x';
if (is_dir($symfonyConfigDir)) {
yield $symfonyConfigDir;
}
}
}
4 changes: 2 additions & 2 deletions tests/Application/config/packages/test_cached/fos_rest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fos_rest:
exception:
debug: true
exception:
debug: true
14 changes: 0 additions & 14 deletions tests/Application/config/symfony/6.x/bundles.php

This file was deleted.

0 comments on commit dbfa875

Please sign in to comment.