Merge pull request #10 from boostworld/sonata-user

Sonata user
bukhr · Jan 4, 2024 · 273ef75 · 273ef75
2 parents 556c6a6 + b2f0746
commit 273ef75
Show file tree

Hide file tree

Showing 16 changed files with 279 additions and 497 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,16 +12,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: '7.4'
-            symfony_require: '4.4.*'
-          - php: '7.4'
-            symfony_require: '5.4.*'
           - php: '8.1'
             symfony_require: '4.4.*'
-          - php: '8.1'
+          - php: '8.3'
             symfony_require: '5.4.*'
-          - php: '8.1'
-            symfony_require: '6.4.*'
+
       fail-fast: false
     steps:
       - name: Checkout

diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ vendor
 .php_cs.cache
 .phpunit.result.cache
 .idea/*
+tests/Functional/app/data/*
diff --git a/composer.json b/composer.json
@@ -22,38 +22,39 @@
     "require": {
         "php": ">=7.4",
         "friendsofsymfony/rest-bundle": "^3.0",
-        "jms/serializer-bundle": "^2.0|^3.0|^4.0|^5.3",
-        "symfony/framework-bundle": "^4.3|^5.4|^6.4",
-        "symfony/asset": "^3.4|^4.3|^5.4|^6.4",
-        "symfony/dependency-injection": "^4.3|^5.4|^6.4",
-        "symfony/routing": "^4.3|^5.4|^6.4",
-        "symfony/security-bundle": "^4.3|^5.4|^6.4",
-        "symfony/yaml": "^4.3|^5.4|^6.4",
-        "symfony/form": "^4.3|^5.4|^6.4",
-        "symfony/validator": "^4.3|^5.4|^6.4",
-        "symfony/twig-bundle": "^4.3|^5.4|^6.4",
-        "symfony/twig-bridge": "^4.3|^5.4|^6.4",
+        "jms/serializer-bundle": "^3.0",
+        "symfony/framework-bundle": "^5.4",
+        "symfony/asset": "^5.4",
+        "symfony/dependency-injection": "^5.4",
+        "symfony/routing": "^5.4",
+        "symfony/security-bundle": "^5.4",
+        "symfony/yaml": "^5.4",
+        "symfony/form": "^5.4",
+        "symfony/validator": "^5.4",
+        "symfony/twig-bundle": "^5.4",
+        "symfony/twig-bridge": "^5.4",
         "twig/twig": "^2.0|^3.0",
         "phpoption/phpoption": "^1.1",
-        "doctrine/annotations": "^1.0"
+        "doctrine/annotations": "^1.0",
+        "handcraftedinthealps/rest-routing-bundle": "^1.0"
     },
     "suggest": {
-        "friendsofsymfony/user-bundle": "Allows for user integration.",
         "ornicar/akismet-bundle": "Integrate Akismet for spam detection.",
         "symfony/acl-bundle": "Integrates the ACL Security component.",
         "symfony/assetic-bundle": "Integrates Assetic into Symfony."
     },
     "require-dev": {
-        "symfony/browser-kit": "^4.3|^5.4|^6.4",
-        "symfony/dom-crawler": "^4.3|^5.4|^6.4",
-        "symfony/css-selector": "^4.3|^5.4|^6.4",
-        "doctrine/orm": "^2.3",
-        "doctrine/doctrine-bundle": "^2.0",
-        "friendsofsymfony/user-bundle": "^3.0",
+        "symfony/browser-kit": "^5.4",
+        "symfony/dom-crawler": "^5.4",
+        "symfony/css-selector": "^5.4",
+        "doctrine/orm": "^2.8",
+        "doctrine/doctrine-bundle": "^2.4",
         "ornicar/akismet-bundle": "dev-master",
-        "symfony/expression-language": "^4.3|^5.4|^6.4",
-        "symfony/phpunit-bridge": "^4.3|^5.4|^6.4",
-        "phpunit/phpunit": "^9.4"
+        "symfony/expression-language": "^5.4",
+        "symfony/phpunit-bridge": "^5.4",
+        "phpunit/phpunit": "^9.4",
+        "sonata-project/user-bundle": "^5.10",
+        "symfony/process": "^6.4"
     },
     "extra": {
         "branch-alias": {