Merge pull request #24 from duboiss/feature/dependencies

duboiss · Dec 10, 2023 · 0144aec · 0144aec
2 parents 06b8f63 + ebe34c2
commit 0144aec
Show file tree

Hide file tree

Showing 10 changed files with 788 additions and 818 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,7 @@ yarn-error.log
 /phpunit.xml
 .phpunit.result.cache
 ###< phpunit/phpunit ###
+
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###
diff --git a/bin/phpunit b/bin/phpunit
@@ -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";

diff --git a/composer.json b/composer.json
@@ -5,57 +5,57 @@
         "php": "^8.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/orm": "^2.7",
-        "knplabs/knp-paginator-bundle": "^6",
-        "knplabs/knp-time-bundle": "^1.9",
-        "phpdocumentor/reflection-docblock": "^5.2",
-        "sensio/framework-extra-bundle": "^6.2",
-        "stof/doctrine-extensions-bundle": "^1.4",
-        "symfony/asset": "6.3.*",
-        "symfony/console": "6.3.*",
-        "symfony/dotenv": "6.3.*",
-        "symfony/expression-language": "6.3.*",
-        "symfony/flex": "^2",
-        "symfony/form": "6.3.*",
-        "symfony/framework-bundle": "6.3.*",
-        "symfony/monolog-bundle": "^3.1",
-        "symfony/property-access": "6.3.*",
-        "symfony/property-info": "6.3.*",
-        "symfony/runtime": "6.3.*",
-        "symfony/security-bundle": "6.3.*",
-        "symfony/serializer": "6.3.*",
-        "symfony/translation": "6.3.*",
-        "symfony/twig-bundle": "6.3.*",
-        "symfony/uid": "6.3.*",
-        "symfony/validator": "6.3.*",
-        "symfony/web-link": "6.3.*",
-        "symfony/webpack-encore-bundle": "^1.6",
-        "symfony/yaml": "6.3.*",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/intl-extra": "^3.0",
-        "twig/string-extra": "^3.0",
-        "twig/twig": "^2.12|^3.0"
+        "doctrine/doctrine-bundle": "^2.11.1",
+        "doctrine/orm": "^2.17.1",
+        "knplabs/knp-paginator-bundle": "^6.3",
+        "knplabs/knp-time-bundle": "^2.2",
+        "phpdocumentor/reflection-docblock": "^5.3",
+        "sensio/framework-extra-bundle": "^6.2.10",
+        "stof/doctrine-extensions-bundle": "^1.10.1",
+        "symfony/asset": "6.4.*",
+        "symfony/console": "6.4.*",
+        "symfony/dotenv": "6.4.*",
+        "symfony/expression-language": "6.4.*",
+        "symfony/flex": "^2.4.2",
+        "symfony/form": "6.4.*",
+        "symfony/framework-bundle": "6.4.*",
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/property-access": "6.4.*",
+        "symfony/property-info": "6.4.*",
+        "symfony/runtime": "6.4.*",
+        "symfony/security-bundle": "6.4.*",
+        "symfony/serializer": "6.4.*",
+        "symfony/translation": "6.4.*",
+        "symfony/twig-bundle": "6.4.*",
+        "symfony/uid": "6.4.*",
+        "symfony/validator": "6.4.*",
+        "symfony/web-link": "6.4.*",
+        "symfony/webpack-encore-bundle": "^1.17.2",
+        "symfony/yaml": "6.4.*",
+        "twig/extra-bundle": "^2.12|^3.8",
+        "twig/intl-extra": "^3.8",
+        "twig/string-extra": "^3.8",
+        "twig/twig": "^2.12|^3.8"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^3.2",
-        "fakerphp/faker": "^1.13",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "doctrine/doctrine-fixtures-bundle": "^3.5.1",
+        "fakerphp/faker": "^1.23",
+        "friendsofphp/php-cs-fixer": "^3.41",
         "friendsoftwig/twigcs": "dev-master",
-        "liip/test-fixtures-bundle": "^2",
-        "php-parallel-lint/php-parallel-lint": "^1.2",
-        "phpstan/phpstan": "^1.2",
-        "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.18.1",
-        "symfony/browser-kit": "6.3.*",
-        "symfony/css-selector": "6.3.*",
-        "symfony/debug-bundle": "6.3.*",
-        "symfony/maker-bundle": "^1.0",
-        "symfony/phpunit-bridge": "^6.1",
-        "symfony/stopwatch": "6.3.*",
-        "symfony/web-profiler-bundle": "6.3.*",
-        "theofidry/alice-data-fixtures": "^1.1"
+        "liip/test-fixtures-bundle": "^2.7",
+        "php-parallel-lint/php-parallel-lint": "^1.3.2",
+        "phpstan/phpstan": "^1.10.48",
+        "phpstan/phpstan-symfony": "^1.3.5",
+        "phpunit/phpunit": "^9.6.15",
+        "rector/rector": "^0.18.12",
+        "symfony/browser-kit": "6.4.*",
+        "symfony/css-selector": "6.4.*",
+        "symfony/debug-bundle": "6.4.*",
+        "symfony/maker-bundle": "^1.52",
+        "symfony/phpunit-bridge": "^6.4.1",
+        "symfony/stopwatch": "6.4.*",
+        "symfony/web-profiler-bundle": "6.4.*",
+        "theofidry/alice-data-fixtures": "^1.7"
     },
     "config": {
         "platform": {
@@ -107,7 +107,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "6.3.*"
+            "require": "6.4.*"
         }
     }
 }