Fix dependencies

Author: chapterjason

composer.json

@@ -13,7 +13,6 @@
         "php": ">=8.4",
         "doctrine/collections": "^2.3.0",
         "doctrine/dbal": "^4.2.3",
-        "doctrine/doctrine-bundle": "^2.14",
         "doctrine/orm": "^3.3",
         "sourecode/timezone-bundle": "^0.1.1",
         "symfony/cache": "^7.1",
@@ -23,12 +22,11 @@
         "symfony/http-foundation": "^7.1",
         "symfony/http-kernel": "^7.1",
         "symfony/intl": "^7.1",
-        "symfony/security-bundle": "^7.1",
         "symfony/security-core": "^7.1",
-        "symfony/service-contracts": "^3.5",
-        "symfony/translation": "^7.1"
+        "symfony/service-contracts": "^3.5"
     },
     "require-dev": {
+        "doctrine/doctrine-bundle": "^2.14",
         "nyholm/symfony-bundle-test": "^3.0",
         "phpbench/phpbench": "^1.4",
         "phpstan/extension-installer": "^1.4",
@@ -38,6 +36,7 @@
         "symfony/browser-kit": "^7.1",
         "symfony/phpunit-bridge": "^7.1",
         "symfony/runtime": "^7.1",
+        "symfony/security-bundle": "^7.1",
         "twig/twig": "^3.2"
     },
     "autoload": {

scripts/__dev.sh

@@ -7,20 +7,9 @@ PROJECT_DIRECTORY="$(dirname "$CURRENT_DIRECTORY")"
 
 pushd "$PROJECT_DIRECTORY" >/dev/null
 
-# <editor-fold desc="Install tools">
-if [ ! -d "tools" ]; then
-    mkdir -p tools
-fi
+symfony composer update --no-interaction --no-progress --ansi
+symfony composer validate --no-ansi --strict composer.json
 
-if [ ! -f "tools/phpstan.phar" ]; then
-    wget https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar -O tools/phpstan.phar
-    chmod +x tools/phpstan.phar
-fi
-# </editor-fold>
-
-composer update --no-interaction --no-progress --ansi
-composer validate --no-ansi --strict composer.json
-
-php tools/phpstan.phar analyse --memory-limit=512M --ansi --no-progress --error-format=table --generate-baseline=phpstan-baseline.neon
+kyx phpstan analyse --memory-limit=512M --ansi --no-progress --error-format=table --generate-baseline=phpstan-baseline.neon
 
 popd >/dev/null

scripts/baseline.sh

@@ -7,48 +7,18 @@ PROJECT_DIRECTORY="$(dirname "$CURRENT_DIRECTORY")"
 
 pushd "$PROJECT_DIRECTORY" >/dev/null
 
-# <editor-fold desc="Install tools">
-if [ ! -d "tools" ]; then
-    mkdir -p tools
-fi
-
-if [ ! -f "tools/composer-normalize.phar" ]; then
-    wget https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar -O tools/composer-normalize.phar
-    chmod +x tools/composer-normalize.phar
-fi
-
-if [ ! -f "tools/composer-require-checker.phar" ]; then
-    wget https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar -O tools/composer-require-checker.phar
-    chmod +x tools/composer-require-checker.phar
-fi
-
-if [ ! -f "tools/php-cs-fixer.phar" ]; then
-    wget https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/latest/download/php-cs-fixer.phar -O tools/php-cs-fixer.phar
-    chmod +x tools/php-cs-fixer.phar
-fi
-
-if [ ! -f "tools/phpstan.phar" ]; then
-    wget https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar -O tools/phpstan.phar
-    chmod +x tools/phpstan.phar
-fi
-
-if [ ! -f "tools/infection.phar" ]; then
-    wget https://github.com/infection/infection/releases/latest/download/infection.phar -O tools/infection.phar
-    chmod +x tools/infection.phar
-fi
-# </editor-fold>
-
 if [ ! -d "vendor" ]; then
-    composer update --no-interaction --no-progress --ansi
+    symfony composer update --no-interaction --no-progress --ansi
 fi
 
-composer validate --no-ansi --strict composer.json
+symfony composer validate --no-ansi --strict composer.json
 
-php tools/composer-normalize.phar --dry-run
-php tools/composer-require-checker.phar check
-PHP_CS_FIXER_IGNORE_ENV=1 php tools/php-cs-fixer.phar fix --dry-run --show-progress=dots --using-cache=no --verbose
-php tools/phpstan.phar analyse --memory-limit=512M --ansi --no-progress --error-format=table
+kyx composer-normalize --dry-run
+kyx composer-require-checker check
+kyx composer-unused
+FORCED_PHP_VERSION=8.3 kyx php-cs-fixer fix --dry-run --show-progress=dots --using-cache=no --verbose
+kyx phpstan analyse --memory-limit=512M --ansi --no-progress --error-format=table
 vendor/bin/phpunit
-php tools/infection.phar --min-msi=64 --min-covered-msi=70 --threads=4
+kyx infection "-j$(nproc)"
 
 popd >/dev/null

scripts/ci.sh

@@ -7,27 +7,12 @@ PROJECT_DIRECTORY="$(dirname "$CURRENT_DIRECTORY")"
 
 pushd "$PROJECT_DIRECTORY" >/dev/null
 
-# <editor-fold desc="Install tools">
-if [ ! -d "tools" ]; then
-    mkdir -p tools
-fi
-
-if [ ! -f "tools/composer-normalize.phar" ]; then
-    wget https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar -O tools/composer-normalize.phar
-    chmod +x tools/composer-normalize.phar
-fi
-
-if [ ! -f "tools/php-cs-fixer.phar" ]; then
-    wget https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/latest/download/php-cs-fixer.phar -O tools/php-cs-fixer.phar
-    chmod +x tools/php-cs-fixer.phar
-fi
-# </editor-fold>
-
 if [ ! -d "vendor" ]; then
-    composer update --no-interaction --no-progress --ansi
+    symfony composer update --no-interaction --no-progress --ansi
 fi
 
-php tools/composer-normalize.phar
-PHP_CS_FIXER_IGNORE_ENV=1 php tools/php-cs-fixer.phar fix --show-progress=dots --using-cache=no --verbose
+symfony composer update
+kyx composer-normalize
+FORCED_PHP_VERSION=8.3 kyx php-cs-fixer fix --show-progress=dots --using-cache=no --verbose
 
 popd >/dev/null