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.

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

Update libraries and remove deprecations #818 #819

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6434819
add php8, use sqlite for tests
tacman Nov 14, 2021
9122a7e
add php8, use sqlite for tests
tacman Nov 14, 2021
8f11d9e
remove some deprecation messages
tacman Nov 14, 2021
7db9633
run tests on my branch
tacman Nov 14, 2021
e3fb8eb
drop support for < php 7.4
tacman Nov 14, 2021
cb4437c
re-add mysql
tacman Nov 14, 2021
8b1827f
try with postgres
tacman Aug 25, 2022
93123b8
update composer with allow-plugins
tacman Aug 25, 2022
6ba6269
merge upstream
tacman Sep 5, 2022
4023629
remove req for symfony and php
tacman Sep 5, 2022
7679715
merge upstream
tacman Sep 26, 2022
6b32334
tweak validator so that reddit.com/.rss doesn't fail
tacman Sep 26, 2022
caad335
php8.1 with postgres
tacman Sep 26, 2022
656c917
merge upstream
tacman Sep 26, 2022
786d874
remove survos/base and umbrella, add bootstrap
tacman Sep 27, 2022
67ab9af
Merge branch 'j0k3r:master' into master
tacman Apr 21, 2023
1bb4c96
merge upstream
tacman Apr 21, 2023
f37eb2e
Merge remote-tracking branch 'upstream/master'
tacman Mar 15, 2024
0bd4543
merge main
tacman Mar 15, 2024
3a7bab6
use attributes instead of annotations
tacman Mar 15, 2024
c8c5e30
get working with 6.4
tacman Mar 15, 2024
3aaa6df
remove sensio
tacman Mar 15, 2024
4b3fa2f
update recipe
tacman Mar 15, 2024
eff518c
update recipe
tacman Mar 15, 2024
17f8f32
update recipe
tacman Mar 15, 2024
311908f
update recipe
tacman Mar 15, 2024
52e14e6
back to 6.4 until gaby/sites-config is updated
tacman Mar 15, 2024
86168a9
add AssetMapper
tacman Mar 15, 2024
63c8516
add registration, refactor security a bit, drop webpack and add asset…
tacman Mar 15, 2024
1df0a9b
import js
tacman Mar 15, 2024
f2c447e
Merge branch 'j0k3r:master' into master
tacman Nov 15, 2024
deb33d5
merge upstream, fix depenencies so Symfony 7.1 and php 8.3 work
tacman Nov 15, 2024
30268ff
updates for Symfony 7 and survos utilities
tacman Nov 15, 2024
8a14980
start to use tabler, last commit before new repo
tacman Nov 15, 2024
0bc0720
initial version
tacman Nov 15, 2024
3e13e6a
Merge branch 'tac' of github.com:tacman/f43.me into tac
tacman Dec 2, 2024
b75382d
add parser
tacman Dec 2, 2024
49ccb35
remove css
tacman Dec 2, 2024
41252f0
move scss to css
tacman Dec 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
#DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db
DATABASE_URL=mysql://root:@127.0.0.1:3306/f43_test
MERCURY_URL=https://mercury.f43.me
PANTHER_APP_ENV=panther
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "master"
push:
branches:
- "master"
- "tac"

env:
fail-fast: true
Expand All @@ -31,9 +31,8 @@ jobs:
strategy:
matrix:
php:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
include:
- php: "7.4"
coverage: true
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@
.phpunit.result.cache
/phpunit.xml
###< symfony/phpunit-bridge ###

###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
###< phpunit/phpunit ###
45 changes: 23 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
}
],
"require": {
"php": "^7.2.9",
"php": ">= 7.4",
"beberlei/doctrineextensions": "^1.2",
"composer/package-versions-deprecated": "^1.11",
"custom-zurb/foundation": "4.3.2",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/orm": "^2.5",
"j0k3r/graby": "^2.0",
"j0k3r/php-imgur-api-client": "~3.0",
Expand All @@ -38,20 +38,20 @@
"sensio/framework-extra-bundle": "^6.0",
"sentry/sentry-symfony": "^4.2",
"simplepie/simplepie": "~1.4",
"stof/doctrine-extensions-bundle": "~1.1",
"symfony/amqp-messenger": "5.3.*",
"symfony/asset": "5.3.*",
"symfony/dotenv": "5.3.*",
"stof/doctrine-extensions-bundle": "^1.0",
"symfony/amqp-messenger": ">= 5.3",
"symfony/asset": ">= 5.3",
"symfony/dotenv": ">= 5.3",
"symfony/flex": "^1.9",
"symfony/form": "5.3.*",
"symfony/lock": "5.3.*",
"symfony/form": ">= 5.3",
"symfony/lock": ">= 5.3",
"symfony/monolog-bundle": "^3.5",
"symfony/runtime": "5.3.*",
"symfony/security-bundle": "5.3.*",
"symfony/translation": "5.3.*",
"symfony/twig-bundle": "5.3.*",
"symfony/validator": "5.3.*",
"symfony/yaml": "5.3.*",
"symfony/runtime": ">= 5.3",
"symfony/security-bundle": ">= 5.3",
"symfony/translation": ">= 5.3",
"symfony/twig-bundle": ">= 5.3",
"symfony/validator": ">= 5.3",
"symfony/yaml": ">= 5.3",
"twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^2.12|^3.0"
},
Expand All @@ -65,13 +65,14 @@
"phpstan/phpstan-doctrine": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-symfony": "^0.12",
"symfony/browser-kit": "5.3.*",
"symfony/css-selector": "5.3.*",
"symfony/debug-bundle": "5.3.*",
"phpunit/phpunit": "^9.5",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it required? Because we use simple-phpunit to run test and not phpunit directly

"symfony/browser-kit": ">= 5.3",
"symfony/css-selector": ">= 5.3",
"symfony/debug-bundle": ">= 5.3",
"symfony/maker-bundle": "^1.21",
"symfony/phpunit-bridge": "5.3.*",
"symfony/stopwatch": "5.3.*",
"symfony/web-profiler-bundle": "5.3.*"
"symfony/phpunit-bridge": ">= 5.3",
"symfony/stopwatch": ">= 5.3",
"symfony/web-profiler-bundle": ">= 5.3"
},
"conflict": {
"symfony/symfony": "*"
Expand All @@ -90,7 +91,7 @@
},
"config": {
"platform": {
"php": "7.2.9"
"php": "7.4"
},
"bin-dir": "bin",
"sort-packages": true
Expand All @@ -103,7 +104,7 @@
},
"symfony": {
"allow-contrib": true,
"require": "5.3.*"
"require": ">= 5.3"
}
},
"repositories": [
Expand Down
Loading