Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

up #39

Merged
merged 4 commits into from Mar 13, 2024
Merged

up #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a192f71
Update to SF 7.0
lyrixx Feb 8, 2024
c470651
fix column type
lyrixx Mar 13, 2024
f16bbb1
Modernize a bit the app
lyrixx Mar 13, 2024
446cf8a
Fixed tests
lyrixx Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=0d7215cd68fd30304f304385eda6963e
APP_SECRET=71ffdbd268239ee496cb471d1dfd800f
###< symfony/framework-bundle ###

###> doctrine/doctrine-bundle ###
Expand All @@ -26,5 +26,5 @@ APP_SECRET=0d7215cd68fd30304f304385eda6963e
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
DATABASE_URL="pgsql://postgres:password@localhost/workflow?serverVersion=16&charset=utf8"
###< doctrine/doctrine-bundle ###
1 change: 1 addition & 0 deletions .env.test
View file
Open in desktop
@@ -1,5 +1,6 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
10 changes: 7 additions & 3 deletions bin/phpunit
View file
Open in desktop
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
69 changes: 35 additions & 34 deletions composer.json
View file
Open in desktop
Expand Up @@ -4,43 +4,42 @@
"license": "MIT",
"minimum-stability": "dev",
"require": {
"php": "^8.1",
"ext-ctype": "*",
"ext-iconv": "*",
"doctrine/doctrine-bundle": "^2.7.1",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.13.3",
"doctrine/doctrine-bundle": "^2.11.2",
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^2.18.0",
"phpdocumentor/reflection-docblock": "^5.3",
"symfony/apache-pack": "^1.0",
"symfony/asset": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/flex": "^2.2.3",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/monolog-bundle": "^3.8",
"symfony/process": "6.4.*",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/web-link": "6.4.*",
"symfony/workflow": "6.4.*",
"symfony/yaml": "6.4.*"
"symfony/apache-pack": "^1.0.1",
"symfony/asset": "7.0.*",
"symfony/console": "7.0.*",
"symfony/dotenv": "7.0.*",
"symfony/expression-language": "7.0.*",
"symfony/flex": "^2.4.4",
"symfony/form": "7.0.*",
"symfony/framework-bundle": "7.0.*",
"symfony/monolog-bundle": "^3.10",
"symfony/process": "7.0.*",
"symfony/property-access": "7.0.*",
"symfony/property-info": "7.0.*",
"symfony/runtime": "7.0.*",
"symfony/security-bundle": "7.0.*",
"symfony/serializer": "7.0.*",
"symfony/twig-bundle": "7.0.*",
"symfony/validator": "7.0.*",
"symfony/web-link": "7.0.*",
"symfony/workflow": "7.0.*",
"symfony/yaml": "7.0.*"
},
"require-dev": {
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/maker-bundle": "^1.47",
"symfony/phpunit-bridge": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/var-dumper": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
"symfony/browser-kit": "7.0.*",
"symfony/css-selector": "7.0.*",
"symfony/debug-bundle": "7.0.*",
"symfony/maker-bundle": "^1.54",
"symfony/phpunit-bridge": "7.0.*",
"symfony/stopwatch": "7.0.*",
"symfony/var-dumper": "7.0.*",
"symfony/web-profiler-bundle": "7.0.*"
},
"config": {
"preferred-install": {
Expand Down Expand Up @@ -79,7 +78,8 @@
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
Expand All @@ -95,7 +95,8 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.4.*"
"require": "7.0.*",
"docker": false
}
}
}