Skip to content

Commit

Permalink
Switch to using Symfony Flex; more rewriting to use dependency injection
Browse files Browse the repository at this point in the history
Follow-up to 49d96d7

Other changes:
* Removes .env.dist and instead uses .env and .env.*.local
* Remove remaining remnants of abandoned RfX tools
* Remove usage of the service container in all classes except
  Controllers and test classes.
* Move to using default conifg parmas in services.yaml.
* More language changes, blacklist -> denylist
* More deprecations fixed, and new ones introduced!

A follow-up commit will complete the migration to Symfony 5 and fix all
other deprecations.

Bug: T331939
  • Loading branch information
MusikAnimal committed Mar 15, 2023
1 parent 49d96d7 commit eb753e0
Show file tree
Hide file tree
Showing 77 changed files with 4,595 additions and 1,580 deletions.
File renamed without changes.
25 changes: 21 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/config/table_map.yml
/config/parameters.yml
/config/request_blacklist.yml
/config/request_denylist.yml
/build/
/phpunit.xml
/var/*
!/var/cache
/var/cache/*
Expand All @@ -13,10 +12,11 @@
!/var/sessions
/var/sessions/*
!var/sessions/.gitkeep
/node_modules/

###> symfony/framework-bundle ###
/.env
/.env.local
/.env.local.php
/.env.*.local
/public/bundles/
/var/
/vendor/
Expand All @@ -30,4 +30,21 @@ i18n_helper.js
phpDocumentor.phar
coverage.xml
.web-server-pid

###> squizlabs/php_codesniffer ###
/.phpcs-cache
/phpcs.xml
###< squizlabs/php_codesniffer ###

###> symfony/phpunit-bridge ###
.phpunit
.phpunit.result.cache
/phpunit.xml
###< symfony/phpunit-bridge ###

###> symfony/webpack-encore-bundle ###
/node_modules/
/public/build/
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###
27 changes: 19 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "x-tools/xtools",
"description": "A suite of tools to analyze page, user and project data of MediaWiki website",
"description": "A suite of tools to analyze page, user and project data of MediaWiki sites",
"license": "GPL-3.0-or-later",
"type": "project",
"autoload": {
Expand All @@ -18,7 +18,8 @@
"php": "7.4"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
"dealerdirect/phpcodesniffer-composer-installer": true,
"symfony/flex": true
}
},
"require": {
Expand All @@ -27,7 +28,6 @@
"ext-intl": "*",
"ext-json": "*",
"ext-PDO": "*",
"symfony/symfony": "^4.4",
"twig/twig": "^3.0",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^2.2",
Expand All @@ -47,15 +47,19 @@
"doctrine/common": "^3.1",
"wikimedia/ip-utils": "^1.0",
"symfony/mailer": "^4.4",
"symfony/web-profiler-bundle": "^4.4"
"symfony/web-profiler-bundle": "^4.4",
"symfony/flex": "^1.19",
"symfony/dotenv": "^4.4",
"symfony/yaml": "^4.4",
"symfony/security-csrf": "^4.4",
"symfony/css-selector": "^4.4"
},
"require-dev": {
"phpunit/phpunit": "^9.0",
"symfony/phpunit-bridge": "^4.4",
"squizlabs/php_codesniffer": "^3.3.0",
"mediawiki/minus-x": "^0.3.2",
"symfony/web-server-bundle": "^4.4",
"dms/phpunit-arraysubset-asserts": "^0.4.0"
"dms/phpunit-arraysubset-asserts": "^0.4.0",
"symfony/browser-kit": "^4.4"
},
"scripts": {
"test": [
Expand All @@ -66,7 +70,14 @@
"fix": [
"./vendor/bin/phpcbf .",
"./vendor/bin/minus-x fix ."
]
],
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
}
},
"conflict": {
"symfony/symfony": "*"
},
"extra": {
"symfony-app-dir": "app",
Expand Down
Loading

0 comments on commit eb753e0

Please sign in to comment.