Merge pull request #135 from joomla/updates

joomla · Oct 19, 2023 · 9afd75f · 9afd75f
2 parents f6e253e + a30f24a
commit 9afd75f
Show file tree

Hide file tree

Showing 12 changed files with 933 additions and 974 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -6,58 +6,38 @@ clone:
 
 steps:
   - name: composer
-    image: joomlaprojects/docker-images:php7.4
+    image: joomlaprojects/docker-images:php8.1
     commands:
       - php -v
       - composer update
-      - composer require phpmd/phpmd phpstan/phpstan
+      - composer require phpstan/phpstan
     volumes:
       - name: composer-cache
         path: /tmp/composer-cache
 
   - name: phpcs
-    image: joomlaprojects/docker-images:php7.4
+    image: joomlaprojects/docker-images:php8.1
     depends_on:
       - composer
     commands:
       - vendor/bin/phpcs -p --report=full --extensions=php --standard=ruleset.xml src/ bin/ www/
 
-  - name: phpmd
-    image: joomlaprojects/docker-images:php7.4
-    depends_on:
-      - composer
-    commands:
-      - vendor/bin/phpmd src text cleancode
-      - vendor/bin/phpmd src text codesize
-      - vendor/bin/phpmd src text controversial
-      - vendor/bin/phpmd src text design
-      - vendor/bin/phpmd src text unusedcode
-    failure: ignore
-
   - name: phpstan
-    image: joomlaprojects/docker-images:php7.4
+    image: joomlaprojects/docker-images:php8.1
     depends_on:
       - composer
     commands:
       - vendor/bin/phpstan analyse src
     failure: ignore
 
   - name: phploc
-    image: joomlaprojects/docker-images:php7.4
+    image: joomlaprojects/docker-images:php8.1
     depends_on:
       - composer
     commands:
       - phploc src
     failure: ignore
 
-  - name: phpcpd
-    image: joomlaprojects/docker-images:php7.4
-    depends_on:
-      - composer
-    commands:
-      - phpcpd src
-    failure: ignore
-
   - name: deployment
     image: appleboy/drone-ssh
     depends_on:
@@ -88,6 +68,6 @@ volumes:
 
 ---
 kind: signature
-hmac: cfdb9d635b44bffeaf7b3f291a2823a4656b95a052fe78508241b7f87169bb80
+hmac: 2215efab7624c713f07192802222fa7d5fa0ad041fc3a3af3c8bbf591e9b629d
 
 ...
diff --git a/composer.json b/composer.json
@@ -4,51 +4,46 @@
     "homepage": "http://github.com/joomla/framework.joomla.org",
     "license": "GPL-2.0-or-later",
     "require": {
-        "php": "^7.4",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-pdo": "*",
-        "fig/link-util": "^1.1",
-        "joomla/application": "^2.0",
-        "joomla/console": "^2.0",
-        "joomla/controller": "^2.0",
-        "joomla/database": "^2.0",
-        "joomla/di": "^2.0",
-        "joomla/event": "^2.0",
-        "joomla/filesystem": "^2.0",
-        "joomla/filter": "^2.0",
-        "joomla/github": "^2.0@dev",
-        "joomla/http": "^2.0",
-        "joomla/input": "^2.0",
-        "joomla/model": "^2.0",
-        "joomla/preload": "^2.0",
-        "joomla/registry": "^2.0",
-        "joomla/renderer": "^2.0",
-        "joomla/router": "^2.0",
-        "joomla/string": "^2.0",
-        "joomla/uri": "^2.0",
-        "joomla/utilities": "^2.0",
-        "joomla/view": "^2.0",
-        "laminas/laminas-diactoros": "^2.3",
-        "monolog/monolog": "^2.1",
+        "fig/link-util": "^1.2",
+        "joomla/application": "^3.0",
+        "joomla/console": "^3.0",
+        "joomla/controller": "^3.0",
+        "joomla/database": "^3.0",
+        "joomla/di": "^3.0",
+        "joomla/event": "^3.0",
+        "joomla/filesystem": "^3.0",
+        "joomla/filter": "^3.0",
+        "joomla/github": "^3.0",
+        "joomla/http": "^3.0",
+        "joomla/input": "^3.0",
+        "joomla/model": "^3.0",
+        "joomla/preload": "^3.0",
+        "joomla/registry": "^3.0",
+        "joomla/renderer": "^3.0",
+        "joomla/router": "^3.0",
+        "joomla/string": "^3.0",
+        "joomla/uri": "^3.0",
+        "joomla/utilities": "^3.0",
+        "joomla/view": "^3.0",
+        "laminas/laminas-diactoros": "^2.24",
+        "monolog/monolog": "^3.4",
         "psr/link": "^1.0",
-        "ramsey/uuid": "^4.0.1",
-        "robmorgan/phinx": "^0.14.0",
-        "symfony/asset": "^5.1.2",
-        "symfony/process": "^5.1.2",
-        "symfony/web-link": "^5.1.2",
-        "symfony/yaml": "^5.1.2",
+        "ramsey/uuid": "^4.7.4",
+        "robmorgan/phinx": "^0.14.0",
+        "symfony/asset": "^6",
+        "symfony/process": "^6",
+        "symfony/web-link": "^6",
+        "symfony/yaml": "^6",
         "theiconic/php-ga-measurement-protocol": "^2.7.2",
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.13.2",
-        "squizlabs/php_codesniffer": "~3.0",
-        "maximebf/debugbar": "^1.16.3"
-    },
-    "replace": {
-        "paragonie/random_compat": "*",
-        "symfony/polyfill-php70": "*",
-        "symfony/polyfill-php72": "*"
+        "friendsofphp/php-cs-fixer": "^3.35.1",
+        "squizlabs/php_codesniffer": "~3.7",
+        "maximebf/debugbar": "^1.19.1"
     },
     "autoload": {
         "psr-4": {
@@ -57,7 +52,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.4.0"
+            "php": "8.1.0"
         }
     }
 }