Skip to content

Commit

Permalink
feat: bump to sf7 and php83
Browse files Browse the repository at this point in the history
  • Loading branch information
JellyBellyDev committed Jan 5, 2024
1 parent f9dd6e3 commit 1d40580
Show file tree
Hide file tree
Showing 40 changed files with 1,933 additions and 1,810 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
php-versions: [ '8.1', '8.2' ]
php-versions: [ '8.3' ]
coverage-driver: [ 'pcov' ]

services:
Expand All @@ -27,7 +27,7 @@ jobs:
- 6379:6379

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install PHP
uses: shivammathur/setup-php@v2
Expand All @@ -52,7 +52,7 @@ jobs:
args: --prefer-dist
version: 2
php_extensions: gd
php_version: 8.1
php_version: 8.3

- name: Yarn install
uses: actions/setup-node@v3
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Check Docker Version
run: docker --version
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
.phpunit
.phpunit.result.cache
/phpunit.xml
.phpunit.cache
###< symfony/phpunit-bridge ###

###> friendsofphp/php-cs-fixer ###
Expand Down
10 changes: 7 additions & 3 deletions bin/phpunit
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) {
}

if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
require PHPUNIT_COMPOSER_INSTALL;
PHPUnit\TextUI\Command::main();
if (PHP_VERSION_ID >= 80000) {
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
} else {
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
require PHPUNIT_COMPOSER_INSTALL;
PHPUnit\TextUI\Command::main();
}
} else {
if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
Expand Down
52 changes: 28 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,45 +17,46 @@
],
"minimum-stability": "beta",
"require": {
"php": "^8.1",
"php": "^8.3",
"ext-gd": "*",
"ext-iconv": "*",
"ext-json": "*",
"badges/poser": "^2.3.1",
"badges/poser": "^3.0",
"bitbucket/client": "^4.2",
"cache/predis-adapter": "^1.2",
"knplabs/github-api": "^3.9",
"knplabs/packagist-api": "^2.0",
"m4tthumphrey/php-gitlab-api": "^11.8",
"php-http/guzzle6-adapter": "^2.0",
"predis/predis": "^1.1",
"sentry/sentry-symfony": "^4.4",
"snc/redis-bundle": "^4.3",
"symfony/asset": "^6.1",
"symfony/console": "^6.1",
"predis/predis": "^2.2",
"sentry/sentry-symfony": "^4.13",
"snc/redis-bundle": "^4.7",
"symfony/asset": "^7.0",
"symfony/console": "^7.0",
"symfony/flex": "^2.2",
"symfony/framework-bundle": "^6.1",
"symfony/http-client": "^6.1",
"symfony/runtime": "^6.1",
"symfony/webpack-encore-bundle": "^1.16",
"symfony/yaml": "^6.1"
"symfony/framework-bundle": "^7.0",
"symfony/http-client": "^7.0",
"symfony/runtime": "^7.0",
"symfony/webpack-encore-bundle": "^2.1",
"symfony/yaml": "^7.0"
},
"require-dev": {
"dg/bypass-finals": "^1.4",
"friendsofphp/php-cs-fixer": "^3.13",
"jangregor/phpstan-prophecy": "^1.0",
"phpspec/prophecy-phpunit": "^2.0",
"phpspec/prophecy-phpunit": "^2.1",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.9",
"phpstan/phpstan-phpunit": "^1.2",
"phpstan/phpstan-symfony": "^1.2",
"symfony/browser-kit": "^6.1",
"symfony/debug-bundle": "^6.1",
"symfony/dotenv": "^6.1",
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-latest",
"symfony/browser-kit": "^7.0",
"symfony/debug-bundle": "^7.0",
"symfony/dotenv": "^7.0",
"symfony/monolog-bundle": "^3.8",
"symfony/phpunit-bridge": "^6.1",
"symfony/stopwatch": "^6.1",
"symfony/web-profiler-bundle": "^6.1"
"symfony/phpunit-bridge": "^7.0",
"symfony/stopwatch": "^7.0",
"symfony/web-profiler-bundle": "^7.0"
},
"config": {
"preferred-install": {
Expand All @@ -82,10 +83,13 @@
},
"replace": {
"symfony/polyfill-iconv": "*",
"symfony/polyfill-php73": "*",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-php72": "*",
"symfony/polyfill-php71": "*",
"symfony/polyfill-php70": "*"
"symfony/polyfill-php73": "*",
"symfony/polyfill-php74": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*"
},
"scripts": {
"auto-scripts": {
Expand Down Expand Up @@ -115,7 +119,7 @@
"symfony": {
"id": "01C6YZAVV83WQGHCHEWX2SA6KC",
"allow-contrib": false,
"require": "6.3.*"
"require": "7.0.*"
},
"branch-alias": {
"dev-master": "3.x-dev"
Expand Down
Loading

0 comments on commit 1d40580

Please sign in to comment.