Merge pull request #19 from valantic/pimcore-11

Pimcore 11
valantic · Dec 27, 2023 · 04d864a · 04d864a
2 parents a83ff13 + 125e5ce
commit 04d864a
Show file tree

Hide file tree

Showing 36 changed files with 1,134 additions and 1,103 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -12,16 +12,14 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-latest ]
-        php: [ "8.0", "8.1" ]
-        pimcore: [ '^10.0' ]
+        php: [ "8.1", "8.2" ]
+        pimcore: [ '^11.0' ]
         stability: [ prefer-lowest, prefer-stable ]
-        exclude:
-          - stability: prefer-lowest # TODO: remove ASAP
 
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
@@ -54,7 +52,7 @@ jobs:
         operating-system: [ ubuntu-latest ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/composer.json b/composer.json
@@ -4,26 +4,24 @@
   "description": "Forms for Pimcore",
   "type": "pimcore-bundle",
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "ext-json": "*",
-    "limenius/liform": "dev-master#28828461425acfb9d30ae02f554055be17ca5530",
-    "pimcore/pimcore": "^10.0",
+    "limenius/liform": "^0.19",
+    "pimcore/pimcore": "^11.0",
     "ramsey/uuid": "^4.0",
-    "symfony/form": "^5.0",
+    "symfony/form": "^6.0",
     "voku/portable-ascii": "^1.5 || ^2.0"
   },
   "require-dev": {
     "bamarni/composer-bin-plugin": "^1.8.2",
-    "phpstan/phpstan": "^1.10.37",
+    "phpstan/extension-installer": "^1.3.1",
+    "phpstan/phpstan": "^1.10.50",
     "phpstan/phpstan-deprecation-rules": "^1.1.4",
-    "phpstan/extension-installer": "^1.3.1"
+    "phpstan/phpstan-strict-rules": "^1.5.2",
+    "rector/rector": "^0.18.13",
+    "roave/security-advisories": "dev-latest",
+    "symfony/dependency-injection": "^6.4.1"
   },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/phpwutz/Liform"
-    }
-  ],
   "autoload": {
     "psr-4": {
       "Valantic\\PimcoreFormsBundle\\": "src/"
@@ -68,9 +66,13 @@
     ],
     "php-cs-fixer-check": [
       "vendor-bin/phpcs/vendor/bin/php-cs-fixer fix --diff --dry-run"
+    ],
+    "rector": [
+      "./vendor/bin/rector process src"
     ]
   },
   "config": {
+    "sort-packages": true,
     "allow-plugins": {
       "ocramius/package-versions": true,
       "bamarni/composer-bin-plugin": true,