DevKit updates for 1.x branch (#289)

* DevKit updates * Normalize Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>
sonata-project · Dec 5, 2021 · f8ca3f9 · f8ca3f9
1 parent adb0257
commit f8ca3f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -82,6 +82,7 @@ jobs:
               run: composer require ${{ matrix.variant }} --no-update
 
             - name: Allow unstable dependencies
+              if: matrix.symfony-require == '6.0.*'
               run: composer config minimum-stability dev
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})

diff --git a/composer.json b/composer.json
@@ -1,14 +1,13 @@
 {
     "name": "sonata-project/twig-extensions",
-    "type": "library",
     "description": "Sonata twig extensions",
+    "license": "MIT",
+    "type": "library",
     "keywords": [
         "twig",
         "twig-extensions",
         "sonata"
     ],
-    "homepage": "https://docs.sonata-project.org/projects/twig-extensions",
-    "license": "MIT",
     "authors": [
         {
             "name": "Thomas Rabaix",
@@ -20,6 +19,7 @@
             "homepage": "https://github.com/sonata-project/twig-extensions/contributors"
         }
     ],
+    "homepage": "https://docs.sonata-project.org/projects/twig-extensions",
     "require": {
         "php": "^7.3 || ^8.0",
         "sonata-project/doctrine-extensions": "^1.9.1",
@@ -28,9 +28,6 @@
         "symfony/twig-bridge": "^4.4 || ^5.3 || ^6.0",
         "twig/twig": "^2.6 || ^3.0"
     },
-    "conflict": {
-        "sonata-project/core-bundle": ">=3.13"
-    },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
@@ -51,13 +48,8 @@
         "symfony/twig-bundle": "^4.4 || ^5.3 || ^6.0",
         "vimeo/psalm": "^4.7.2"
     },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
+    "conflict": {
+        "sonata-project/core-bundle": ">=3.13"
     },
     "autoload": {
         "psr-4": {
@@ -69,5 +61,13 @@
         "psr-4": {
             "Sonata\\Twig\\Tests\\": "tests/"
         }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.x-dev"
+        }
     }
 }